From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GM5qJ+Rp+2WubAEA62LTzQ:P1 (envelope-from ) for ; Wed, 20 Mar 2024 23:57:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GM5qJ+Rp+2WubAEA62LTzQ (envelope-from ) for ; Wed, 20 Mar 2024 23:57:40 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=m9+8gIOy; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710975460; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kPio/q42XnitmolbZ9pDC8uf6bv8a815zeiAqL6Kg8Q=; b=Vzy0DRl/bH3jD6E7hr6UrF9pyGGK0ovU3olg9kaIs/jJNTnxvDXm05fSaLY5k9r3eyXFBw s/N3Tngmd5G7K+MIuIzzQ2F445viM3l5/Ws89ciS5dOBLJZj3R97CgentbN+X6hdtI9XDc 5z+mJzzaSZeh1knC9abjbtTbeOAS/3p+9n11BZtVackphUlFValxhjg38Hn5Ts03+KuAmZ ws09/CXDg6KQgIheglu+43bJlovYKU3vppVh3jYS30wGdKfAIiq/m37VWVs7RveIU2+eb1 gzGpOu9uc/iYIaEJUazDE4Z2vMVFqs4KJAEuSXqyT7idALJ3zPpTdQvaw8YFvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=m9+8gIOy; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710975460; a=rsa-sha256; cv=none; b=hCqwSVL8gY2wLRTMbVQssZnQL7Akw6dkzTQYYOCylfYfNSoDVtW84JY51Yu2n9m4WSIfsL J+pMwphgAD3Zp89U4T03z7gK0aRtvTVs04OSNUVms/Q19stzVoZJVPcf4ApxTQo+RgnEYP MkqN64brcNpvJdRlKZAFWYrqC8ia4XCeJ1Abhf//DOjJ03sitM1AxUWhvn2LxrPdnD++AJ SmnS/FQJqHGguq0a1Cmn9QQXFtZfdWT3pTx76mC050u6Leeg/bs8QghZQowZTvA5/YCteA dLaYVsuFoXnAfhYL9nhaakg2/g4Kzt8oJ3gWdf1D9CNR81WiOIcaUpnXKpza1A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 672156EA6B for ; Wed, 20 Mar 2024 23:57:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rn4Zn-0005QS-0K; Wed, 20 Mar 2024 18:38:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rn4Zj-0005N3-AW for guix-patches@gnu.org; Wed, 20 Mar 2024 18:38:24 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rn4Zj-0007Bt-2R for guix-patches@gnu.org; Wed, 20 Mar 2024 18:38:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rn4aM-00061F-De for guix-patches@gnu.org; Wed, 20 Mar 2024 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v3 00/32] Unbundle and update python-pytorch Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.171097431323102 (code B ref 69591); Wed, 20 Mar 2024 22:39:02 +0000 Received: (at 69591) by debbugs.gnu.org; 20 Mar 2024 22:38:33 +0000 Received: from localhost ([127.0.0.1]:36717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4Zs-00060X-OV for submit@debbugs.gnu.org; Wed, 20 Mar 2024 18:38:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4Zq-00060H-4h for 69591@debbugs.gnu.org; Wed, 20 Mar 2024 18:38:31 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5A062240101 for <69591@debbugs.gnu.org>; Wed, 20 Mar 2024 23:37:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710974263; bh=q0q0auYg4sOAOVSr4vjDxMMDknrEqBpAeph/AdAeZ9k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=m9+8gIOyP8NB8IM6s70jkA3AzASqxNVEqVDNV1vBxhA3/PsFflBuqa3ozzzxgoeVL uQoDR6nqluA9YXU8NzrX/vVk/n76yOwrzbMN8ISCPL62lCJe+zTVh2fFjJ8QOxEULU Gn+YgB+wI4/l0EqcvDZlSr6XE9PP6R3FgUNEumUt4vR9Va9XQ+wst4oSbvnXB8cMM5 8E1WCL7Bh6IsgoZo8zPqNwjmOASL9Isbw/uSz0f363C0Y1TeTK+ZFW7NLYspFIhKoN KA78sokdWaTy/U0hm7xoYL4hsFwnVnIPLIxHb/GJxv89jxSIsOvRH+Rx4ehZOWWgSM 4b+EaMlRvCgpg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V0NlB6F2jz6tvl; Wed, 20 Mar 2024 23:37:42 +0100 (CET) From: David Elsing Date: Wed, 20 Mar 2024 22:37:07 +0000 Message-ID: <20240320223737.12883-1-david.elsing@posteo.net> In-Reply-To: <20240312224712.15578-1-david.elsing@posteo.net> References: <20240312224712.15578-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.92 X-Spam-Score: -3.92 X-Migadu-Queue-Id: 672156EA6B X-Migadu-Scanner: mx11.migadu.com X-TUID: oKwgjSjdK9TX In the QA, several builds failed, mostly because some libraries are not supported on all architectures, so I added the supported-systems fields and only include oneapi-dnnl, qnnpack, qnnpack-pytorch, xnnpack, nnpack and cpuinfo for supported systems as input for python-pytorch. For x86_64, nnpack requires AVX2 or AVX-512 instructions and fbgemm is only available for x86_64 with AVX2 or AVX-512 instructions. Therefore, I removed them from the inputs for x86_64 (fbgemm for all) and only include them in the python-pytorch-avx package variant. asmjit fails to build on armhf because GCC runs out of memory. What should be done here? It's only used by blacksmith, fbgemm and python-pytorch*. cpuinfo has a bug on aarch64, which was reported upstream: https://github.com/pytorch/cpuinfo/issues/14 I therefore excluded aarch64-linux from supported-systems. Due to these problems, the python-pytorch package only builds on x86_64-linux, but it doesn't seem to have been different before. David Elsing (32): gnu: asmjit: Update to commit 3ca5c18. gnu: Add python-typing-extensions-4.10. gnu: Add python-optree. gnu: Add python-pytest-flakefinder. gnu: Add python-pytest-shard. gnu: Add python-expecttest. gnu: Add python-pytest-rerunfailures-13. gnu: Add miniz. gnu: Add miniz-for-pytorch. gnu: Add libnop. gnu: Remove flatbuffers-next-shared. gnu: python-flatbuffers-next: Update to 23.5.26. gnu: pthreadpool: Update to commit 178e3e0. gnu: cpuinfo: Update to commit aa4b216. gnu: clog: Add "-DUSE_SYSTEM_LIBS=ON" configure flag. gnu: nnpack: Update to commit 70a77f4. gnu: oneapi-dnnl: Update to 3.3.5. gnu: Add tensorpipe. gnu: Add fbgemm. gnu: Add qnnpack. gnu: Add foxi. gnu: Add ideep-pytorch. gnu: xnnpack: Update to commit 51a9875. gnu: Remove xnnpack-for-torch2. gnu: Add qnnpack-pytorch. gnu: python-pytorch: Update to 2.2.1 and unbundle dependencies. gnu: Add python-pytorch-avx. gnu: python-torchvision: Update to 0.17.1. gnu: Add ideep-pytorch-for-r-torch. gnu: Add oneapi-dnnl-for-r-torch. gnu: Add qnnpack-pytorch-for-r-torch. gnu: python-pytorch-for-r-torch: Adjust to new python-pytorch. gnu/local.mk | 10 +- gnu/packages/compression.scm | 50 + gnu/packages/cpp.scm | 6 +- gnu/packages/machine-learning.scm | 964 +++- gnu/packages/parallel.scm | 34 +- .../patches/clog-fix-shared-build.patch | 39 +- .../patches/cpuinfo-system-libraries.patch | 50 - .../patches/fbgemm-use-system-libraries.patch | 62 + gnu/packages/patches/foxi-fix-build.patch | 55 + gnu/packages/patches/miniz-for-pytorch.patch | 47 + .../patches/python-optree-fix-32-bit.patch | 122 + ...ython-pytorch-1.9.0-system-libraries.patch | 139 - .../patches/python-pytorch-fix-codegen.patch | 167 + ...thon-pytorch-for-r-torch-fix-codegen.patch | 167 + ...pytorch-for-r-torch-system-libraries.patch | 399 ++ .../patches/python-pytorch-runpath.patch | 19 +- .../python-pytorch-system-libraries.patch | 317 +- .../python-pytorch-without-kineto.patch | 60 + .../python-pytorch2-system-libraries.patch | 156 - .../xnnpack-for-torch2-system-libraries.patch | 2660 ----------- .../patches/xnnpack-remove-broken-tests.patch | 337 ++ .../patches/xnnpack-system-libraries.patch | 4133 ++++++++++------- gnu/packages/python-build.scm | 14 +- gnu/packages/python-check.scm | 89 + gnu/packages/python-xyz.scm | 30 + gnu/packages/serialization.scm | 54 +- 26 files changed, 5209 insertions(+), 4971 deletions(-) delete mode 100644 gnu/packages/patches/cpuinfo-system-libraries.patch create mode 100644 gnu/packages/patches/fbgemm-use-system-libraries.patch create mode 100644 gnu/packages/patches/foxi-fix-build.patch create mode 100644 gnu/packages/patches/miniz-for-pytorch.patch create mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch delete mode 100644 gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch create mode 100644 gnu/packages/patches/python-pytorch-fix-codegen.patch create mode 100644 gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch create mode 100644 gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch create mode 100644 gnu/packages/patches/python-pytorch-without-kineto.patch delete mode 100644 gnu/packages/patches/python-pytorch2-system-libraries.patch delete mode 100644 gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch create mode 100644 gnu/packages/patches/xnnpack-remove-broken-tests.patch -- 2.41.0