From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 00/11] Update PyTorch to 2.5.1 Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17374158453643 (code B ref -1); Mon, 20 Jan 2025 23:31:04 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2025 23:30:45 +0000 Received: from localhost ([127.0.0.1]:52082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1EC-0000wg-QD for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:30:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56724) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1E9-0000wD-AV for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:30:43 -0500 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 1tZzm2-0006BV-Lr for guix-patches@gnu.org; Mon, 20 Jan 2025 16:57:34 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZzm0-0003XD-Mm for guix-patches@gnu.org; Mon, 20 Jan 2025 16:57:34 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 27000240027 for ; Mon, 20 Jan 2025 22:57:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737410246; bh=eURFCnbOa0EoK+Y+7zGSL8qAgDTFtxmyHqKDb3zXlh0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=g4sqZ1Xd9EyZ4ArqDpoerNFlHSKYNfQKHPxeEQ/kPTfwnN/n+Ai4Euje99Vv5iBaO tzz5TTqogSz3kgcZVnQDotZ9rAYbdUhTH54PIG4Fd9ENe8MUOidF0QAIkxuyzMXzcW EFDqLhlINKHgynJiIZ/gycFkW76jvbjmGMJol72llknAWiHk2buJBbO7XJWMLGa/aG QoYo9tZi9A3KYzc0fUrA21rHb5vFXivL/6pUU2jHxcV7MJUB9f6UuZuEWNN6Rs62iK pVIGmiFw+fJb+pJl/eiWu3KoFd25RcIILt+hnM9DSXZHgx3rIuygY0hBUEH2+jSRW7 VdNQ8M2kKOB4A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcPMT1kfmz9rxG; Mon, 20 Jan 2025 22:57:24 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 21:57:12 +0000 Message-ID: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, this patch series updates python-pytorch to version 2.5.1. PyTorch 2.5 is not compatible with oneapi-dnnl version 3.6, so I did not update the latter yet. The latest release of r-torch did not change and still depends on PyTorch version 2.0.1, for which I fixed the build again. Cheers, David David Elsing (11): gnu: asmjit: Update to commit cfc9f81. gnu: cpuinfo: Update to commit ca156f7. gnu: cpp-httplib: Update to 0.18.5. gnu: flatbuffers-next: Update to 24.12.23. gnu: onnx: Update to 1.17.0. gnu: Add pybind11-2.13. gnu: python-optree: Update to 0.14.0. gnu: python-sympy: Update to 1.13.3. gnu: oneapi-dnnl: Regenerate autogenerated files. gnu: python-pytorch: Update to 2.5.1. gnu: python-pytorch-for-r-torch: Fix build. gnu/local.mk | 3 +- gnu/packages/cpp.scm | 14 +- gnu/packages/machine-learning.scm | 83 ++++++++++-- gnu/packages/parallel.scm | 8 +- .../patches/python-optree-fix-32-bit.patch | 122 ------------------ .../patches/python-pytorch-fix-codegen.patch | 42 +++--- .../python-pytorch-system-libraries.patch | 100 +++++++------- gnu/packages/python-xyz.scm | 56 +++++--- gnu/packages/serialization.scm | 6 +- 9 files changed, 198 insertions(+), 236 deletions(-) delete mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 01/11] gnu: asmjit: Update to commit cfc9f81. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163835276 (code B ref 75708); Mon, 20 Jan 2025 23:40:02 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:43 +0000 Received: from localhost ([127.0.0.1]:52166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1Ms-0001Mt-Qi for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:43 -0500 Received: from mout01.posteo.de ([185.67.36.65]:47999) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mo-0001MG-Sx for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D3418240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416371; bh=Qi+6YPF+MjdJeq6DNu7QUARDIuMn2IyUAgI29p2zY2Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=bXgdy2aFLMrJjI+697UaXY4uKSl+in9xRqHCqYBfKQs1S90vbr4WNumiEwcvwGYoP R6NDV43SNqWCNuJrmbTTHSnWaGW/LoWmUe8r+hDnNbguEcJi8O4OAMJ6mTZhSiIJJE rOvIRRBY+jHgxl9Uyc4wwDy/EG7ZZD/GngYEz8ZPiN18mjMPGCuog44mxHJ4AxHj7w PAhoGDSHfgqx/fZfA/ldpKOmyH6mb7ZSq715USMrUK0/1Tm2SCuROTZ+7H6sprXFiD IfADl0Pswz+ZcgSUPbWcYUGn3Xl062MwW5An36WD1+Y+EZ6Kohp+39wFt49RFZYXa0 BOX93aaQIhXrg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdG1QBkz6tvt; Tue, 21 Jan 2025 00:39:30 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:50 +0000 Message-ID: <20250120233910.21233-1-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (asmjit): Update to commit cfc9f81. --- gnu/packages/cpp.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 17b1c514d5..ae973129b4 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Attila Lendvai ;;; Copyright © 2022 Arun Isaac -;;; Copyright © 2022, 2023, 2024 David Elsing +;;; Copyright © 2022-2025 David Elsing ;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Antero Mejr @@ -164,8 +164,8 @@ (define-public argagg (license license:expat)))) (define-public asmjit - (let ((commit "062e69ca81defa35eb0ee15f7412f49a0dad3cdb") - (revision "1")) + (let ((commit "cfc9f813cc6ccda63cad872edb32b38e0662bedb") + (revision "2")) (package (name "asmjit") (version (git-version "0.0.0" revision commit)) @@ -178,7 +178,7 @@ (define-public asmjit (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0lcwqzbv2628g3c7sflkwagyh49lp471px8bhg7lr77w9y94srqq")))) + (base32 "0lxkfg0b2bc2la0cvs5658a26mb00zlir4n0jkzzlg97l0jrbwpv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DASMJIT_TEST=TRUE"))) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 03/11] gnu: cpp-httplib: Update to 0.18.5. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163845289 (code B ref 75708); Mon, 20 Jan 2025 23:40:03 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:44 +0000 Received: from localhost ([127.0.0.1]:52168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1Mt-0001N3-Jp for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:44 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44029) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mr-0001MK-Gf for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 82B4F240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416375; bh=/pxbLPzcgcKD2o7xWKI0mGY4wRdOH6141zRyk8t2AuM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ik7h4dH/Z6QxMRBJMWvRPFVcAH962Ouu4i5IjAfpDptNHfS+D0AFgdCuuxdy85t0L hu1JMtpxwG4sTvwOG3LyhhkWxXGlzmjTvvNLvgZFntSztdjQ2hUOu+ki+61X0Xb64H zG6N37HDu8e7wY0HRxH2vIzcKR9GRjS/KYQVJ/iXGRAUIHdnaQi/Vb+jok8jsYQWwx 3AYMyrBqlEc8Fp1JIAQrNxAc9L8CVn39vhMj57oKoDMeNrVOQRriR69AZBVKaRbxCW Af2yyo+p8tpZdBhAXJHFCtHllKX4kCA1W09sVAEWOLJSAvzXwV+CAt3PI0tIg2uEy0 W2mnXz848V7DQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdM1Z8Xz6tvt; Tue, 21 Jan 2025 00:39:35 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:52 +0000 Message-ID: <20250120233910.21233-3-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (cpp-httplib): Update to 0.18.5. [native-inputs] Add curl. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ae973129b4..1d538b5a4e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1248,7 +1248,7 @@ (define-public cpp-httplib ;; header (package (name "cpp-httplib") - (version "0.16.0") + (version "0.18.5") (source (origin (method git-fetch) @@ -1256,7 +1256,7 @@ (define-public cpp-httplib (url "https://github.com/yhirose/cpp-httplib") (commit (string-append "v" version)))) (sha256 - (base32 "0n4ribq7c6lqj0hn50pdvy7wml62fqbgrgysb038fq1qc6xyw3np")) + (base32 "1jc31n4xdrknal4i1dvf8j6j9kafpczi0w5gbbi89xlir9dgm5kp")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1292,7 +1292,7 @@ (define-public cpp-httplib "TooManyRedirectTest" "UrlWithSpace" "YahooRedirectTest" "YahooRedirectTest"))))))) (native-inputs - (list googletest python)) + (list curl googletest python)) (inputs (list brotli openssl zlib)) (home-page "https://github.com/yhirose/cpp-httplib") -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 04/11] gnu: flatbuffers-next: Update to 24.12.23. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163945342 (code B ref 75708); Mon, 20 Jan 2025 23:40:04 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:54 +0000 Received: from localhost ([127.0.0.1]:52182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1N3-0001O5-6m for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34679) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mr-0001MM-Vj for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:42 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 1CE4F240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416376; bh=PlPB3FBliUPJnJb994DLgR81I0H8BtwqEsWE/STwiKM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=SInJy6rXxkxLgD/8+cPqniiXJcI3TXPDwden6ilU3G2j2mi8cB9jjlD8HGMIPanG8 MbP8AmIYzg15rRNI4DZL/hQY/9N7Ctlt59P9z9pZONIhIwfqrSshsQDL5dtk5ze2BO zWGR1bO7cTwj2BVVSQFUpx9QFEBsEXPvmtIm6lqq7c4pP22pCK1Adm0Evtc/C6VAgG nEcplhHl2ZWkM2It++EDLJjWgj73dhSsFeoOizeryBfOI8+JNg2SgI/ZtGDQi8GfZ7 JmjJKvZtzPvGYOjnDi8zcpzrbzWOr7zTSVcaHT2yEfVZlHmRPAoCBY1zINXL0TWTAw zGhK81k8IQC/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdM5plSz6tvt; Tue, 21 Jan 2025 00:39:35 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:53 +0000 Message-ID: <20250120233910.21233-4-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/serialization.scm (flatbuffers-next): Update to 24.12.23. --- gnu/packages/serialization.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 338682d16c..d9a9e240f9 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2024 Paul A. Patience ;;; Copyright © 2024 Arun Isaac ;;; Copyright © 2024 Wilko Meyer -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -946,7 +946,7 @@ (define-public flatbuffers-23.1 (define-public flatbuffers-next (package (inherit flatbuffers) - (version "24.3.25") + (version "24.12.23") (source (origin (method git-fetch) (uri (git-reference @@ -955,7 +955,7 @@ (define-public flatbuffers-next (file-name (git-file-name "flatbuffers" version)) (sha256 (base32 - "0q066x1h0x9225aj25jv40gxgz46yvwmiqc2g6q06mkkg1144kxq")))))) + "01g64kmjw8dfhj12j5fgyx70avix9p1ml4w25lm726dixmpq9gp8")))))) (define-public python-flatbuffers (package -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 02/11] gnu: cpuinfo: Update to commit ca156f7. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163945351 (code B ref 75708); Mon, 20 Jan 2025 23:40:05 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:54 +0000 Received: from localhost ([127.0.0.1]:52184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1N4-0001O8-11 for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:60847) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Ms-0001MN-3u for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:43 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E64E1240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416374; bh=yYFBY1cUdzITKPMLawG3Knw+nw+7TZ1BT8YhI3Z2FNg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=aEtYzEehiqPpgt7CczMnsDIRA6JWRAoGWS3XzeCfXpZ16pcQME11q4rIqAsuq/TNT HuHEbzNpevQ0vJ5f5cVjsDJ/cHEsUpiWGoFfltmHmCDarN/aGac6wYYNIcwkjlYyGj CJxdFLlfJRbWYUIV7UHrBxmlWU3GuBfXBq6eSKJ25B/LmSkTEr6UoJiLJL/hc68FUU NvcpL4QBkk2muDt/ie7LytVHu2OMPA4+UR4sMR1cZzMYYoKMPbA6DoLnpN0uxsb+BI mf/h9axU1RkQ6Zf2BhYxz5+/5pMHK78O1U9HqERdZiAdPjLO6rx8K1tZJ/G3tq/R+O uxkYg/PTG+GhQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdL4KBlz6tvt; Tue, 21 Jan 2025 00:39:34 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:51 +0000 Message-ID: <20250120233910.21233-2-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/parallel.scm (cpuinfo): Update to commit ca156f7. --- gnu/packages/parallel.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 0197891fb6..19da40fe98 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Romain Garbage ;;; Copyright © 2024 Arun Isaac ;;; Copyright © 2024 Maxim Cournoyer @@ -599,8 +599,8 @@ (define-public pthreadpool (define-public cpuinfo ;; There's currently no tag on this repo. (let ((version "0.0") - (revision "3") - (commit "05332fd802d9109a2a151ec32154b107c1e5caf9")) + (revision "4") + (commit "ca156f7bc9109c552973414a63d310f76ef0cbf8")) (package (name "cpuinfo") (version (git-version version revision commit)) @@ -611,7 +611,7 @@ (define-public cpuinfo (file-name (git-file-name name version)) (sha256 (base32 - "0w0kfc1fn9viirkhbr8dgfy9m5clfsg3k9p6kdxhzqpyjhgd252n")))) + "12ip6mnmymqhcbi8p98cn109y47pg9ygbj3k96r22dbmr77a50c4")))) (build-system cmake-build-system) (arguments (list -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 05/11] gnu: onnx: Update to 1.17.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163955360 (code B ref 75708); Mon, 20 Jan 2025 23:40:06 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:55 +0000 Received: from localhost ([127.0.0.1]:52186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1N4-0001OL-T5 for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:55 -0500 Received: from mout01.posteo.de ([185.67.36.65]:49795) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Ms-0001MO-Gq for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:43 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id ADAB8240028 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416376; bh=KSY8ze07w3I3EFdb99SiLgNTl7Qql/7hHtCg/YoINgo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=kiDKiAxIAkloQjpGP5gkAF47AC+WXE+VZhvZo+P/hkDzNIx4P8mKu8FgEjCv5ytt8 cWsw0GO/xzI/6yn7hFG9HANNU2u3Xg6nfKMSpgTg4VmKkewzQZGMLNvsID5eg0vQb8 0uvV4GbBf6DhwT0ULq6EEV7M0ODzaaHpyuJLO0PSQh1wQB76AOPnw6rht6rmsLZ8F5 w/n4H3dNr9lltsspJa9bGepVx6dJRGihRZj0qoA/gN5Ib4d1jbUmzdD1PjVtz+mhqf PGi/dBz1d6P6+f6WGGpuKrHoR+64OKxaOURL6M6/NNX7cOeBI9q51uaMBnvMxxd5Um r4t2uTTij4jTQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdN2rHJz6ty5; Tue, 21 Jan 2025 00:39:36 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:54 +0000 Message-ID: <20250120233910.21233-5-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (onnx): Update to 1.17.0. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index cd39b34d83..8ec29ce742 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Spencer King -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Andy Tai ;;; ;;; This file is part of GNU Guix. @@ -1445,7 +1445,7 @@ (define (delete-ifdefs file) (define-public onnx (package (name "onnx") - (version "1.16.2") + (version "1.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -1453,7 +1453,7 @@ (define-public onnx (commit (string-append "v" version)))) (sha256 (base32 - "0f5h204ksfz4ir3qq38ckxja1jfhf1vn5xzwrj83vkkbfjq6fv16")) + "1i6bh4z2xzz1maykr0xmrwfybm6i3g38vnx7hsls8hr58rdr30zn")) (file-name (git-file-name name version)) (patches (search-patches "onnx-shared-libraries.patch" -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 08/11] gnu: python-sympy: Update to 1.13.3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374163965371 (code B ref 75708); Mon, 20 Jan 2025 23:40:07 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:39:56 +0000 Received: from localhost ([127.0.0.1]:52188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1N5-0001OP-LD for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:56 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38681) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mv-0001MR-Fg for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:46 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B7C37240101 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416378; bh=Z2UPZuhyr6h9uqU6ByKiX1R/hjJoS+AXOsZYqJpBGto=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=rSOO71i+pCizoDZ96NAWrYqUDsD/n2ZE4wy+iLETKJX1fYWsAB18KUIqmMmy2aXyH kKAzjAb5mebdgdEge+5Is2qHaovk6gkvQKZQaRGiIs1eqMgJn6SYMMOvshpQI8zoAN 0Th/4gEHY9Zin+YKt5XEjrr8aqwoijtVX4DsbuS6AJ0puzu1Eu6tGJ82cJGWZquyyl 1YTeY2+YBv/fyPC9tvHm171xsT30CzuvbmBqzObLkvSvIA9qwXduLjlb7YZXyiLTdx cHWg0627FQzKReJxlGcQ8pApFsBNPy2xHoX/VbNH6Dn58oDvrrm0tkI7NT1FyAaVzH rf0K+qaRvb5Gw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdQ1Scsz6tvt; Tue, 21 Jan 2025 00:39:38 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:57 +0000 Message-ID: <20250120233910.21233-8-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/python-xyz.scm (python-sympy): Update to 1.13.3. [build-system]: Switch to pyproject-build-system. [arguments]<#:phases>: Adjust 'check phase. [native-inputs]: New field to add python-hypothesis, python-pytest, python-setuptools and python-wheel. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f097a0caa..0e375bdeea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14961,24 +14961,28 @@ (define-public python-syllables (define-public python-sympy (package (name "python-sympy") - (version "1.11.1") + (version "1.13.3") (source (origin (method url-fetch) (uri (pypi-uri "sympy" version)) (sha256 - (base32 "0n46x1rfy8c2a9za3yp2va5icigxj805f9fmiq8c1drwwvf808z3")))) - (build-system python-build-system) + (base32 "1nf4zrjjbnv47n6sl6x9blfyarski61vdjaz4ygb62hfag3d4zxj")))) + (build-system pyproject-build-system) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (invoke - (or (which "python3") (which "python")) - "-c" "import sympy; sympy.test(\"/core\")")))))) - (propagated-inputs - (list python-mpmath)) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python3" "-c" + "import sympy; sympy.test(\"/core\")"))))))) + (propagated-inputs (list python-mpmath)) + (native-inputs + (list python-hypothesis + python-pytest + python-setuptools + python-wheel)) (home-page "https://www.sympy.org/") (synopsis "Python library for symbolic mathematics") (description -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 10/11] gnu: python-pytorch: Update to 2.5.1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374164035410 (code B ref 75708); Mon, 20 Jan 2025 23:40:08 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:40:03 +0000 Received: from localhost ([127.0.0.1]:52190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1N6-0001OZ-9g for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:40:03 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46431) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mv-0001MX-Ma for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B1E59240101 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416379; bh=A6DK8DuGkZbIu0MS2QY6pGFn9vg14QchlOXdZpTtkso=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=QpXbcEt+xyQkAjXvpLd9677Hrr0Df7CWQVYBMCV6pyjYy7kmp5uu39RLvngnDoL1m 1adGTHAHFF9swQaqpV9G1/NYv7j+EnU3NBFFb20iV4V4nj5QjGJl/j9Xijuob/pIFR AzstzevvphY3jDxFZ0Xzwmyratt/C/4hs3eWXv4jJm1S/OHaut1UE781+NpRcJIU5N +sZn3Pc1bdzeuEPM/t3o6SODOqSsLYVlWNcruSXTVnzwH0VwTqpSNB39NVmwAXWD3L eaG8Fe/nuOUjeMmLjYp7++EMewOEJyf59JI/UCS73K6tM8m+2lM2hWUx1S4ESmZjHR /3AMuRJ+Iz5aQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdR2fvpz6tvt; Tue, 21 Jan 2025 00:39:39 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:59 +0000 Message-ID: <20250120233910.21233-10-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This also updates the qnnpack-pytorch package. * gnu/packages/machine-learning.scm (%python-pytorch-version): Set to 2.5.1. (%python-pytorch-src): Adjust hash accordingly. (python-pytorch)[arguments]<#:phases>: Add 'remove-fr-trace-script phase. Adjust 'use-system-libraries phase. [native-inputs]: Add nlohmann-json. Replace cmake with cmake-minimal. [inputs]: Remove foxi. * gnu/packages/patches/python-pytorch-fix-codegen.patch: Adjust patch. * gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust patch. --- gnu/packages/machine-learning.scm | 21 +++- .../patches/python-pytorch-fix-codegen.patch | 42 +++++--- .../python-pytorch-system-libraries.patch | 100 +++++++++--------- 3 files changed, 90 insertions(+), 73 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index aa6cfc01f7..7993e845a9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4603,7 +4603,7 @@ (define-public ideep-pytorch-for-r-torch (base32 "0hdpkhcjry22fjx2zg2r48v7f4ljrclzj0li2pgk76kvyblfbyvm")))))) -(define %python-pytorch-version "2.4.0") +(define %python-pytorch-version "2.5.1") (define %python-pytorch-src (origin @@ -4614,7 +4614,7 @@ (define %python-pytorch-src (file-name (git-file-name "python-pytorch" %python-pytorch-version)) (sha256 (base32 - "18hdhzr12brj0b7ppyiscax0dbra30207qx0cckw78midfkcn7cn")) + "052cvagpmm9y7jspjpcyysx8yc5fhxnjl8rcz6nndis06v8dcj8s")) (patches (search-patches "python-pytorch-system-libraries.patch" "python-pytorch-runpath.patch" "python-pytorch-without-kineto.patch" @@ -4760,6 +4760,14 @@ (define-public python-pytorch (string-append #$output "/lib/python" #$(version-major+minor (package-version python)) "/site-packages"))))) + ;; This entry point is broken, because it refers to a module that is + ;; (intentionally) not installed + ;; (https://github.com/pytorch/pytorch/pull/134729), which causes + ;; the 'sanity-check phase to fail. + (add-after 'unpack 'remove-fr-trace-script + (lambda _ + (substitute* "setup.py" + (("entry_points\\[\"console_scripts\"\\]\\.append\\(") "(")))) (add-before 'build 'use-system-libraries (lambda _ (substitute* '("caffe2/serialize/crc.cc" @@ -4797,7 +4805,10 @@ (define-public python-pytorch (or (%current-target-system) (%current-system)) (package-transitive-supported-systems qnnpack))) - (setenv "USE_QNNPACK" "0")))) + (setenv "USE_QNNPACK" "0")) + (substitute* '("requirements.txt" "setup.py") + (("sympy==1\\.13\\.1") + "sympy>=1.13.1")))) ;; PyTorch is still built with AVX2 and AVX-512 support selected at ;; runtime, but these dependencies require it (nnpack only for ;; x86_64). @@ -4898,10 +4909,11 @@ (define-public python-pytorch ;; Even only the core tests take a very long time to run. #:tests? #f)) (native-inputs - (list cmake + (list cmake-minimal doxygen ideep-pytorch ninja + nlohmann-json pocketfft-cpp python-expecttest python-pytest-flakefinder @@ -4921,7 +4933,6 @@ (define-public python-pytorch eigen flatbuffers-next fmt - foxi fp16 fxdiv gemmlowp diff --git a/gnu/packages/patches/python-pytorch-fix-codegen.patch b/gnu/packages/patches/python-pytorch-fix-codegen.patch index b30094de09..106ea7db66 100644 --- a/gnu/packages/patches/python-pytorch-fix-codegen.patch +++ b/gnu/packages/patches/python-pytorch-fix-codegen.patch @@ -6,7 +6,7 @@ is later corrected. codegen_external.py is patched to avoid duplicate functions and add the static keyword as in the existing generated file. diff --git a/tools/gen_flatbuffers.sh b/tools/gen_flatbuffers.sh -index cc0263d..ac34e84 100644 +index cc0263dbbf..ac34e84b82 100644 --- a/tools/gen_flatbuffers.sh +++ b/tools/gen_flatbuffers.sh @@ -1,13 +1,13 @@ @@ -32,7 +32,7 @@ index cc0263d..ac34e84 100644 -c "$ROOT/torch/csrc/jit/serialization/mobile_bytecode.fbs" echo '// @generated' >> "$ROOT/torch/csrc/jit/serialization/mobile_bytecode_generated.h" diff --git a/torch/csrc/jit/tensorexpr/codegen_external.py b/torch/csrc/jit/tensorexpr/codegen_external.py -index 5dcf1b2..0e20b0c 100644 +index 5dcf1b2840..0e20b0c102 100644 --- a/torch/csrc/jit/tensorexpr/codegen_external.py +++ b/torch/csrc/jit/tensorexpr/codegen_external.py @@ -21,9 +21,14 @@ def gen_external(native_functions_path, tags_path, external_path): @@ -61,7 +61,7 @@ index 5dcf1b2..0e20b0c 100644 void** buf_data, int64_t* buf_ranks, diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py -index 7a0024f..6b2445f 100644 +index b42948045c..e1cfc73a5e 100644 --- a/torchgen/decompositions/gen_jit_decompositions.py +++ b/torchgen/decompositions/gen_jit_decompositions.py @@ -1,8 +1,12 @@ @@ -76,9 +76,9 @@ index 7a0024f..6b2445f 100644 +else: + decomposition_table = {} - # from torchgen.code_template import CodeTemplate -@@ -85,7 +89,7 @@ def write_decomposition_util_file(path: str) -> None: + # from torchgen.code_template import CodeTemplate +@@ -86,7 +90,7 @@ def write_decomposition_util_file(path: str) -> None: def main() -> None: @@ -88,27 +88,28 @@ index 7a0024f..6b2445f 100644 write_decomposition_util_file(str(upgrader_path)) diff --git a/torchgen/operator_versions/gen_mobile_upgraders.py b/torchgen/operator_versions/gen_mobile_upgraders.py -index 2907076..6866332 100644 +index 362ce427d5..245056f815 100644 --- a/torchgen/operator_versions/gen_mobile_upgraders.py +++ b/torchgen/operator_versions/gen_mobile_upgraders.py -@@ -3,10 +3,12 @@ import os +@@ -6,10 +6,13 @@ import os from enum import Enum from operator import itemgetter from pathlib import Path +import sys - from typing import Any, Dict, List + from typing import Any -import torch -from torch.jit.generate_bytecode import generate_upgraders_bytecode +if len(sys.argv) < 2 or sys.argv[1] != "dummy": + import torch + from torch.jit.generate_bytecode import generate_upgraders_bytecode - ++ from torchgen.code_template import CodeTemplate from torchgen.operator_versions.gen_mobile_upgraders_constant import ( -@@ -263,7 +265,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: + MOBILE_UPGRADERS_HEADER_DESCRIPTION, +@@ -265,7 +268,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: def construct_version_maps( - upgrader_bytecode_function_to_index_map: Dict[str, Any] + upgrader_bytecode_function_to_index_map: dict[str, Any] ) -> str: - version_map = torch._C._get_operator_version_map() + if len(sys.argv) < 2 or sys.argv[1] != "dummy": @@ -118,7 +119,7 @@ index 2907076..6866332 100644 sorted_version_map_ = sorted(version_map.items(), key=itemgetter(0)) # type: ignore[no-any-return] sorted_version_map = dict(sorted_version_map_) -@@ -379,7 +384,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]: +@@ -381,7 +387,10 @@ def sort_upgrader(upgrader_list: list[dict[str, Any]]) -> list[dict[str, Any]]: def main() -> None: @@ -131,16 +132,24 @@ index 2907076..6866332 100644 for up in sorted_upgrader_list: print("after sort upgrader : ", next(iter(up))) diff --git a/torchgen/shape_functions/gen_jit_shape_functions.py b/torchgen/shape_functions/gen_jit_shape_functions.py -index bdfd5c7..72b237a 100644 +index 56a3d8bf0d..490a3ea2e7 100644 --- a/torchgen/shape_functions/gen_jit_shape_functions.py +++ b/torchgen/shape_functions/gen_jit_shape_functions.py -@@ -18,16 +18,20 @@ you are in the root directory of the Pytorch git repo""" +@@ -1,6 +1,7 @@ + #!/usr/bin/env python3 + import os + import sys ++import importlib + from importlib.util import module_from_spec, spec_from_file_location + from itertools import chain + from pathlib import Path +@@ -18,16 +19,21 @@ you are in the root directory of the Pytorch git repo""" if not file_path.exists(): raise Exception(err_msg) # noqa: TRY002 --spec = importlib.util.spec_from_file_location(module_name, file_path) +-spec = spec_from_file_location(module_name, file_path) -assert spec is not None --module = importlib.util.module_from_spec(spec) +-module = module_from_spec(spec) -sys.modules[module_name] = module -assert spec.loader is not None -assert module is not None @@ -159,6 +168,7 @@ index bdfd5c7..72b237a 100644 + + bounded_compute_graph_mapping = module.bounded_compute_graph_mapping + shape_compute_graph_mapping = module.shape_compute_graph_mapping ++ +else: + bounded_compute_graph_mapping = {} + shape_compute_graph_mapping = {} diff --git a/gnu/packages/patches/python-pytorch-system-libraries.patch b/gnu/packages/patches/python-pytorch-system-libraries.patch index 025b3241a1..6b3f36f3f0 100644 --- a/gnu/packages/patches/python-pytorch-system-libraries.patch +++ b/gnu/packages/patches/python-pytorch-system-libraries.patch @@ -5,10 +5,10 @@ httlib, ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages. diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt -index 0087dd9..0235fa1 100644 +index 6d9152a4d0..97cb945722 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt -@@ -419,9 +419,9 @@ if(AT_NNPACK_ENABLED) +@@ -414,9 +414,9 @@ if(AT_NNPACK_ENABLED) list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below endif() @@ -22,7 +22,7 @@ index 0087dd9..0235fa1 100644 if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(s390x|ppc64le)$") list(APPEND ATen_CPU_DEPENDENCY_LIBS cpuinfo) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 89c31fa..e6d9ef1 100644 +index 9be7f3732f..111215dacc 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -91,9 +91,6 @@ if(NOT MSVC AND USE_XNNPACK) @@ -35,7 +35,7 @@ index 89c31fa..e6d9ef1 100644 endif() endif() -@@ -1075,7 +1072,6 @@ if(USE_XPU) +@@ -1081,7 +1078,6 @@ if(USE_XPU) endif() if(NOT MSVC AND USE_XNNPACK) @@ -43,17 +43,18 @@ index 89c31fa..e6d9ef1 100644 endif() # ========================================================== -@@ -1189,6 +1185,9 @@ endif() +@@ -1195,8 +1191,8 @@ endif() target_include_directories(torch_cpu PRIVATE ${TORCH_ROOT}/third_party/cpp-httplib) +-target_include_directories(torch_cpu PRIVATE +- ${TORCH_ROOT}/third_party/nlohmann/include) +find_package(httplib REQUIRED) +target_link_libraries(torch_cpu PUBLIC httplib::httplib) -+ + install(DIRECTORY "${TORCH_SRC_DIR}/csrc" DESTINATION ${TORCH_INSTALL_INCLUDE_DIR}/torch - FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") -@@ -1417,6 +1416,7 @@ target_link_libraries(torch_cpu PUBLIC c10) +@@ -1425,6 +1421,7 @@ target_link_libraries(torch_cpu PUBLIC c10) target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS}) @@ -61,7 +62,7 @@ index 89c31fa..e6d9ef1 100644 if(USE_MPI) target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX) endif() -@@ -1694,7 +1694,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) +@@ -1659,7 +1656,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}") add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}") target_link_libraries(static_runtime_bench torch_library benchmark) @@ -70,7 +71,7 @@ index 89c31fa..e6d9ef1 100644 endif() if(BUILD_MOBILE_BENCHMARK) -@@ -1713,7 +1713,7 @@ if(BUILD_MOBILE_TEST) +@@ -1678,7 +1675,7 @@ if(BUILD_MOBILE_TEST) foreach(test_src ${ATen_MOBILE_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -79,16 +80,16 @@ index 89c31fa..e6d9ef1 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE}) -@@ -1734,7 +1734,7 @@ if(BUILD_TEST) +@@ -1699,7 +1696,7 @@ if(BUILD_TEST) if(NOT MSVC) add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp) # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR) -- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main) -+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest) +- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main nlohmann) ++ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest nlohmann) if(USE_FBGEMM) target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm) endif() -@@ -1748,7 +1748,7 @@ if(BUILD_TEST) +@@ -1713,7 +1710,7 @@ if(BUILD_TEST) endif() else() add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}") @@ -97,7 +98,7 @@ index 89c31fa..e6d9ef1 100644 endif() target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) -@@ -1765,7 +1765,7 @@ if(BUILD_TEST) +@@ -1730,7 +1727,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_CPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -106,7 +107,7 @@ index 89c31fa..e6d9ef1 100644 if(NOT MSVC) target_link_libraries(${test_name} stdc++) endif() -@@ -1845,7 +1845,7 @@ if(BUILD_TEST) +@@ -1810,7 +1807,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_VULKAN_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -116,7 +117,7 @@ index 89c31fa..e6d9ef1 100644 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) add_test(NAME ${test_name} COMMAND $) diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt -index 1552b59..67e1a9a 100644 +index 1552b59d0d..67e1a9a1a3 100644 --- a/caffe2/serialize/CMakeLists.txt +++ b/caffe2/serialize/CMakeLists.txt @@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc) @@ -128,10 +129,10 @@ index 1552b59..67e1a9a 100644 ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index f1f2eb7..b4d2033 100644 +index e78305e0a8..5b3c3d7bf2 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -263,7 +263,7 @@ endif() +@@ -270,7 +270,7 @@ endif() # --- [ PocketFFT set(AT_POCKETFFT_ENABLED 0) if(NOT AT_MKL_ENABLED) @@ -140,7 +141,7 @@ index f1f2eb7..b4d2033 100644 if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}") message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}") elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h") -@@ -458,15 +458,6 @@ if(USE_PYTORCH_QNNPACK) +@@ -465,15 +465,6 @@ if(USE_PYTORCH_QNNPACK) set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "") @@ -156,7 +157,7 @@ index f1f2eb7..b4d2033 100644 if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL) target_compile_definitions( -@@ -653,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) +@@ -660,11 +651,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) # this shouldn't be necessary anymore. get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") @@ -168,7 +169,7 @@ index f1f2eb7..b4d2033 100644 # We will not need to test benchmark lib itself. set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") -@@ -735,16 +721,6 @@ if(USE_FBGEMM) +@@ -742,16 +728,6 @@ if(USE_FBGEMM) if(USE_ASAN) set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM") endif() @@ -185,7 +186,7 @@ index f1f2eb7..b4d2033 100644 endif() if(USE_FBGEMM) -@@ -812,7 +788,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) +@@ -819,7 +795,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) "${FP16_SOURCE_DIR}" "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16") elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16) @@ -194,32 +195,24 @@ index f1f2eb7..b4d2033 100644 set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C) endif() list(APPEND Caffe2_DEPENDENCY_LIBS fp16) -@@ -1159,7 +1135,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) +@@ -1161,7 +1137,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) # Tensorpipe uses cuda_add_library torch_update_find_cuda_flags() - add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe) list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe) - if(USE_CUDA) -@@ -1288,7 +1263,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) - set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) - endif() - endif() -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) - - add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) - if(NOT USE_SYSTEM_ONNX) -@@ -1319,7 +1293,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) + list(APPEND Caffe2_DEPENDENCY_LIBS nlohmann) +@@ -1317,7 +1292,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) endif() set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") - list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) + list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer) endif() - include_directories(${FOXI_INCLUDE_DIRS}) - list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) -@@ -1476,9 +1450,8 @@ if(NOT INTERN_BUILD_MOBILE) + # Recover the build shared libs option. + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS}) +@@ -1465,9 +1440,8 @@ if(NOT INTERN_BUILD_MOBILE) endif() if(USE_MKLDNN) include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake) @@ -230,7 +223,7 @@ index f1f2eb7..b4d2033 100644 else() message(WARNING "MKLDNN could not be found.") caffe2_update_option(USE_MKLDNN OFF) -@@ -1530,7 +1503,7 @@ endif() +@@ -1519,7 +1493,7 @@ endif() # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -239,7 +232,7 @@ index f1f2eb7..b4d2033 100644 # Disable compiler feature checks for `fmt`. # -@@ -1539,7 +1512,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) +@@ -1528,7 +1502,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know # `fmt` is compatible with a superset of the compilers that PyTorch is, it # shouldn't be too bad to just disable the checks. @@ -248,7 +241,7 @@ index f1f2eb7..b4d2033 100644 list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake -index 9d5f064..c3624e5 100644 +index 9d5f0643ec..c3624e582a 100644 --- a/cmake/External/nnpack.cmake +++ b/cmake/External/nnpack.cmake @@ -40,7 +40,7 @@ endif() @@ -270,7 +263,7 @@ index 9d5f064..c3624e5 100644 +set(NNPACK_FOUND TRUE) +set(USE_NNPACK ON) diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake -index 8793562..9f8fa3d 100644 +index 87935625f9..9f8fa3df81 100644 --- a/cmake/public/mkldnn.cmake +++ b/cmake/public/mkldnn.cmake @@ -4,7 +4,7 @@ if(CPU_AARCH64) @@ -289,10 +282,10 @@ index 8793562..9f8fa3d 100644 - ${MKLDNN_LIBRARIES}) + DNNL::dnnl) diff --git a/setup.py b/setup.py -index 9ec41cd..1f505fe 100644 +index 2b0cfa99d7..2d76b0d035 100644 --- a/setup.py +++ b/setup.py -@@ -494,13 +494,9 @@ def build_deps(): +@@ -491,13 +491,9 @@ def build_deps(): # Windows has very poor support for them. sym_files = [ "tools/shared/_utils_internal.py", @@ -307,15 +300,17 @@ index 9ec41cd..1f505fe 100644 for sym_file, orig_file in zip(sym_files, orig_files): same = False diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt -index 5c89748..ef84c57 100644 +index 0874852517..58ad3e9d66 100644 --- a/test/cpp/c10d/CMakeLists.txt +++ b/test/cpp/c10d/CMakeLists.txt -@@ -16,14 +16,14 @@ function(c10d_add_test test_src) +@@ -16,15 +16,15 @@ function(c10d_add_test test_src) add_test(NAME ${test_name} COMMAND $) endfunction() +-c10d_add_test(BackoffTest.cpp torch_cpu gtest_main) -c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main) -c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main) ++c10d_add_test(BackoffTest.cpp torch_cpu gtest_main gtest) +c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest) +c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest) if(INSTALL_TEST) @@ -328,7 +323,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS HashStoreTest DESTINATION bin) endif() -@@ -31,11 +31,11 @@ endif() +@@ -32,11 +32,11 @@ endif() if(USE_CUDA) if(USE_GLOO AND USE_C10D_GLOO) @@ -342,7 +337,7 @@ index 5c89748..ef84c57 100644 endif() if(USE_NCCL AND USE_C10D_NCCL) # NCCL is a private dependency of libtorch, but the tests include some -@@ -44,10 +44,10 @@ if(USE_CUDA) +@@ -45,10 +45,10 @@ if(USE_CUDA) # a private dependency of the tests as well. c10d_add_test( ProcessGroupNCCLTest.cpp @@ -355,7 +350,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS ProcessGroupNCCLTest DESTINATION bin) install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin) -@@ -61,7 +61,7 @@ if(USE_CUDA) +@@ -62,7 +62,7 @@ if(USE_CUDA) # a private dependency of the tests as well. c10d_add_test( ProcessGroupUCCTest.cpp @@ -364,7 +359,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS ProcessGroupUCCTest DESTINATION bin) install(TARGETS c10d_cuda_test DESTINATION lib) -@@ -69,7 +69,7 @@ if(USE_CUDA) +@@ -70,7 +70,7 @@ if(USE_CUDA) endif() else() if(USE_GLOO AND USE_C10D_GLOO) @@ -374,7 +369,7 @@ index 5c89748..ef84c57 100644 endif() diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt -index 179270c..72f5582 100644 +index 179270c4a4..72f5582e81 100644 --- a/test/cpp/tensorexpr/CMakeLists.txt +++ b/test/cpp/tensorexpr/CMakeLists.txt @@ -51,7 +51,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) @@ -387,14 +382,15 @@ index 179270c..72f5582 100644 if(USE_CUDA) target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA) diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt -index 10a44af..33e2df4 100644 +index c74b45431c..5b5d0919d0 100644 --- a/torch/CMakeLists.txt +++ b/torch/CMakeLists.txt -@@ -81,7 +81,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES +@@ -82,8 +82,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES Python::Module pybind::pybind11 opentelemetry::api - httplib +- nlohmann shm fmt::fmt-header-only ATEN_CPU_FILES_GEN_LIB) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 11/11] gnu: python-pytorch-for-r-torch: Fix build. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374164045423 (code B ref 75708); Mon, 20 Jan 2025 23:40:09 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:40:04 +0000 Received: from localhost ([127.0.0.1]:52193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1ND-0001PD-4v for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:40:03 -0500 Received: from mout01.posteo.de ([185.67.36.65]:38353) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mx-0001Mn-Qh for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:48 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 48D7F240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416380; bh=s/IrR7VqMFdYyZzd2R7FRf8z4JDdmH0O3DbttLyqBbs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=W0MI5vij0oMdvkPNnigNdWe2JZ3SQd8kFIk+0srPa+jp72AFlTarXcn6nryv5SUVH HiVZzCepQlV/fT9s3cajy6TIq3mRNpjlD3l+IcutEGaegCj0B4qkLzuWLZOneOFr5g xDLNae+hl+fE0jyDjnl9GDWt+fxsUZMpEiyKBO6Bb/q9/h48liHvO+A6AYic2pbGMw S/0ek00F0YL/8LP6IRY0HvYac/RTPFe4iVn+xGTw9sedcj4Ful9N0opp+RCqNH6N8Z vK+UurqGjAqygJUSUiN2Cq76LwEdFplCBERJTx3kRdQ+vVInKWQxG/N5eSpuPQ0+47 k80/dANZJiuMg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdR71Kjz6tvt; Tue, 21 Jan 2025 00:39:39 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:39:00 +0000 Message-ID: <20250120233910.21233-11-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The build fails because the types of function pointers with return type '__m256' and 'const __m256' (or '__m512' and 'const __m512') are not treated as compatible by the compiler. * gnu/packages/machine-learning.scm (python-pytorch-for-r-torch) [arguments]: New field. [inputs]: Add foxi. --- gnu/packages/machine-learning.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7993e845a9..44f4936f0b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5061,11 +5061,23 @@ (define-public python-pytorch-for-r-torch (name "python-pytorch") (version %python-pytorch-for-r-torch-version) (source %python-pytorch-for-r-torch-src) + (arguments + (substitute-keyword-arguments (package-arguments python-pytorch) + ((#:phases phases) + #~(modify-phases #$phases + ;; See https://github.com/pytorch/pytorch/issues/61244 + (add-after 'unpack 'fix-aten-vec + (lambda _ + (substitute* + '("aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h" + "aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h") + (("map\\(const __") "map(__")))))))) (native-inputs (modify-inputs (package-native-inputs python-pytorch) (replace "ideep-pytorch" ideep-pytorch-for-r-torch))) (inputs (modify-inputs (package-inputs python-pytorch) + (prepend foxi) (prepend qnnpack) (replace "qnnpack-pytorch" qnnpack-pytorch-for-r-torch) (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 06/11] gnu: Add pybind11-2.13. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374164055440 (code B ref 75708); Mon, 20 Jan 2025 23:40:09 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:40:05 +0000 Received: from localhost ([127.0.0.1]:52196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1ND-0001PV-VN for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:40:04 -0500 Received: from mout01.posteo.de ([185.67.36.65]:37215) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mx-0001Mf-Hj for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:48 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4B1B2240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416377; bh=2/6agd8FeE+aRup15zUSfNVJlbO+k72mdt94QHOB+7U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Ar6RITzKRWie1NVQ2WCbyYM8eQs/6HeV7uMUDhu5BRD7y7kLqgtfjvWk8X5IeyFE2 Tg6yDQN+tQTWyM0i9mcqf7XDSyX7sW4eXYWzMGD0H3uLLiRS52rPI7zabk0evJv+ft tbPwTY0ELf8X57k/ob4HwChMMk6iy+utrWoEg7kYZ1Zh/CG5BA1vvjjK6PErTBn754 OFG0ByGSOuJ6Q5+tQGFRoRcf9TgURekboEVqtyTH+7vpMX+owDQ7whaof5SJGHFR+Z hsvclhNTJM8asXh0FHLVrRuQw1hIdpEhDMJuptIpvcxSrfU6M6SVBCZ39c5RSp2w4b FXKCCOwcT7xfg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdN6yD6z6tvt; Tue, 21 Jan 2025 00:39:36 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:55 +0000 Message-ID: <20250120233910.21233-6-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/python-xyz.scm (pybind11-2.13): New variable. --- gnu/packages/python-xyz.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5bcb41eba..b080f7865e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -153,7 +153,7 @@ ;;; Copyright © 2024 Adriel Dumas--Jondeau ;;; Copyright © 2024 Navid Afkhami ;;; Copyright © 2024 TakeV -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Rick Huijzer ;;; Copyright © 2024 Peter Kannewitz ;;; Copyright © 2024 Aaron Covrig @@ -29001,6 +29001,22 @@ (define-public pybind11 inferring type information using compile-time introspection.") (license license:bsd-3))) +;; Needed for python-optree +(define-public pybind11-2.13 + (package + (inherit pybind11) + (name "pybind11") + (version "2.13.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pybind/pybind11") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1dbnki0pnky39kr04afd9ks597bzjc530zbk33jjss53nfvdvlj8")) + (file-name (git-file-name name version)))))) + ;; Needed for scipy (define-public pybind11-2.10 (package -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 09/11] gnu: oneapi-dnnl: Regenerate autogenerated files. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374164065459 (code B ref 75708); Mon, 20 Jan 2025 23:40:10 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:40:06 +0000 Received: from localhost ([127.0.0.1]:52199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1NF-0001Pr-Ly for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:40:06 -0500 Received: from mout01.posteo.de ([185.67.36.65]:60127) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mx-0001Mm-NE for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:49 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 15F2E240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416379; bh=WZZrwRsVCdg/SPLaaWW+Hd4J47+01TLUjektvOjqqZs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ZA9/UCCPlr6EliJmT29ecJz6tebBE0lBoGc69RbdGIj3Zroz1TulKA0jPoFqEcMon WlRyHQq/ton5PO0hqQnAg7o6Erq3KDQLwJ868k0IjhytoqIM6OuCjF2vSxN2ltodYL RY3Hmzzm940ElzdOohPHUGFi2ESt7KJbCnmHHQlcP1lhy9snDLEomQIlgim/AtmFHz IzuXB48rta7xIA+UjtpxZumFowYKjREV001sS0cfzUAIWCllkCIzNGNW4XG7SLRFMi vuR9nfGT25wBGFVzUJqNfpWTTZWzTIs1+AJpTr2MOnBa2Tp2lyHlwqAe8pxiTIhAL3 pUOWWqz1xjK4Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdQ5cHLz6tvt; Tue, 21 Jan 2025 00:39:38 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:58 +0000 Message-ID: <20250120233910.21233-9-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (oneapi-dnnl)[source]: Add snippet. [arguments]<#:configure-flags>: Add "-DDNNL_EXPERIMENTAL_UKERNEL=ON". [arguments]<#:phases>: Add 'codegen phase. [native-inputs]: New field to add castxml, clang-17 and python. --- gnu/packages/machine-learning.scm | 44 ++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8ec29ce742..aa6cfc01f7 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -6160,11 +6160,47 @@ (define-public oneapi-dnnl (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")))) + (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")) + (modules '((guix build utils) + (ice-9 rdelim))) + ;; Copyright date used by code generation script + (snippet + '(for-each + (lambda (file) + (with-atomic-file-replacement + file + (lambda (in out) + (let loop ((line (read-line in 'concat))) + (if (string-contains line "Copyright") + (display line out) + (loop (read-line in 'concat))))))) + '("include/oneapi/dnnl/dnnl_debug.h" + "src/common/dnnl_debug_autogenerated.cpp" + "tests/benchdnn/dnnl_debug_autogenerated.cpp" + "tests/benchdnn/dnnl_debug.hpp"))))) (build-system cmake-build-system) - (arguments (if (target-riscv64?) - (list #:configure-flags #~'("-DDNNL_CPU_RUNTIME=SEQ")) - '())) + (arguments + (list + #:configure-flags + `(list + ,@(if (target-riscv64?) + (list #:configure-flags '("-DDNNL_CPU_RUNTIME=SEQ")) + '()) + ;; Used in PyTorch + "-DDNNL_EXPERIMENTAL_UKERNEL=ON") + #:phases + '(modify-phases %standard-phases + (add-after 'configure 'codegen + (lambda _ + (with-directory-excursion "../source" + (invoke "castxml" "--castxml-cc-gnu-c" "clang" + "--castxml-output=1" "-DDNNL_EXPERIMENTAL_SPARSE" + "-Iinclude" "-I../build/include" + "include/oneapi/dnnl/dnnl_types.h" "-o" "types.xml") + (invoke "python3" "scripts/generate_dnnl_debug.py" "types.xml") + ;; Modifies include/oneapi/dnnl/dnnl.hpp + (invoke "python3" "scripts/generate_format_tags.py"))))))) + (native-inputs (list castxml clang-17 python)) (home-page "https://github.com/oneapi-src/oneDNN") (synopsis "Deep Neural Network Library") (description -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH 07/11] gnu: python-optree: Update to 0.14.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 23:40:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17374164085480 (code B ref 75708); Mon, 20 Jan 2025 23:40:10 +0000 Received: (at 75708) by debbugs.gnu.org; 20 Jan 2025 23:40:08 +0000 Received: from localhost ([127.0.0.1]:52202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1NG-0001Q0-Ek for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:40:08 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35935) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1Mx-0001Mg-Hf for 75708@debbugs.gnu.org; Mon, 20 Jan 2025 18:39:49 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E20AE240027 for <75708@debbugs.gnu.org>; Tue, 21 Jan 2025 00:39:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737416377; bh=NCEEIY176CSDRvAMI3Zg/ijDsCZp7wZT8BIfyQq8Ww4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=XMq1TLPhkhBPOfBHjMxr2UiPdoGueys9/3Mvv2AJhvZmCjBuldKo4WUY0WH9Ecm2k FaJ/mgl1rrJIU4woNe6KeEr0sLcGpQS3mXQY4gnmwEtoSZ/LP6pdNanjW5C4uDD8M4 YP3JcrCZt+3yBXfLf+hCZnAO+MaH5GvdPEmXEY8a5NeYq3PvZ3HUyw/U+T2gomjZT5 GVrnWF9LOIJTVOMG3RzeyU8gRCz7Mz//Ts16YjCnR/YxaA2uGGnZc57dduliVkVoYd /xJxi6xXEZKkRwuC1RBaOgmJFOMyZdlSOK1ixxiBjtZxzkwJZ6mN4tEeczGFCKOfh+ M2NtgSzY3nv3g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcRdP4FyGz6tvt; Tue, 21 Jan 2025 00:39:37 +0100 (CET) From: David Elsing Date: Mon, 20 Jan 2025 23:38:56 +0000 Message-ID: <20250120233910.21233-7-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/python-xyz.scm (python-optree): Update to 0.14.0. [source]: Remove patch. [arguments]<#:test-flags>: Disable additional failing test. [native-inputs]: Replace pybind11 with pybind11-2.13 and cmake with cmake-minimal. * gnu/packages/patches/python-optree-fix-32-bit.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 3 +- .../patches/python-optree-fix-32-bit.patch | 122 ------------------ gnu/packages/python-xyz.scm | 14 +- 3 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5091f93eb8..09a72d2418 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -64,7 +64,7 @@ # Copyright © 2023, 2024 gemmaro # Copyright © 2023 Herman Rimm # Copyright © 2023 Troy Figiel -# Copyright © 2024 David Elsing +# Copyright © 2024, 2025 David Elsing # Copyright © 2024 Ashish SHUKLA # Copyright © 2024 Fabio Natali # Copyright © 2024 Noé Lopez @@ -2095,7 +2095,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-hiredis-use-system-hiredis.patch \ %D%/packages/patches/python-online-judge-api-client-tests.patch \ - %D%/packages/patches/python-optree-fix-32-bit.patch \ %D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ diff --git a/gnu/packages/patches/python-optree-fix-32-bit.patch b/gnu/packages/patches/python-optree-fix-32-bit.patch deleted file mode 100644 index 6a32c39bd8..0000000000 --- a/gnu/packages/patches/python-optree-fix-32-bit.patch +++ /dev/null @@ -1,122 +0,0 @@ -In include/utils.h, ssize_t is an alias for py::ssize_t, which is an alias for -Py_ssize_t in Python, which is an alias for the system ssize_t. -The latter is defined in glibc as int if __WORDSIZE == 32 and as long int if -__WORDSIZE == 64. Therefore, we need to remove the explicit template -specialization for int in the first case. - -diff --git a/include/utils.h b/include/utils.h -index 950a02b..82a9591 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -141,10 +141,12 @@ template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { - return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#if __WORDSIZE != 32 - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { - return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#endif - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const ssize_t& item) { - return PyList_GET_ITEM(container.ptr(), item); -@@ -153,10 +155,12 @@ template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { - return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#if __WORDSIZE != 32 - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { - return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#endif - - template - inline py::object GET_ITEM_BORROW(const py::handle& container, const Item& item) { -@@ -171,11 +175,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const - return py::reinterpret_borrow( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { - return py::reinterpret_borrow( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const ssize_t& item) { - return py::reinterpret_borrow(PyList_GET_ITEM(container.ptr(), item)); -@@ -185,11 +191,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const s - return py::reinterpret_borrow( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { - return py::reinterpret_borrow( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - - template - inline py::object GET_ITEM_STEAL(const py::handle& container, const Item& item) { -@@ -204,11 +212,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const s - return py::reinterpret_steal( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { - return py::reinterpret_steal( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const ssize_t& item) { - return py::reinterpret_steal(PyList_GET_ITEM(container.ptr(), item)); -@@ -218,11 +228,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const si - return py::reinterpret_steal( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { - return py::reinterpret_steal( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - - template - inline void SET_ITEM(const py::handle& container, const Item& item, const py::handle& value) { -@@ -240,12 +252,14 @@ inline void SET_ITEM(const py::handle& container, - const py::handle& value) { - PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#if __WORDSIZE != 32 - template <> - inline void SET_ITEM(const py::handle& container, - const int& item, - const py::handle& value) { - PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#endif - template <> - inline void SET_ITEM(const py::handle& container, - const ssize_t& item, -@@ -258,12 +272,14 @@ inline void SET_ITEM(const py::handle& container, - const py::handle& value) { - PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#if __WORDSIZE != 32 - template <> - inline void SET_ITEM(const py::handle& container, - const int& item, - const py::handle& value) { - PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#endif - - template - inline void AssertExact(const py::handle& object) { diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b080f7865e..9f097a0caa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13175,7 +13175,7 @@ (define-public python-treelib (define-public python-optree (package (name "python-optree") - (version "0.11.0") + (version "0.14.0") (source (origin (method git-fetch) @@ -13185,21 +13185,21 @@ (define-public python-optree (file-name (git-file-name name version)) (sha256 (base32 - "0sk5lm1xyxi7z0yjckip77qvbidyb7i1znmn9fz96q74hl9ffyan")) - (patches (search-patches "python-optree-fix-32-bit.patch")))) + "17zph1jgzk0zaanj7057qj8x5cml8j66ip0xmlbwmq4396hmdlbs")))) (build-system pyproject-build-system) (arguments (list #:test-flags - ;; This test fails due to a circular import - ''("-k" "not test_treespec_pickle_missing_registration"))) + ;; These tests fails due to a circular import + '`("-k" ,(string-append "not test_treespec_pickle_missing_registration" + " and not test_import_no_warnings")))) (propagated-inputs (list python-typing-extensions)) (native-inputs (list python-pytest python-setuptools python-wheel - cmake - pybind11)) + cmake-minimal + pybind11-2.13)) (home-page "https://github.com/metaopt/optree") (synopsis "Optimized PyTree Utilities") (description "This package contains operations on PyTrees (a tree made of -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 03/14] gnu: cpp-httplib: Update to 0.18.5. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708105851 (code B ref 75708); Wed, 22 Jan 2025 18:34:02 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:30 +0000 Received: from localhost ([127.0.0.1]:36425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXc-0001Vq-DF for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:29 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53635) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXa-0001VN-81 for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:27 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 48BD6240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570800; bh=2hMO7HOKrZPFreLVmGslBqnF70eZXK0r1xpEf5aRNsI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ZtZVTViWCCku/1IatrWr0L3uZFqI9vEx+80RGVzhCQecHGSAFlVT6i7Qgu8cj5SzC 9VLPCBRR7KOsFlcObN0ZkH4sAeGhgQ2Y3SStIlgiDh5BmvsXxG9V2fKGoJhz8iuaIJ ye0iV+pXm5NdBDCNf+T5vkKSwJ8Bz6B/m+kcbyY9rQzWp3BT2zdkZOonKigVliD18E /IFtxWIc/BSFEgUv9iumdHZINcSARCfDoN847nw4vr8NFKRRGwRSxd5U5+2IaZw8si y9WFmEMUjv64O00NOunaJDI3bKjJCW0xWugA2HY7gojlBkma0BxUEzZw4x27B7sWZe td8ByTkrJ7+ug== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl35xDzz6tsg; Wed, 22 Jan 2025 19:33:19 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:14 +0000 Message-ID: <20250122183235.3472-4-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (cpp-httplib): Update to 0.18.5. [native-inputs] Add curl. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 626118e2db..5e6dce637d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1246,7 +1246,7 @@ (define-public cpp-httplib ;; header (package (name "cpp-httplib") - (version "0.16.0") + (version "0.18.5") (source (origin (method git-fetch) @@ -1254,7 +1254,7 @@ (define-public cpp-httplib (url "https://github.com/yhirose/cpp-httplib") (commit (string-append "v" version)))) (sha256 - (base32 "0n4ribq7c6lqj0hn50pdvy7wml62fqbgrgysb038fq1qc6xyw3np")) + (base32 "1jc31n4xdrknal4i1dvf8j6j9kafpczi0w5gbbi89xlir9dgm5kp")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1290,7 +1290,7 @@ (define-public cpp-httplib "TooManyRedirectTest" "UrlWithSpace" "YahooRedirectTest" "YahooRedirectTest"))))))) (native-inputs - (list googletest python)) + (list curl googletest python)) (inputs (list brotli openssl zlib)) (home-page "https://github.com/yhirose/cpp-httplib") -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 01/14] gnu: asmjit: Update to commit cfc9f81. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708225928 (code B ref 75708); Wed, 22 Jan 2025 18:34:03 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:42 +0000 Received: from localhost ([127.0.0.1]:36436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXo-0001XX-V2 for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:41 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44665) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXa-0001VK-1O for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:28 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 3D519240027 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570799; bh=rCVd7ht/HF47bWL/t6pMKdrmv9DEwYdFSEbx3LcGPOk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=O0jPkXLmcET0bAOgl2Xbd1eD2+U472aP50noFwT9my5mCr8Xx+aKpxUYJqwaf7XQx AFpEbA/xie44IKw6N6aVpnI+Cp0gF9uw5g7GU/pQm/mxUmQjvIxAMT4lMizYPbpKxr L/bJoBEBE5gJvALymDTyIJM0h1ErK12W/a1m6vJENY0LOez2ZqnA2B0t//2m9dp+kr uEjjP97jX1ZTTi+wnFWvL3TIftDUjUzoZw3nl2hE9jrufjHV0I3eHcDmA+PiHrk/he 1AiDe5/aJGpfSVTtZzxjAn+0E7snBBaGxGAjDMqBREpUCih905eaMVEnLhnUPP00A7 wBcqkwL6trUJA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl24fRRz6tvm; Wed, 22 Jan 2025 19:33:18 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:12 +0000 Message-ID: <20250122183235.3472-2-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (asmjit): Update to commit cfc9f81. --- gnu/packages/cpp.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7f7c24dcde..626118e2db 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Attila Lendvai ;;; Copyright © 2022 Arun Isaac -;;; Copyright © 2022, 2023, 2024 David Elsing +;;; Copyright © 2022-2025 David Elsing ;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Antero Mejr @@ -165,8 +165,8 @@ (define-public argagg (license license:expat)))) (define-public asmjit - (let ((commit "062e69ca81defa35eb0ee15f7412f49a0dad3cdb") - (revision "1")) + (let ((commit "cfc9f813cc6ccda63cad872edb32b38e0662bedb") + (revision "2")) (package (name "asmjit") (version (git-version "0.0.0" revision commit)) @@ -179,7 +179,7 @@ (define-public asmjit (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0lcwqzbv2628g3c7sflkwagyh49lp471px8bhg7lr77w9y94srqq")))) + (base32 "0lxkfg0b2bc2la0cvs5658a26mb00zlir4n0jkzzlg97l0jrbwpv")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DASMJIT_TEST=TRUE"))) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 02/14] gnu: cpuinfo: Update to commit ca156f7. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708235936 (code B ref 75708); Wed, 22 Jan 2025 18:34:03 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:43 +0000 Received: from localhost ([127.0.0.1]:36438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXq-0001Xd-1h for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:42 -0500 Received: from mout02.posteo.de ([185.67.36.66]:37687) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXa-0001VM-DJ for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:28 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9A7F0240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570799; bh=yYFBY1cUdzITKPMLawG3Knw+nw+7TZ1BT8YhI3Z2FNg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=PigJdUZ7fVxC0q88A/geYohiFxJh2qe3za64O0+z7rYo01PW5YNP+8WSSf7p91why AGcWzrFSo9/2Q51JMEbp3Fw12BGtEjkSBHS6970/u8fihls4ozgZRKvv2BjuEAjh+E todvWXvBnoe5Vt5NRblpNO1o57oLIV1va+7+6ob4Rrt8HjgNBS0oESMVREB0zLwVkn ep5AdkvmT2IYfDLuk2Oy2/sJ+K2kdntMYDnR3jJB5r34WOMqkqXheuTMFqGgRAjetB +PWKIc9qrhVOI0dR9ZyZTwO9buGmCHdUBD8iso8S/mlZHXuYYHfHfeCfYUfLVmfAEs difJPwdb0ck8g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl31tKzz6tsg; Wed, 22 Jan 2025 19:33:19 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:13 +0000 Message-ID: <20250122183235.3472-3-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/parallel.scm (cpuinfo): Update to commit ca156f7. --- gnu/packages/parallel.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 0197891fb6..19da40fe98 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Romain Garbage ;;; Copyright © 2024 Arun Isaac ;;; Copyright © 2024 Maxim Cournoyer @@ -599,8 +599,8 @@ (define-public pthreadpool (define-public cpuinfo ;; There's currently no tag on this repo. (let ((version "0.0") - (revision "3") - (commit "05332fd802d9109a2a151ec32154b107c1e5caf9")) + (revision "4") + (commit "ca156f7bc9109c552973414a63d310f76ef0cbf8")) (package (name "cpuinfo") (version (git-version version revision commit)) @@ -611,7 +611,7 @@ (define-public cpuinfo (file-name (git-file-name name version)) (sha256 (base32 - "0w0kfc1fn9viirkhbr8dgfy9m5clfsg3k9p6kdxhzqpyjhgd252n")))) + "12ip6mnmymqhcbi8p98cn109y47pg9ygbj3k96r22dbmr77a50c4")))) (build-system cmake-build-system) (arguments (list -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 00/14] Update PyTorch to 2.5.1 Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708235945 (code B ref 75708); Wed, 22 Jan 2025 18:34:03 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:43 +0000 Received: from localhost ([127.0.0.1]:36440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXr-0001Xm-5D for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53557) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXa-0001VI-1h for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:28 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 40B36240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570797; bh=JOlJR8rFqItV8zPRUsPzHvyshodhcim0qcmN5WTgrWs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=c8F6XUJaDPYc5OVJcqWKdAvxFoRyO5IF7HZQlYc0zfr6uDdOtWbkxOwTlMCFFCVRy 3lxvaju6uKb4coHuSXbZadgO0WT2orXaZ/5v3J8mHqI7y1IHTe7Ps5640zX0EuZIi7 D/mUig6YbMtrYlsG1Z+jlUrEQcjh2CJuV3O5ssvWoZ6JmBmA8Wg+7qFdr4bmGKsVXz SkzkSbQ6QIpw1BkwSnOuSMc7aBnPUuOsDYV3sQS7IVbNJnOB5e+iWpZaZczsUdNjKG /w4G3N8oViYq4TUZWbr5P8Ls9DBReMPa7RN1i9cpbF+sy623p5/ecVGmZKYOBgyrV1 Stg1YukRGCClw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXkz38Kyz6tvm; Wed, 22 Jan 2025 19:33:15 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:11 +0000 Message-ID: <20250122183235.3472-1-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) In the first version, I forgot to update fbgemm, python-torchvision and python-pytorch-geometric. David Elsing (14): gnu: asmjit: Update to commit cfc9f81. gnu: cpuinfo: Update to commit ca156f7. gnu: cpp-httplib: Update to 0.18.5. gnu: flatbuffers-next: Update to 24.12.23. gnu: onnx: Update to 1.17.0. gnu: Add pybind11-2.13. gnu: python-optree: Update to 0.14.0. gnu: python-sympy: Update to 1.13.3. gnu: oneapi-dnnl: Regenerate autogenerated files. gnu: fbgemm: Update to 1.0.0. gnu: python-pytorch: Update to 2.5.1. gnu: python-pytorch-for-r-torch: Fix build. gnu: python-torchvision: Update to 0.20.1. gnu: python-pytorch-geometric: Update to 2.6.1. gnu/local.mk | 3 +- gnu/packages/cpp.scm | 14 +- gnu/packages/machine-learning.scm | 109 ++++++++++++---- gnu/packages/parallel.scm | 8 +- .../patches/fbgemm-use-system-libraries.patch | 18 +-- .../patches/python-optree-fix-32-bit.patch | 122 ------------------ .../patches/python-pytorch-fix-codegen.patch | 42 +++--- .../python-pytorch-system-libraries.patch | 100 +++++++------- gnu/packages/python-xyz.scm | 56 +++++--- gnu/packages/serialization.scm | 6 +- 10 files changed, 222 insertions(+), 256 deletions(-) delete mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 04/14] gnu: flatbuffers-next: Update to 24.12.23. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708245953 (code B ref 75708); Wed, 22 Jan 2025 18:34:04 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:44 +0000 Received: from localhost ([127.0.0.1]:36442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXr-0001Xq-Nl for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43463) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXa-0001VP-LF for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:28 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BA66C240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570800; bh=PlPB3FBliUPJnJb994DLgR81I0H8BtwqEsWE/STwiKM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=cX/VIIl2Fr+TKxZVavbFoMzBrr9LDDHGmJq4/IesYaE4OelavFIzARla2e+pu9P3o uGBgPxf1Zgj85ITMqLJPHVQUaIgwJ67sH8e1utyzYWoUf/i5DvMyFaCtF0u/EOmxPQ xkVYhDEWyUlVuBxSsZaPa8sJbZ4mE2iz+PZLKo+wSt9B9F9qWVGxqrXqEGJ0KIoxUy Mv6CAFjZbviha5+ctqcMzEc0duQItFs8v9OhRRxZwDQCjPL2tQDCO5egjvlGBrWQRo BTOp+4sqpRPtVMOoCIIxfujKtsk1R/qZWLgIV+Z48tK0Dfnw06Ri+k91KTpjeipg+C ylAMhs/QeYvzQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl42qhBz6tsg; Wed, 22 Jan 2025 19:33:20 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:15 +0000 Message-ID: <20250122183235.3472-5-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/serialization.scm (flatbuffers-next): Update to 24.12.23. --- gnu/packages/serialization.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 338682d16c..d9a9e240f9 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2024 Paul A. Patience ;;; Copyright © 2024 Arun Isaac ;;; Copyright © 2024 Wilko Meyer -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -946,7 +946,7 @@ (define-public flatbuffers-23.1 (define-public flatbuffers-next (package (inherit flatbuffers) - (version "24.3.25") + (version "24.12.23") (source (origin (method git-fetch) (uri (git-reference @@ -955,7 +955,7 @@ (define-public flatbuffers-next (file-name (git-file-name "flatbuffers" version)) (sha256 (base32 - "0q066x1h0x9225aj25jv40gxgz46yvwmiqc2g6q06mkkg1144kxq")))))) + "01g64kmjw8dfhj12j5fgyx70avix9p1ml4w25lm726dixmpq9gp8")))))) (define-public python-flatbuffers (package -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 06/14] gnu: Add pybind11-2.13. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708255961 (code B ref 75708); Wed, 22 Jan 2025 18:34:05 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:45 +0000 Received: from localhost ([127.0.0.1]:36444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXs-0001Xy-GX for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:45 -0500 Received: from mout01.posteo.de ([185.67.36.65]:39601) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXb-0001VR-Ra for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:29 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 08FFB240027 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570802; bh=TJwwJ8Tm1qjSTXfikIUFbfqT0bFfmbyGQl+OnGtUfOg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=rernmYv9J+8WROV6QGhD3coGyvpZQICBBLbxKvTtYs/L/PRVBBe4pDzhVYL10Fipk 7sDzmsXqHPXbWHTDAW2WM/wHWPTSluXujzVoulNGR3ejOIoDFqVC/c6MhZgNbl5UPK r5OJ5PqJa+pDyVGT0VyWCBiw5yHlebzkuYhd/9SgLs88Btlmsgax9mfZVL/LtBy0Yk U5p9DnI4sHTXeQ/UK1ihbiw0qfa0XFcUiaOz7fmRU+uCmYcNtCg5IHx/MqjXreuHCx Hi5xK/tfZ6itlDMKZAGDogYCcTkzy/MQX9LUeVU4gGXPibX1J3LoYofV6cV+NGTcI5 U/ZepO0uLJCyQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl54Ddlz6tsg; Wed, 22 Jan 2025 19:33:21 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:17 +0000 Message-ID: <20250122183235.3472-7-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/python-xyz.scm (pybind11-2.13): New variable. --- gnu/packages/python-xyz.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1c4273b05d..0ecefa8df2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -153,7 +153,7 @@ ;;; Copyright © 2024 Adriel Dumas--Jondeau ;;; Copyright © 2024 Navid Afkhami ;;; Copyright © 2024 TakeV -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Rick Huijzer ;;; Copyright © 2024 Peter Kannewitz ;;; Copyright © 2024 Aaron Covrig @@ -29009,6 +29009,22 @@ (define-public pybind11 inferring type information using compile-time introspection.") (license license:bsd-3))) +;; Needed for python-optree +(define-public pybind11-2.13 + (package + (inherit pybind11) + (name "pybind11") + (version "2.13.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pybind/pybind11") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1dbnki0pnky39kr04afd9ks597bzjc530zbk33jjss53nfvdvlj8")) + (file-name (git-file-name name version)))))) + ;; Needed for scipy (define-public pybind11-2.10 (package -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 05/14] gnu: onnx: Update to 1.17.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708265968 (code B ref 75708); Wed, 22 Jan 2025 18:34:05 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:46 +0000 Received: from localhost ([127.0.0.1]:36446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXt-0001Y5-ET for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:45 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34223) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXc-0001VT-LO for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:30 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id AEDC4240027 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570802; bh=zC9dPQVra6IW0LbW6D+Vo+WEjZ6XT5pu8EhillynqzI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=N3Hhv7sd3MGrGJdtBFMcBVcNK2EbOtQ/tTTTB7JyyQtU/RJVA9pGcxX3cjPcy91na vCbV00f8cScI/Dgxi4UJC1OcQLN6F2SH7Qt/fmI2Ennxoxk/lUsy1GuFYGYuVsmOjs BVwee9dMM52Ii+g5x+JPgHJDM656KlxiLNXD7WKkv3kRw0ies5idYOJIr8tPkhXruk BTP7TmSuTvudSwEjgBdHCNUBgsSj/i8rQPPi+KeDGAIzcV3sTG821Pp8d7hjLG4ku7 UVeSK2PHUXyiTpkdlU27e1oAA+X3DlPh7pV6Okwa2u9jpKLevBDJCsKhgFeisNUJCP GKb9qbXaKsAMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl46m3Lz6tsg; Wed, 22 Jan 2025 19:33:20 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:16 +0000 Message-ID: <20250122183235.3472-6-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (onnx): Update to 1.17.0. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4d1d49553a..0b4d9638f0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2024 David Pflug ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Spencer King -;;; Copyright © 2024 David Elsing +;;; Copyright © 2024, 2025 David Elsing ;;; Copyright © 2024 Andy Tai ;;; ;;; This file is part of GNU Guix. @@ -1515,7 +1515,7 @@ (define (delete-ifdefs file) (define-public onnx (package (name "onnx") - (version "1.16.2") + (version "1.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -1523,7 +1523,7 @@ (define-public onnx (commit (string-append "v" version)))) (sha256 (base32 - "0f5h204ksfz4ir3qq38ckxja1jfhf1vn5xzwrj83vkkbfjq6fv16")) + "1i6bh4z2xzz1maykr0xmrwfybm6i3g38vnx7hsls8hr58rdr30zn")) (file-name (git-file-name name version)) (patches (search-patches "onnx-shared-libraries.patch" -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 08/14] gnu: python-sympy: Update to 1.13.3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708265975 (code B ref 75708); Wed, 22 Jan 2025 18:34:06 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:46 +0000 Received: from localhost ([127.0.0.1]:36448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXt-0001YD-Uu for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:46 -0500 Received: from mout01.posteo.de ([185.67.36.65]:39823) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXd-0001VV-0l for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:30 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2E961240027 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570803; bh=rOpO/zTs+9tS0MXe2uCcxC0KueoTpEX+JmA0xBEWVRs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=RFa9WenukJJ1meugOpkxCsiJ5WZ8A+YTtQzzGrLoU/w5HYJfMeO8aVNovmTElBkL6 dDdAkR/b/AEtjh7TFD/MHOQL7vLunTUBBi5PMN8oMhPG7bFQt6u9fjLWZPq6M+X+CS nGl1RaDfmtEauF/UQV+e93DkVQS5cv2mr3Oj8eBAImaVfXCQ/+N0Y/cOC44QTQZkVd hxHqSXcRFuGEknmM1Db8tC7y2DCoDSXL7bsfDP13pZomA2LdWuXbl9foNMQ4CXFRzY fjgH1P4s4Tlk8wl+eNfYazntYsWPwFZsU/O8cznNvVDwoLwv3SbaY7DNFDVLwr9/Tx 9NIJ5ua8zUK4g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl65nlwz6tvm; Wed, 22 Jan 2025 19:33:22 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:19 +0000 Message-ID: <20250122183235.3472-9-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/python-xyz.scm (python-sympy): Update to 1.13.3. [build-system]: Switch to pyproject-build-system. [arguments]<#:phases>: Adjust 'check phase. [native-inputs]: New field to add python-hypothesis, python-pytest, python-setuptools and python-wheel. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f7ac3e069..9e389ed02e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14963,24 +14963,28 @@ (define-public python-syllables (define-public python-sympy (package (name "python-sympy") - (version "1.11.1") + (version "1.13.3") (source (origin (method url-fetch) (uri (pypi-uri "sympy" version)) (sha256 - (base32 "0n46x1rfy8c2a9za3yp2va5icigxj805f9fmiq8c1drwwvf808z3")))) - (build-system python-build-system) + (base32 "1nf4zrjjbnv47n6sl6x9blfyarski61vdjaz4ygb62hfag3d4zxj")))) + (build-system pyproject-build-system) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (invoke - (or (which "python3") (which "python")) - "-c" "import sympy; sympy.test(\"/core\")")))))) - (propagated-inputs - (list python-mpmath)) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python3" "-c" + "import sympy; sympy.test(\"/core\")"))))))) + (propagated-inputs (list python-mpmath)) + (native-inputs + (list python-hypothesis + python-pytest + python-setuptools + python-wheel)) (home-page "https://www.sympy.org/") (synopsis "Python library for symbolic mathematics") (description -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 07/14] gnu: python-optree: Update to 0.14.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708275983 (code B ref 75708); Wed, 22 Jan 2025 18:34:06 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:47 +0000 Received: from localhost ([127.0.0.1]:36450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXu-0001YK-DP for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:47 -0500 Received: from mout02.posteo.de ([185.67.36.66]:40953) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXc-0001VS-D8 for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:31 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 91B8F240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570802; bh=lPrvG+vo8LdXaaVlLVueuwJlsMjt+qhDUbK8lNd9zyQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=U+ZeGJWeP69nvvFKKioY+P09t4PktukGmYChDWt1BfjNbQkk6q+pOevldJYDu96+L RKdmD/JSmqN+RMjPcuVwAdXPTgxNBUU9jtzfvhIObhGG4eT8YzFbko689v1InEKKzQ ERCo+qmdJwgVgEyCFJdgbJtvkHgOY4tKkFC/CIPP/nkj0nB91aY2KeCbgbsfNuP+kY Pvfvgvi8KTY+HmozCHHad693+3v1RFdkCTDma/rCfLp1M9CtekjJtfphaIaeQqfeEG hZdmaF0R3hUsEd88fEsw5BbPh6XvbKIifZRkEyiKuS7p7C9PqtyUPEIcPPAsFb0sed DDCqybNVy1svA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl61Zppz6tvm; Wed, 22 Jan 2025 19:33:22 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:18 +0000 Message-ID: <20250122183235.3472-8-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/python-xyz.scm (python-optree): Update to 0.14.0. [source]: Remove patch. [arguments]<#:test-flags>: Disable additional failing test. [native-inputs]: Replace pybind11 with pybind11-2.13 and cmake with cmake-minimal. * gnu/packages/patches/python-optree-fix-32-bit.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 3 +- .../patches/python-optree-fix-32-bit.patch | 122 ------------------ gnu/packages/python-xyz.scm | 14 +- 3 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5091f93eb8..09a72d2418 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -64,7 +64,7 @@ # Copyright © 2023, 2024 gemmaro # Copyright © 2023 Herman Rimm # Copyright © 2023 Troy Figiel -# Copyright © 2024 David Elsing +# Copyright © 2024, 2025 David Elsing # Copyright © 2024 Ashish SHUKLA # Copyright © 2024 Fabio Natali # Copyright © 2024 Noé Lopez @@ -2095,7 +2095,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-hiredis-use-system-hiredis.patch \ %D%/packages/patches/python-online-judge-api-client-tests.patch \ - %D%/packages/patches/python-optree-fix-32-bit.patch \ %D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ diff --git a/gnu/packages/patches/python-optree-fix-32-bit.patch b/gnu/packages/patches/python-optree-fix-32-bit.patch deleted file mode 100644 index 6a32c39bd8..0000000000 --- a/gnu/packages/patches/python-optree-fix-32-bit.patch +++ /dev/null @@ -1,122 +0,0 @@ -In include/utils.h, ssize_t is an alias for py::ssize_t, which is an alias for -Py_ssize_t in Python, which is an alias for the system ssize_t. -The latter is defined in glibc as int if __WORDSIZE == 32 and as long int if -__WORDSIZE == 64. Therefore, we need to remove the explicit template -specialization for int in the first case. - -diff --git a/include/utils.h b/include/utils.h -index 950a02b..82a9591 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -141,10 +141,12 @@ template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { - return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#if __WORDSIZE != 32 - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { - return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#endif - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const ssize_t& item) { - return PyList_GET_ITEM(container.ptr(), item); -@@ -153,10 +155,12 @@ template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const size_t& item) { - return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#if __WORDSIZE != 32 - template <> - inline py::handle GET_ITEM_HANDLE(const py::handle& container, const int& item) { - return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)); - } -+#endif - - template - inline py::object GET_ITEM_BORROW(const py::handle& container, const Item& item) { -@@ -171,11 +175,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const - return py::reinterpret_borrow( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { - return py::reinterpret_borrow( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const ssize_t& item) { - return py::reinterpret_borrow(PyList_GET_ITEM(container.ptr(), item)); -@@ -185,11 +191,13 @@ inline py::object GET_ITEM_BORROW(const py::handle& container, const s - return py::reinterpret_borrow( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_BORROW(const py::handle& container, const int& item) { - return py::reinterpret_borrow( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - - template - inline py::object GET_ITEM_STEAL(const py::handle& container, const Item& item) { -@@ -204,11 +212,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const s - return py::reinterpret_steal( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { - return py::reinterpret_steal( - PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const ssize_t& item) { - return py::reinterpret_steal(PyList_GET_ITEM(container.ptr(), item)); -@@ -218,11 +228,13 @@ inline py::object GET_ITEM_STEAL(const py::handle& container, const si - return py::reinterpret_steal( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#if __WORDSIZE != 32 - template <> - inline py::object GET_ITEM_STEAL(const py::handle& container, const int& item) { - return py::reinterpret_steal( - PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item))); - } -+#endif - - template - inline void SET_ITEM(const py::handle& container, const Item& item, const py::handle& value) { -@@ -240,12 +252,14 @@ inline void SET_ITEM(const py::handle& container, - const py::handle& value) { - PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#if __WORDSIZE != 32 - template <> - inline void SET_ITEM(const py::handle& container, - const int& item, - const py::handle& value) { - PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#endif - template <> - inline void SET_ITEM(const py::handle& container, - const ssize_t& item, -@@ -258,12 +272,14 @@ inline void SET_ITEM(const py::handle& container, - const py::handle& value) { - PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#if __WORDSIZE != 32 - template <> - inline void SET_ITEM(const py::handle& container, - const int& item, - const py::handle& value) { - PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr()); - } -+#endif - - template - inline void AssertExact(const py::handle& object) { diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ecefa8df2..1f7ac3e069 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13177,7 +13177,7 @@ (define-public python-treelib (define-public python-optree (package (name "python-optree") - (version "0.11.0") + (version "0.14.0") (source (origin (method git-fetch) @@ -13187,21 +13187,21 @@ (define-public python-optree (file-name (git-file-name name version)) (sha256 (base32 - "0sk5lm1xyxi7z0yjckip77qvbidyb7i1znmn9fz96q74hl9ffyan")) - (patches (search-patches "python-optree-fix-32-bit.patch")))) + "17zph1jgzk0zaanj7057qj8x5cml8j66ip0xmlbwmq4396hmdlbs")))) (build-system pyproject-build-system) (arguments (list #:test-flags - ;; This test fails due to a circular import - ''("-k" "not test_treespec_pickle_missing_registration"))) + ;; These tests fails due to a circular import + '`("-k" ,(string-append "not test_treespec_pickle_missing_registration" + " and not test_import_no_warnings")))) (propagated-inputs (list python-typing-extensions)) (native-inputs (list python-pytest python-setuptools python-wheel - cmake - pybind11)) + cmake-minimal + pybind11-2.13)) (home-page "https://github.com/metaopt/optree") (synopsis "Optimized PyTree Utilities") (description "This package contains operations on PyTrees (a tree made of -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 09/14] gnu: oneapi-dnnl: Regenerate autogenerated files. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708285993 (code B ref 75708); Wed, 22 Jan 2025 18:34:07 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:48 +0000 Received: from localhost ([127.0.0.1]:36452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXv-0001YS-6D for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:47 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36673) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXh-0001Vj-Ml for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:34 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D8541240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570803; bh=gjdhFXiVWVr1oF9Q/RpedFn0VJnMK4Ny+nwY6v0x0N8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=bHFCjHfGUoslmwbFpqTHK8jKbY8emqKIik0mP5cnI15ZVxHuSBmYks3Gjp4h75h/+ hMCLmZV7nUIDNwTrNZ9x5q2ar2HQxVy8Ahf//TYvohdtziU5af2FE/A+AjcPxZoHpF ll4tJW4WQtjf6HoqQup9WY5K/JjzoUC8QkNXWZVVaT9lAD+giSJq5ve8UvRL8f/dta yoij/WWr48haLnV0TajwMGbFcytohs4245JtgAEReaica9ycHlExjZhC4HnnB6JGWh 1btsidUlWiHOPE/tM5NsSiPl+s+mPmmhOmZk/faBJiPbx77RJaptms1PmDA9309IAn ctFW0DGpCH3Tw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl72fcJz6tvm; Wed, 22 Jan 2025 19:33:23 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:20 +0000 Message-ID: <20250122183235.3472-10-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (oneapi-dnnl)[source]: Add snippet. [arguments]<#:configure-flags>: Add "-DDNNL_EXPERIMENTAL_UKERNEL=ON". [arguments]<#:phases>: Add 'codegen phase. [native-inputs]: New field to add castxml, clang-17 and python. --- gnu/packages/machine-learning.scm | 44 ++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0b4d9638f0..cbeef84f06 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -6261,11 +6261,47 @@ (define-public oneapi-dnnl (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")))) + (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")) + (modules '((guix build utils) + (ice-9 rdelim))) + ;; Copyright date used by code generation script + (snippet + '(for-each + (lambda (file) + (with-atomic-file-replacement + file + (lambda (in out) + (let loop ((line (read-line in 'concat))) + (if (string-contains line "Copyright") + (display line out) + (loop (read-line in 'concat))))))) + '("include/oneapi/dnnl/dnnl_debug.h" + "src/common/dnnl_debug_autogenerated.cpp" + "tests/benchdnn/dnnl_debug_autogenerated.cpp" + "tests/benchdnn/dnnl_debug.hpp"))))) (build-system cmake-build-system) - (arguments (if (target-riscv64?) - (list #:configure-flags #~'("-DDNNL_CPU_RUNTIME=SEQ")) - '())) + (arguments + (list + #:configure-flags + `(list + ,@(if (target-riscv64?) + (list #:configure-flags '("-DDNNL_CPU_RUNTIME=SEQ")) + '()) + ;; Used in PyTorch + "-DDNNL_EXPERIMENTAL_UKERNEL=ON") + #:phases + '(modify-phases %standard-phases + (add-after 'configure 'codegen + (lambda _ + (with-directory-excursion "../source" + (invoke "castxml" "--castxml-cc-gnu-c" "clang" + "--castxml-output=1" "-DDNNL_EXPERIMENTAL_SPARSE" + "-Iinclude" "-I../build/include" + "include/oneapi/dnnl/dnnl_types.h" "-o" "types.xml") + (invoke "python3" "scripts/generate_dnnl_debug.py" "types.xml") + ;; Modifies include/oneapi/dnnl/dnnl.hpp + (invoke "python3" "scripts/generate_format_tags.py"))))))) + (native-inputs (list castxml clang-17 python)) (home-page "https://github.com/oneapi-src/oneDNN") (synopsis "Deep Neural Network Library") (description -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 10/14] gnu: fbgemm: Update to 1.0.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708286000 (code B ref 75708); Wed, 22 Jan 2025 18:34:07 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:48 +0000 Received: from localhost ([127.0.0.1]:36454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXv-0001Yc-SA for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:48 -0500 Received: from mout02.posteo.de ([185.67.36.66]:44563) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXh-0001Vk-NX for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:34 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5950F240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570804; bh=NW3oBre/qzPwHnyekqkgJAhlnBdOFRsDhmkZaWCA8cA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=JKwdMrAWgPZz7npwobm+rlPsY9yWlCppvyhCnYcOzeztxD2FveOXv9ogtcG4X6dYw 5jBs12+6Mq6/NeZbnisn9JhgIFDkBfA0bMTrjQd8nMQvq/A7zb49rS8Xts6sMsrCgQ GcRoEO1q6GNFPuifmgoCS2M9GEKxtJiOyB5Eb0OA2PaSzU1fBDLbG4S7J38vED9GoP XGN2s8kEjjv8h3J++JAjRXckP6sNe+9PtYTVM9V2uvh1Vd+3h3iRWAIKCbbjZmi4E2 ajObm7syeBzbfseJipvNDYYMcPPEzzbOJUcUOFRhXUCHC+5M5UVbkugbdoNjiURJ0U FOYSEIjQ/AXZA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl77216z6tvm; Wed, 22 Jan 2025 19:33:23 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:21 +0000 Message-ID: <20250122183235.3472-11-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (fbgemm): Update to 1.0.0. [arguments]: Add #:cmake. * gnu/packages/patches/fbgemm-use-system-libraries.patch: Adjust patch. --- gnu/packages/machine-learning.scm | 10 ++++------ .../patches/fbgemm-use-system-libraries.patch | 18 +++++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index cbeef84f06..7e044f816f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4539,7 +4539,7 @@ (define-public xnnpack-for-r-torch (define-public fbgemm (package (name "fbgemm") - (version "0.7.0") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -4548,14 +4548,12 @@ (define-public fbgemm (file-name (git-file-name name version)) (sha256 (base32 - "1dzw9w82ca0hss1lvshix6piwsd0k11lyq9pzm8yg8k7j56hmyig")) - (patches (search-patches "fbgemm-use-system-libraries.patch")) - (modules '((guix build utils))) - (snippet - '(delete-file-recursively "third_party")))) + "1a5g5f32377fad99xsfggqkwvl7vh5gc1wj77swa06x06lc1qwyw")) + (patches (search-patches "fbgemm-use-system-libraries.patch")))) (build-system cmake-build-system) (arguments (list + #:cmake cmake-3.30 #:configure-flags ''("-DFBGEMM_LIBRARY_TYPE=shared") ;; Tests require AVX2 or AVX-512 instructions diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch index 456bc3021c..a799443f1d 100644 --- a/gnu/packages/patches/fbgemm-use-system-libraries.patch +++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch @@ -1,19 +1,19 @@ Use the asmjit and cpuinfo packages. diff --git a/CMakeLists.txt b/CMakeLists.txt -index 134523e..b88b0e7 100644 +index 0243f686..f40dc408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -235,7 +235,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") +@@ -247,7 +247,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") message(WARNING "==========") -if(NOT TARGET asmjit) +if(FALSE) - #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + # Download asmjit from github if ASMJIT_SRC_DIR is not specified. if(NOT DEFINED ASMJIT_SRC_DIR) - set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" -@@ -264,7 +264,7 @@ if(NOT TARGET asmjit) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit" +@@ -280,7 +280,7 @@ if(NOT TARGET asmjit) endif() endif() @@ -21,8 +21,8 @@ index 134523e..b88b0e7 100644 +if(FALSE) #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. if(NOT DEFINED CPUINFO_SOURCE_DIR) - set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" -@@ -340,9 +340,12 @@ target_include_directories(fbgemm BEFORE + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo" +@@ -367,9 +367,12 @@ target_include_directories(fbgemm BEFORE target_link_libraries(fbgemm $ $) @@ -39,10 +39,10 @@ index 134523e..b88b0e7 100644 if(OpenMP_FOUND) target_link_libraries(fbgemm OpenMP::OpenMP_CXX) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 2cffddf..bd4d409 100644 +index da0be7fe..615f34ae 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 11) +@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17) set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_C_STANDARD_REQUIRED ON) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 12/14] gnu: python-pytorch-for-r-torch: Fix build. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708296007 (code B ref 75708); Wed, 22 Jan 2025 18:34:08 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:49 +0000 Received: from localhost ([127.0.0.1]:36456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXw-0001Yk-N1 for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:49 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50751) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXi-0001W5-NX for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:35 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8DBB4240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570805; bh=zWlRBMN+yjsXJFARIbzvn1bO3E+FWlUKX2vvLGh+QjI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=f6bgMaS4NmlQIBj5S4kHYmo9BAlyc8nCGHLcbLZNbgcdmvYEHewIwFbA+du3DzluM GczzWtzvRWOSstepeDmWs7b6CzGENf5+guoZtmOCVZP6UK+g2WezkKLxw40gM7Py4e D8rDYsJeSLS021VxIPRFfBZWEdjQudNPzflcnCjOA3QDm8JpasXlE7vjJ64/gkYWwV gPdjK+l3IUvlszXXX3wLpTMRcf3nujgSOrTzb5QO2IHB9Vhmn/FP3pWu0KG8lFZZx3 3VJAC0bUHLVBDfJiELZoFoQbQ49xJOcwuyE0y6HPKubIriIHHy5jVi2vH8PCV4dGZc rIurHARHKxeuw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl9169cz6v0T; Wed, 22 Jan 2025 19:33:25 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:23 +0000 Message-ID: <20250122183235.3472-13-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The build fails because the types of function pointers with return type '__m256' and 'const __m256' (or '__m512' and 'const __m512') are not treated as compatible by the compiler. * gnu/packages/machine-learning.scm (python-pytorch-for-r-torch) [arguments]: New field. [inputs]: Add foxi. --- gnu/packages/machine-learning.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2fcaea834f..e21736ab67 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5129,11 +5129,23 @@ (define-public python-pytorch-for-r-torch (name "python-pytorch") (version %python-pytorch-for-r-torch-version) (source %python-pytorch-for-r-torch-src) + (arguments + (substitute-keyword-arguments (package-arguments python-pytorch) + ((#:phases phases) + #~(modify-phases #$phases + ;; See https://github.com/pytorch/pytorch/issues/61244 + (add-after 'unpack 'fix-aten-vec + (lambda _ + (substitute* + '("aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h" + "aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h") + (("map\\(const __") "map(__")))))))) (native-inputs (modify-inputs (package-native-inputs python-pytorch) (replace "ideep-pytorch" ideep-pytorch-for-r-torch))) (inputs (modify-inputs (package-inputs python-pytorch) + (prepend foxi) (prepend qnnpack) (replace "qnnpack-pytorch" qnnpack-pytorch-for-r-torch) (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 13/14] gnu: python-torchvision: Update to 0.20.1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708306015 (code B ref 75708); Wed, 22 Jan 2025 18:34:08 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:50 +0000 Received: from localhost ([127.0.0.1]:36458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXx-0001Yv-Dl for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:49 -0500 Received: from mout02.posteo.de ([185.67.36.66]:39485) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXi-0001WB-Nd for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:35 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2EAA3240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570806; bh=zsXNnHP54rCo7E8IuYAbT3NuL6hiBKgUkqi9av3dUxk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=kHOANpPh9Sb2HAc0I9IbtPrq59YYkDq0jbg5+VNvpxRepxTZx2F8UoDI+I3b9GkNc OI+OnqcQ0TV/kbE5aVEcT0l4pxMjzs+fRCKE+VFZBRSL6goJxLS86K99laqmZO114w 6/18ZggLyAncc+ZNDY0q6u9pgj9z/6czHJIcqVqnP26qaSjLnWB6e/NnpWozi/nPaC WjOZjmhTh+Twe6oTAO16IaTOJ8boz594SgZXyHAoVMKECJ6XGCgIKk9LusnMf/wjiI PWOb2gf5fducWYKmfQknafpMetlF6BSl6H5twjPSlwMhWgGufXpA4+DxWnk93ZtBqQ 3aO+cRHO13xng== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl95dNkz6tsg; Wed, 22 Jan 2025 19:33:25 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:24 +0000 Message-ID: <20250122183235.3472-14-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/machine-learning.scm (python-torchvision): Update to 0.20.1. [native-inputs]: Add pybind11. --- gnu/packages/machine-learning.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e21736ab67..f646ba6e4e 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5551,7 +5551,7 @@ (define-public python-torchmetrics (define-public python-torchvision (package (name "python-torchvision") - (version "0.19.0") + (version "0.20.1") (source (origin (method git-fetch) (uri (git-reference @@ -5561,7 +5561,7 @@ (define-public python-torchvision (file-name (git-file-name name version)) (sha256 (base32 - "15zyq2k4x9yapx7qfghhslznz1mwybhf086pirsr98c4l891sp1r")) + "1hxcpg44bjnfzqwihzbnfgd0gpkhfgqrcg116mnvdn0fpbhf4yq5")) (modules '((guix build utils))) (snippet '(begin @@ -5593,7 +5593,11 @@ (define-public python-torchvision python-pillow-simd python-pytorch)) (native-inputs - (list which python-pytest python-setuptools python-wheel)) + (list pybind11 + python-pytest + python-setuptools + python-wheel + which)) (home-page "https://pytorch.org/vision/stable/index.html") (synopsis "Datasets, transforms and models specific to computer vision") (description -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 14/14] gnu: python-pytorch-geometric: Update to 2.6.1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708306022 (code B ref 75708); Wed, 22 Jan 2025 18:34:09 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:50 +0000 Received: from localhost ([127.0.0.1]:36460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXy-0001Z3-3N for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:50 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50041) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXi-0001WA-Nl for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:36 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C1085240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570806; bh=NLqerUBJdnM5F6kDD4GIhCq1InMlkxuU4V9k3tAstzY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=N2wdFj9aWxVG4hZsoruDF7dOjx7XvBU8rAAjmdjwFTmcyICAwh/Bxns7fz/Y2eu99 2QKT9C/KfOQfy/5sDm5KF9cr72zok6aMDu4zpeyQqqkc0bLtez9FvGCe5JpwhmRM/o 6al2BDWEMAcz9Cy4XAzCkyOzmmASW3vkLQN/IF8H38+Zv0yXS7Zo8l6PMAA02kaklH RH/jweRv2mmLshPo9V87a+EfXQkFdD7M2kHCwnK+pYVFL7Y0N/pgxn92fod42JyJCz Ank6cykNB/zaylFX0uAGVrBhFNQWoUfFir8eSgevi6yaRgH18vI9x2jwwCKUdwuXQX jVyj8A4+JxGlw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXlB2mzdz6v0T; Wed, 22 Jan 2025 19:33:26 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:25 +0000 Message-ID: <20250122183235.3472-15-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/machine-learning.scm (python-pytorch-geometric): Update to 2.6.1. [arguments]<#:phases>: Disable another test. --- gnu/packages/machine-learning.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f646ba6e4e..e810698a96 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5161,7 +5161,7 @@ (define-public python-pytorch-for-r-torch (define-public python-pytorch-geometric (package (name "python-pytorch-geometric") - (version "2.4.0") + (version "2.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -5170,7 +5170,7 @@ (define-public python-pytorch-geometric (file-name (git-file-name name version)) (sha256 (base32 - "0hrs579asjsph16hyb4ablkbgfwd5j9y5s6ny7ahn3qrbkl2ji1g")))) + "0dbxz9d22vzm7fr9kgg66hj3sf8ag2ly8qky58cxvn1hyjl5h3v7")))) (build-system pyproject-build-system) (arguments (list @@ -5184,6 +5184,8 @@ (define-public python-pytorch-geometric ;; These all fail with a size mismatch error such as ;; RuntimeError: shape '[-1, 2, 1, 1]' is invalid for input of size 3 "--ignore=test/explain/algorithm/test_captum_explainer.py" + ;; Requires the nonfree MKL on CPU. + "--ignore=test/nn/models/test_graph_unet.py" "-k" (string-append ;; Permissions error "not test_packaging" -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75708] [PATCH v2 11/14] gnu: python-pytorch: Update to 2.5.1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 18:34:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75708@debbugs.gnu.org Cc: David Elsing Received: via spool by 75708-submit@debbugs.gnu.org id=B75708.17375708326032 (code B ref 75708); Wed, 22 Jan 2025 18:34:09 +0000 Received: (at 75708) by debbugs.gnu.org; 22 Jan 2025 18:33:52 +0000 Received: from localhost ([127.0.0.1]:36462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tafXy-0001ZA-JZ for submit@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:52 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46823) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tafXi-0001W6-NF for 75708@debbugs.gnu.org; Wed, 22 Jan 2025 13:33:37 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id ED4DC240101 for <75708@debbugs.gnu.org>; Wed, 22 Jan 2025 19:33:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737570804; bh=mhwun52iUt/9KleiJaTGpJKL/JJFfE3ilA7qYncVnYM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hnIsp9KzM3T/n59WcPk8TT7XuXw6sXr3fX0tlonb6UYbTomjnuvJtqZudMwDsP3Li LRquKGqeV/Z8Pm8rcLPaLsRmMUQeiihTxgflgxV1d4ckGq9QUfRJGQKXctgAOIbfe6 cvWF4t5tOI73UX+RMIWx77QxRPZDlpzDOQX76yfQcMRVEySoVAS6wP8AowRSP0HzVO qn2hKapU2zS0O1xSmTEOD2q3Xh72Oal0Yk1BDO2NY0xPj7eJc1hVQPCTbmyW21y5HI SS8zGeRfg0Q+xom/cLqLLPgvzFuHwe0msFqINhNWm4bEQeKyif32C88e3+GOWeQOSU +dPDG2rDG7kqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YdXl83vxSz6tw5; Wed, 22 Jan 2025 19:33:24 +0100 (CET) From: David Elsing Date: Wed, 22 Jan 2025 18:32:22 +0000 Message-ID: <20250122183235.3472-12-david.elsing@posteo.net> In-Reply-To: <20250120215716.15707-1-david.elsing@posteo.net> References: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This also updates the qnnpack-pytorch package. * gnu/packages/machine-learning.scm (%python-pytorch-version): Set to 2.5.1. (%python-pytorch-src): Adjust hash accordingly. (python-pytorch)[arguments]<#:phases>: Add 'remove-fr-trace-script phase. Adjust 'use-system-libraries phase. [native-inputs]: Add nlohmann-json. Replace cmake with cmake-minimal. [inputs]: Remove foxi. * gnu/packages/patches/python-pytorch-fix-codegen.patch: Adjust patch. * gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust patch. --- gnu/packages/machine-learning.scm | 21 +++- .../patches/python-pytorch-fix-codegen.patch | 42 +++++--- .../python-pytorch-system-libraries.patch | 100 +++++++++--------- 3 files changed, 90 insertions(+), 73 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7e044f816f..2fcaea834f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4671,7 +4671,7 @@ (define-public ideep-pytorch-for-r-torch (base32 "0hdpkhcjry22fjx2zg2r48v7f4ljrclzj0li2pgk76kvyblfbyvm")))))) -(define %python-pytorch-version "2.4.0") +(define %python-pytorch-version "2.5.1") (define %python-pytorch-src (origin @@ -4682,7 +4682,7 @@ (define %python-pytorch-src (file-name (git-file-name "python-pytorch" %python-pytorch-version)) (sha256 (base32 - "18hdhzr12brj0b7ppyiscax0dbra30207qx0cckw78midfkcn7cn")) + "052cvagpmm9y7jspjpcyysx8yc5fhxnjl8rcz6nndis06v8dcj8s")) (patches (search-patches "python-pytorch-system-libraries.patch" "python-pytorch-runpath.patch" "python-pytorch-without-kineto.patch" @@ -4828,6 +4828,14 @@ (define-public python-pytorch (string-append #$output "/lib/python" #$(version-major+minor (package-version python)) "/site-packages"))))) + ;; This entry point is broken, because it refers to a module that is + ;; (intentionally) not installed + ;; (https://github.com/pytorch/pytorch/pull/134729), which causes + ;; the 'sanity-check phase to fail. + (add-after 'unpack 'remove-fr-trace-script + (lambda _ + (substitute* "setup.py" + (("entry_points\\[\"console_scripts\"\\]\\.append\\(") "(")))) (add-before 'build 'use-system-libraries (lambda _ (substitute* '("caffe2/serialize/crc.cc" @@ -4865,7 +4873,10 @@ (define-public python-pytorch (or (%current-target-system) (%current-system)) (package-transitive-supported-systems qnnpack))) - (setenv "USE_QNNPACK" "0")))) + (setenv "USE_QNNPACK" "0")) + (substitute* '("requirements.txt" "setup.py") + (("sympy==1\\.13\\.1") + "sympy>=1.13.1")))) ;; PyTorch is still built with AVX2 and AVX-512 support selected at ;; runtime, but these dependencies require it (nnpack only for ;; x86_64). @@ -4966,10 +4977,11 @@ (define-public python-pytorch ;; Even only the core tests take a very long time to run. #:tests? #f)) (native-inputs - (list cmake + (list cmake-minimal doxygen ideep-pytorch ninja + nlohmann-json pocketfft-cpp python-expecttest python-pytest-flakefinder @@ -4989,7 +5001,6 @@ (define-public python-pytorch eigen flatbuffers-next fmt - foxi fp16 fxdiv gemmlowp diff --git a/gnu/packages/patches/python-pytorch-fix-codegen.patch b/gnu/packages/patches/python-pytorch-fix-codegen.patch index b30094de09..106ea7db66 100644 --- a/gnu/packages/patches/python-pytorch-fix-codegen.patch +++ b/gnu/packages/patches/python-pytorch-fix-codegen.patch @@ -6,7 +6,7 @@ is later corrected. codegen_external.py is patched to avoid duplicate functions and add the static keyword as in the existing generated file. diff --git a/tools/gen_flatbuffers.sh b/tools/gen_flatbuffers.sh -index cc0263d..ac34e84 100644 +index cc0263dbbf..ac34e84b82 100644 --- a/tools/gen_flatbuffers.sh +++ b/tools/gen_flatbuffers.sh @@ -1,13 +1,13 @@ @@ -32,7 +32,7 @@ index cc0263d..ac34e84 100644 -c "$ROOT/torch/csrc/jit/serialization/mobile_bytecode.fbs" echo '// @generated' >> "$ROOT/torch/csrc/jit/serialization/mobile_bytecode_generated.h" diff --git a/torch/csrc/jit/tensorexpr/codegen_external.py b/torch/csrc/jit/tensorexpr/codegen_external.py -index 5dcf1b2..0e20b0c 100644 +index 5dcf1b2840..0e20b0c102 100644 --- a/torch/csrc/jit/tensorexpr/codegen_external.py +++ b/torch/csrc/jit/tensorexpr/codegen_external.py @@ -21,9 +21,14 @@ def gen_external(native_functions_path, tags_path, external_path): @@ -61,7 +61,7 @@ index 5dcf1b2..0e20b0c 100644 void** buf_data, int64_t* buf_ranks, diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py -index 7a0024f..6b2445f 100644 +index b42948045c..e1cfc73a5e 100644 --- a/torchgen/decompositions/gen_jit_decompositions.py +++ b/torchgen/decompositions/gen_jit_decompositions.py @@ -1,8 +1,12 @@ @@ -76,9 +76,9 @@ index 7a0024f..6b2445f 100644 +else: + decomposition_table = {} - # from torchgen.code_template import CodeTemplate -@@ -85,7 +89,7 @@ def write_decomposition_util_file(path: str) -> None: + # from torchgen.code_template import CodeTemplate +@@ -86,7 +90,7 @@ def write_decomposition_util_file(path: str) -> None: def main() -> None: @@ -88,27 +88,28 @@ index 7a0024f..6b2445f 100644 write_decomposition_util_file(str(upgrader_path)) diff --git a/torchgen/operator_versions/gen_mobile_upgraders.py b/torchgen/operator_versions/gen_mobile_upgraders.py -index 2907076..6866332 100644 +index 362ce427d5..245056f815 100644 --- a/torchgen/operator_versions/gen_mobile_upgraders.py +++ b/torchgen/operator_versions/gen_mobile_upgraders.py -@@ -3,10 +3,12 @@ import os +@@ -6,10 +6,13 @@ import os from enum import Enum from operator import itemgetter from pathlib import Path +import sys - from typing import Any, Dict, List + from typing import Any -import torch -from torch.jit.generate_bytecode import generate_upgraders_bytecode +if len(sys.argv) < 2 or sys.argv[1] != "dummy": + import torch + from torch.jit.generate_bytecode import generate_upgraders_bytecode - ++ from torchgen.code_template import CodeTemplate from torchgen.operator_versions.gen_mobile_upgraders_constant import ( -@@ -263,7 +265,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: + MOBILE_UPGRADERS_HEADER_DESCRIPTION, +@@ -265,7 +268,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: def construct_version_maps( - upgrader_bytecode_function_to_index_map: Dict[str, Any] + upgrader_bytecode_function_to_index_map: dict[str, Any] ) -> str: - version_map = torch._C._get_operator_version_map() + if len(sys.argv) < 2 or sys.argv[1] != "dummy": @@ -118,7 +119,7 @@ index 2907076..6866332 100644 sorted_version_map_ = sorted(version_map.items(), key=itemgetter(0)) # type: ignore[no-any-return] sorted_version_map = dict(sorted_version_map_) -@@ -379,7 +384,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]: +@@ -381,7 +387,10 @@ def sort_upgrader(upgrader_list: list[dict[str, Any]]) -> list[dict[str, Any]]: def main() -> None: @@ -131,16 +132,24 @@ index 2907076..6866332 100644 for up in sorted_upgrader_list: print("after sort upgrader : ", next(iter(up))) diff --git a/torchgen/shape_functions/gen_jit_shape_functions.py b/torchgen/shape_functions/gen_jit_shape_functions.py -index bdfd5c7..72b237a 100644 +index 56a3d8bf0d..490a3ea2e7 100644 --- a/torchgen/shape_functions/gen_jit_shape_functions.py +++ b/torchgen/shape_functions/gen_jit_shape_functions.py -@@ -18,16 +18,20 @@ you are in the root directory of the Pytorch git repo""" +@@ -1,6 +1,7 @@ + #!/usr/bin/env python3 + import os + import sys ++import importlib + from importlib.util import module_from_spec, spec_from_file_location + from itertools import chain + from pathlib import Path +@@ -18,16 +19,21 @@ you are in the root directory of the Pytorch git repo""" if not file_path.exists(): raise Exception(err_msg) # noqa: TRY002 --spec = importlib.util.spec_from_file_location(module_name, file_path) +-spec = spec_from_file_location(module_name, file_path) -assert spec is not None --module = importlib.util.module_from_spec(spec) +-module = module_from_spec(spec) -sys.modules[module_name] = module -assert spec.loader is not None -assert module is not None @@ -159,6 +168,7 @@ index bdfd5c7..72b237a 100644 + + bounded_compute_graph_mapping = module.bounded_compute_graph_mapping + shape_compute_graph_mapping = module.shape_compute_graph_mapping ++ +else: + bounded_compute_graph_mapping = {} + shape_compute_graph_mapping = {} diff --git a/gnu/packages/patches/python-pytorch-system-libraries.patch b/gnu/packages/patches/python-pytorch-system-libraries.patch index 025b3241a1..6b3f36f3f0 100644 --- a/gnu/packages/patches/python-pytorch-system-libraries.patch +++ b/gnu/packages/patches/python-pytorch-system-libraries.patch @@ -5,10 +5,10 @@ httlib, ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages. diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt -index 0087dd9..0235fa1 100644 +index 6d9152a4d0..97cb945722 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt -@@ -419,9 +419,9 @@ if(AT_NNPACK_ENABLED) +@@ -414,9 +414,9 @@ if(AT_NNPACK_ENABLED) list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below endif() @@ -22,7 +22,7 @@ index 0087dd9..0235fa1 100644 if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(s390x|ppc64le)$") list(APPEND ATen_CPU_DEPENDENCY_LIBS cpuinfo) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 89c31fa..e6d9ef1 100644 +index 9be7f3732f..111215dacc 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -91,9 +91,6 @@ if(NOT MSVC AND USE_XNNPACK) @@ -35,7 +35,7 @@ index 89c31fa..e6d9ef1 100644 endif() endif() -@@ -1075,7 +1072,6 @@ if(USE_XPU) +@@ -1081,7 +1078,6 @@ if(USE_XPU) endif() if(NOT MSVC AND USE_XNNPACK) @@ -43,17 +43,18 @@ index 89c31fa..e6d9ef1 100644 endif() # ========================================================== -@@ -1189,6 +1185,9 @@ endif() +@@ -1195,8 +1191,8 @@ endif() target_include_directories(torch_cpu PRIVATE ${TORCH_ROOT}/third_party/cpp-httplib) +-target_include_directories(torch_cpu PRIVATE +- ${TORCH_ROOT}/third_party/nlohmann/include) +find_package(httplib REQUIRED) +target_link_libraries(torch_cpu PUBLIC httplib::httplib) -+ + install(DIRECTORY "${TORCH_SRC_DIR}/csrc" DESTINATION ${TORCH_INSTALL_INCLUDE_DIR}/torch - FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") -@@ -1417,6 +1416,7 @@ target_link_libraries(torch_cpu PUBLIC c10) +@@ -1425,6 +1421,7 @@ target_link_libraries(torch_cpu PUBLIC c10) target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS}) @@ -61,7 +62,7 @@ index 89c31fa..e6d9ef1 100644 if(USE_MPI) target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX) endif() -@@ -1694,7 +1694,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) +@@ -1659,7 +1656,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}") add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}") target_link_libraries(static_runtime_bench torch_library benchmark) @@ -70,7 +71,7 @@ index 89c31fa..e6d9ef1 100644 endif() if(BUILD_MOBILE_BENCHMARK) -@@ -1713,7 +1713,7 @@ if(BUILD_MOBILE_TEST) +@@ -1678,7 +1675,7 @@ if(BUILD_MOBILE_TEST) foreach(test_src ${ATen_MOBILE_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -79,16 +80,16 @@ index 89c31fa..e6d9ef1 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE}) -@@ -1734,7 +1734,7 @@ if(BUILD_TEST) +@@ -1699,7 +1696,7 @@ if(BUILD_TEST) if(NOT MSVC) add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp) # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR) -- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main) -+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest) +- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main nlohmann) ++ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest nlohmann) if(USE_FBGEMM) target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm) endif() -@@ -1748,7 +1748,7 @@ if(BUILD_TEST) +@@ -1713,7 +1710,7 @@ if(BUILD_TEST) endif() else() add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}") @@ -97,7 +98,7 @@ index 89c31fa..e6d9ef1 100644 endif() target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) -@@ -1765,7 +1765,7 @@ if(BUILD_TEST) +@@ -1730,7 +1727,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_CPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -106,7 +107,7 @@ index 89c31fa..e6d9ef1 100644 if(NOT MSVC) target_link_libraries(${test_name} stdc++) endif() -@@ -1845,7 +1845,7 @@ if(BUILD_TEST) +@@ -1810,7 +1807,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_VULKAN_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -116,7 +117,7 @@ index 89c31fa..e6d9ef1 100644 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) add_test(NAME ${test_name} COMMAND $) diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt -index 1552b59..67e1a9a 100644 +index 1552b59d0d..67e1a9a1a3 100644 --- a/caffe2/serialize/CMakeLists.txt +++ b/caffe2/serialize/CMakeLists.txt @@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc) @@ -128,10 +129,10 @@ index 1552b59..67e1a9a 100644 ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index f1f2eb7..b4d2033 100644 +index e78305e0a8..5b3c3d7bf2 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -263,7 +263,7 @@ endif() +@@ -270,7 +270,7 @@ endif() # --- [ PocketFFT set(AT_POCKETFFT_ENABLED 0) if(NOT AT_MKL_ENABLED) @@ -140,7 +141,7 @@ index f1f2eb7..b4d2033 100644 if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}") message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}") elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h") -@@ -458,15 +458,6 @@ if(USE_PYTORCH_QNNPACK) +@@ -465,15 +465,6 @@ if(USE_PYTORCH_QNNPACK) set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "") @@ -156,7 +157,7 @@ index f1f2eb7..b4d2033 100644 if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL) target_compile_definitions( -@@ -653,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) +@@ -660,11 +651,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) # this shouldn't be necessary anymore. get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") @@ -168,7 +169,7 @@ index f1f2eb7..b4d2033 100644 # We will not need to test benchmark lib itself. set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") -@@ -735,16 +721,6 @@ if(USE_FBGEMM) +@@ -742,16 +728,6 @@ if(USE_FBGEMM) if(USE_ASAN) set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM") endif() @@ -185,7 +186,7 @@ index f1f2eb7..b4d2033 100644 endif() if(USE_FBGEMM) -@@ -812,7 +788,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) +@@ -819,7 +795,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) "${FP16_SOURCE_DIR}" "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16") elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16) @@ -194,32 +195,24 @@ index f1f2eb7..b4d2033 100644 set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C) endif() list(APPEND Caffe2_DEPENDENCY_LIBS fp16) -@@ -1159,7 +1135,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) +@@ -1161,7 +1137,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) # Tensorpipe uses cuda_add_library torch_update_find_cuda_flags() - add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe) list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe) - if(USE_CUDA) -@@ -1288,7 +1263,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) - set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) - endif() - endif() -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) - - add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) - if(NOT USE_SYSTEM_ONNX) -@@ -1319,7 +1293,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) + list(APPEND Caffe2_DEPENDENCY_LIBS nlohmann) +@@ -1317,7 +1292,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) endif() set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") - list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) + list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer) endif() - include_directories(${FOXI_INCLUDE_DIRS}) - list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) -@@ -1476,9 +1450,8 @@ if(NOT INTERN_BUILD_MOBILE) + # Recover the build shared libs option. + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS}) +@@ -1465,9 +1440,8 @@ if(NOT INTERN_BUILD_MOBILE) endif() if(USE_MKLDNN) include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake) @@ -230,7 +223,7 @@ index f1f2eb7..b4d2033 100644 else() message(WARNING "MKLDNN could not be found.") caffe2_update_option(USE_MKLDNN OFF) -@@ -1530,7 +1503,7 @@ endif() +@@ -1519,7 +1493,7 @@ endif() # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -239,7 +232,7 @@ index f1f2eb7..b4d2033 100644 # Disable compiler feature checks for `fmt`. # -@@ -1539,7 +1512,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) +@@ -1528,7 +1502,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know # `fmt` is compatible with a superset of the compilers that PyTorch is, it # shouldn't be too bad to just disable the checks. @@ -248,7 +241,7 @@ index f1f2eb7..b4d2033 100644 list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake -index 9d5f064..c3624e5 100644 +index 9d5f0643ec..c3624e582a 100644 --- a/cmake/External/nnpack.cmake +++ b/cmake/External/nnpack.cmake @@ -40,7 +40,7 @@ endif() @@ -270,7 +263,7 @@ index 9d5f064..c3624e5 100644 +set(NNPACK_FOUND TRUE) +set(USE_NNPACK ON) diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake -index 8793562..9f8fa3d 100644 +index 87935625f9..9f8fa3df81 100644 --- a/cmake/public/mkldnn.cmake +++ b/cmake/public/mkldnn.cmake @@ -4,7 +4,7 @@ if(CPU_AARCH64) @@ -289,10 +282,10 @@ index 8793562..9f8fa3d 100644 - ${MKLDNN_LIBRARIES}) + DNNL::dnnl) diff --git a/setup.py b/setup.py -index 9ec41cd..1f505fe 100644 +index 2b0cfa99d7..2d76b0d035 100644 --- a/setup.py +++ b/setup.py -@@ -494,13 +494,9 @@ def build_deps(): +@@ -491,13 +491,9 @@ def build_deps(): # Windows has very poor support for them. sym_files = [ "tools/shared/_utils_internal.py", @@ -307,15 +300,17 @@ index 9ec41cd..1f505fe 100644 for sym_file, orig_file in zip(sym_files, orig_files): same = False diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt -index 5c89748..ef84c57 100644 +index 0874852517..58ad3e9d66 100644 --- a/test/cpp/c10d/CMakeLists.txt +++ b/test/cpp/c10d/CMakeLists.txt -@@ -16,14 +16,14 @@ function(c10d_add_test test_src) +@@ -16,15 +16,15 @@ function(c10d_add_test test_src) add_test(NAME ${test_name} COMMAND $) endfunction() +-c10d_add_test(BackoffTest.cpp torch_cpu gtest_main) -c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main) -c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main) ++c10d_add_test(BackoffTest.cpp torch_cpu gtest_main gtest) +c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest) +c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest) if(INSTALL_TEST) @@ -328,7 +323,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS HashStoreTest DESTINATION bin) endif() -@@ -31,11 +31,11 @@ endif() +@@ -32,11 +32,11 @@ endif() if(USE_CUDA) if(USE_GLOO AND USE_C10D_GLOO) @@ -342,7 +337,7 @@ index 5c89748..ef84c57 100644 endif() if(USE_NCCL AND USE_C10D_NCCL) # NCCL is a private dependency of libtorch, but the tests include some -@@ -44,10 +44,10 @@ if(USE_CUDA) +@@ -45,10 +45,10 @@ if(USE_CUDA) # a private dependency of the tests as well. c10d_add_test( ProcessGroupNCCLTest.cpp @@ -355,7 +350,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS ProcessGroupNCCLTest DESTINATION bin) install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin) -@@ -61,7 +61,7 @@ if(USE_CUDA) +@@ -62,7 +62,7 @@ if(USE_CUDA) # a private dependency of the tests as well. c10d_add_test( ProcessGroupUCCTest.cpp @@ -364,7 +359,7 @@ index 5c89748..ef84c57 100644 if(INSTALL_TEST) install(TARGETS ProcessGroupUCCTest DESTINATION bin) install(TARGETS c10d_cuda_test DESTINATION lib) -@@ -69,7 +69,7 @@ if(USE_CUDA) +@@ -70,7 +70,7 @@ if(USE_CUDA) endif() else() if(USE_GLOO AND USE_C10D_GLOO) @@ -374,7 +369,7 @@ index 5c89748..ef84c57 100644 endif() diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt -index 179270c..72f5582 100644 +index 179270c4a4..72f5582e81 100644 --- a/test/cpp/tensorexpr/CMakeLists.txt +++ b/test/cpp/tensorexpr/CMakeLists.txt @@ -51,7 +51,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) @@ -387,14 +382,15 @@ index 179270c..72f5582 100644 if(USE_CUDA) target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA) diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt -index 10a44af..33e2df4 100644 +index c74b45431c..5b5d0919d0 100644 --- a/torch/CMakeLists.txt +++ b/torch/CMakeLists.txt -@@ -81,7 +81,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES +@@ -82,8 +82,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES Python::Module pybind::pybind11 opentelemetry::api - httplib +- nlohmann shm fmt::fmt-header-only ATEN_CPU_FILES_GEN_LIB) -- 2.46.0 From unknown Sat Aug 16 16:17:13 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: David Elsing Subject: bug#75708: closed (Re: [bug#75708] [PATCH v2 00/14] Update PyTorch to 2.5.1) Message-ID: References: <87sep4mksk.fsf@gnu.org> <20250120215716.15707-1-david.elsing@posteo.net> X-Gnu-PR-Message: they-closed 75708 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75708@debbugs.gnu.org Date: Mon, 27 Jan 2025 13:48:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1737985683-26488-1" This is a multi-part message in MIME format... ------------=_1737985683-26488-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75708: [PATCH 00/11] Update PyTorch to 2.5.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 75708@debbugs.gnu.org. --=20 75708: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75708 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1737985683-26488-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75708-done) by debbugs.gnu.org; 27 Jan 2025 13:47:25 +0000 Received: from localhost ([127.0.0.1]:60034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcPSW-0006s8-JQ for submit@debbugs.gnu.org; Mon, 27 Jan 2025 08:47:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58252) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcPST-0006rn-VC for 75708-done@debbugs.gnu.org; Mon, 27 Jan 2025 08:47:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcPSL-0006YK-PM; Mon, 27 Jan 2025 08:47:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=bbAzZPomX9z+CXU5ZSwUVndVylz1iV80mT6eBu8vZvA=; b=P3xp0w27JqexFZlX0fEh oWClxXjltiKnUkS8h8wrlx6fkSqrQ24O6ZV8JGpq5tdcfD8eeC4nZBCfnOJPYXsgepXu/qNgZBUq5 5Yo0PM4ncj8oJHLNMkQdvqDMns9QzYtn1cIxEBs8T5FiNo95SYRujvXtqtfBlYxkM1mNNu5CyyK+O ilg0Q35aSYEu/7WIY5JmzFafVOJx+qvR/09GZFveCQAHfRxEOpRv0MohsnUkqsaIJCSX+hOyOb5qQ eOlhiae7OpCMZRUP96vd6j9RH9PiN9hBtNFemy+g3eM+gqLJcqJa3tZ3XXV1DX33yJ79DlgvxXvUa b1gs2+fc0Y+1Jw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: David Elsing Subject: Re: [bug#75708] [PATCH v2 00/14] Update PyTorch to 2.5.1 In-Reply-To: <20250122183235.3472-1-david.elsing@posteo.net> (David Elsing's message of "Wed, 22 Jan 2025 18:32:11 +0000") References: <20250120215716.15707-1-david.elsing@posteo.net> <20250122183235.3472-1-david.elsing@posteo.net> Date: Mon, 27 Jan 2025 14:46:35 +0100 Message-ID: <87sep4mksk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 75708-done Cc: 75708-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi David, David Elsing skribis: > In the first version, I forgot to update fbgemm, python-torchvision and > python-pytorch-geometric. > > David Elsing (14): > gnu: asmjit: Update to commit cfc9f81. > gnu: cpuinfo: Update to commit ca156f7. > gnu: cpp-httplib: Update to 0.18.5. > gnu: flatbuffers-next: Update to 24.12.23. > gnu: onnx: Update to 1.17.0. > gnu: Add pybind11-2.13. > gnu: python-optree: Update to 0.14.0. > gnu: python-sympy: Update to 1.13.3. > gnu: oneapi-dnnl: Regenerate autogenerated files. > gnu: fbgemm: Update to 1.0.0. > gnu: python-pytorch: Update to 2.5.1. > gnu: python-pytorch-for-r-torch: Fix build. > gnu: python-torchvision: Update to 0.20.1. > gnu: python-pytorch-geometric: Update to 2.6.1. Pushed v2 of this series as 145dfde05ff568caa09bd3a4110b98c11efb87bd. Thanks for all the work! Ludo=E2=80=99. ------------=_1737985683-26488-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Jan 2025 23:30:45 +0000 Received: from localhost ([127.0.0.1]:52082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta1EC-0000wg-QD for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:30:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56724) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta1E9-0000wD-AV for submit@debbugs.gnu.org; Mon, 20 Jan 2025 18:30:43 -0500 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 1tZzm2-0006BV-Lr for guix-patches@gnu.org; Mon, 20 Jan 2025 16:57:34 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZzm0-0003XD-Mm for guix-patches@gnu.org; Mon, 20 Jan 2025 16:57:34 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 27000240027 for ; Mon, 20 Jan 2025 22:57:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1737410246; bh=eURFCnbOa0EoK+Y+7zGSL8qAgDTFtxmyHqKDb3zXlh0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=g4sqZ1Xd9EyZ4ArqDpoerNFlHSKYNfQKHPxeEQ/kPTfwnN/n+Ai4Euje99Vv5iBaO tzz5TTqogSz3kgcZVnQDotZ9rAYbdUhTH54PIG4Fd9ENe8MUOidF0QAIkxuyzMXzcW EFDqLhlINKHgynJiIZ/gycFkW76jvbjmGMJol72llknAWiHk2buJBbO7XJWMLGa/aG QoYo9tZi9A3KYzc0fUrA21rHb5vFXivL/6pUU2jHxcV7MJUB9f6UuZuEWNN6Rs62iK pVIGmiFw+fJb+pJl/eiWu3KoFd25RcIILt+hnM9DSXZHgx3rIuygY0hBUEH2+jSRW7 VdNQ8M2kKOB4A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4YcPMT1kfmz9rxG; Mon, 20 Jan 2025 22:57:24 +0100 (CET) From: David Elsing To: guix-patches@gnu.org Subject: [PATCH 00/11] Update PyTorch to 2.5.1 Date: Mon, 20 Jan 2025 21:57:12 +0000 Message-ID: <20250120215716.15707-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, this patch series updates python-pytorch to version 2.5.1. PyTorch 2.5 is not compatible with oneapi-dnnl version 3.6, so I did not update the latter yet. The latest release of r-torch did not change and still depends on PyTorch version 2.0.1, for which I fixed the build again. Cheers, David David Elsing (11): gnu: asmjit: Update to commit cfc9f81. gnu: cpuinfo: Update to commit ca156f7. gnu: cpp-httplib: Update to 0.18.5. gnu: flatbuffers-next: Update to 24.12.23. gnu: onnx: Update to 1.17.0. gnu: Add pybind11-2.13. gnu: python-optree: Update to 0.14.0. gnu: python-sympy: Update to 1.13.3. gnu: oneapi-dnnl: Regenerate autogenerated files. gnu: python-pytorch: Update to 2.5.1. gnu: python-pytorch-for-r-torch: Fix build. gnu/local.mk | 3 +- gnu/packages/cpp.scm | 14 +- gnu/packages/machine-learning.scm | 83 ++++++++++-- gnu/packages/parallel.scm | 8 +- .../patches/python-optree-fix-32-bit.patch | 122 ------------------ .../patches/python-pytorch-fix-codegen.patch | 42 +++--- .../python-pytorch-system-libraries.patch | 100 +++++++------- gnu/packages/python-xyz.scm | 56 +++++--- gnu/packages/serialization.scm | 6 +- 9 files changed, 198 insertions(+), 236 deletions(-) delete mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch -- 2.46.0 ------------=_1737985683-26488-1--