From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 01:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17490014883033 (code B ref -1); Wed, 04 Jun 2025 01:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jun 2025 01:44:48 +0000 Received: from localhost ([127.0.0.1]:44150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMdBP-0000ml-2y for submit@debbugs.gnu.org; Tue, 03 Jun 2025 21:44:47 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48346) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMYrj-0001ga-Dx for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:08:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMYrd-0006lm-EU for guix-patches@gnu.org; Tue, 03 Jun 2025 17:08:05 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMYrb-0000Rs-EB for guix-patches@gnu.org; Tue, 03 Jun 2025 17:08:05 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBjwb6qD5z9xj1 for ; Tue, 3 Jun 2025 21:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1748984880; bh=DWgepB7C3y1gvFtS3Hscuhuywh4ERG6fTYVOTFDuvWs=; h=Date:From:To:Subject:From; b=XugA8yEGqTNFycFWmKy865lgW1IH7A1/Eze+ewUOpFKWEAWEaV8IDkLPuaUu+3sMG KTI4dCU+ly0us1ihNJArq4KHz6iN3oi/lLv7r8NDCM8rSGOAbFC6Bh14/kpNWwt0Yv tdCMGJxEtL5Isettgj+bk6wUFH2lgW5xR9YGZ45E= X-Riseup-User-ID: F5420B90BAD2612EF9277ADF441FF53902418970478DD75262929E23E7B076F2 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBjwb5HLnzFwv9 for ; Tue, 3 Jun 2025 21:07:59 +0000 (UTC) MIME-Version: 1.0 Date: Tue, 03 Jun 2025 21:07:59 +0000 From: Ayan Das Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=198.252.153.6; envelope-from=bvits@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Tue, 03 Jun 2025 21:44:45 -0400 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 patch series updates PyTorch to version 2.7.0 along with its required dependencies and related packages: 1) xnnpack: Update to 0.0-4.51a0103 (required by PyTorch 2.7.0) 2) miniz-for-pytorch: Update to use miniz 3.0.2 (required by PyTorch 2.7.0) 3) python-pytorch: Update to 2.7.0 4) python-torchvision: Update to 0.22.0 (kept in sync with PyTorch) 5) python-captum: Fix test compatibility with PyTorch 2.7.0 All updated packages have been built and tested successfully. Ayan Das (5): gnu: xnnpack: Update to 0.0-4.51a0103. gnu: miniz-for-pytorch: Update to pytorch-2.7.0. gnu: python-pytorch: Update to 2.7.0. gnu: python-torchvision: Update to 0.22.0. gnu: python-captum: Fix tests for PyTorch 2.7.0. gnu/local.mk | 4 + gnu/packages/compression.scm | 6 +- gnu/packages/machine-learning.scm | 51 +- gnu/packages/patches/miniz-for-pytorch.patch | 26 +- .../python-pytorch-fix-codegen-2.7.0.patch | 178 +++++++ .../python-pytorch-runpath-2.7.0.patch | 30 ++ ...ython-pytorch-system-libraries-2.7.0.patch | 442 ++++++++++++++++++ .../python-pytorch-without-kineto-2.7.0.patch | 64 +++ 8 files changed, 768 insertions(+), 33 deletions(-) create mode 100644 gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-runpath-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 1/5] gnu: xnnpack: Update to 0.0-4.51a0103. References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 02:43:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174900494524436 (code B ref 78687); Wed, 04 Jun 2025 02:43:05 +0000 Received: (at 78687) by debbugs.gnu.org; 4 Jun 2025 02:42:25 +0000 Received: from localhost ([127.0.0.1]:44582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMe57-0006LV-3s for submit@debbugs.gnu.org; Tue, 03 Jun 2025 22:42:24 -0400 Received: from mx0.riseup.net ([198.252.153.6]:41868) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMe52-0006Jn-VC for 78687@debbugs.gnu.org; Tue, 03 Jun 2025 22:42:19 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBsLB36LZz9tv4 for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749004930; bh=S8WpGym9dnWsDnhrUAYSBLE/SAP7HAOgncGcBWin26w=; h=Date:From:To:Subject:From; b=eG336Ensg4g06LyvYModjHnniqaQJHKqSg/JPaBqOL14XilyIpL3RFBf4GoM4Uhle ARnXwXFdEXiHrXE17jBphm7A+3qKP6UKeM/iIYLxjVaBvopE8M9QMWVQlyGiT7lXTZ s5sRCX0sWP6TjDki5RBDOnsTQ4xmepb5GgHCEmJ0= X-Riseup-User-ID: 580A28B32F7E60B24053FD95A73FAB9F16A6418DE18B57A843F551E759CF6996 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBsLB1fy4zFq6k for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:42:10 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 04 Jun 2025 02:42:09 +0000 From: Ayan Das Message-ID: <33fb4b3494ef70522849467ee79f8aa0@riseup.net> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) >From 03b89b7e77ba9d80f6ad5c376d001c8fd7123bed Mon Sep 17 00:00:00 2001 Message-ID: <03b89b7e77ba9d80f6ad5c376d001c8fd7123bed.1748983877.git.bvits@riseup.net> In-Reply-To: References: From: Ayan Das Date: Tue, 3 Jun 2025 22:43:13 +0530 Subject: [PATCH 1/5] gnu: xnnpack: Update to 0.0-4.51a0103. * gnu/packages/machine-learning.scm (xnnpack): Update to 0.0-4.51a0103. [source]: Remove deprecated -a flag from update-microkernels.py invocation. [snippet]: Adjust directory list for autogenerated file removal. --- gnu/packages/machine-learning.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index bd090d63b1..32269d1513 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4512,8 +4512,8 @@ (define-public qnnpack (define-public xnnpack ;; There's currently no tag on this repo. (let ((version "0.0") - (commit "08f1489fc815e8f121d4d2676c4863d2b51bfe73") - (revision "3")) + (commit "51a0103656eff6fc9bfd39a4597923c4b542c883") + (revision "4")) (package (name "xnnpack") (version (git-version version revision commit)) @@ -4525,7 +4525,7 @@ (define-public xnnpack (file-name (git-file-name name version)) (sha256 (base32 - "00jjhz0nfggbdnqqvcznba03pcyy7gssd24yhhzjhincnz9qh8jr")) + "0j4smj8yaxw6r14caqn0dgb8j8mnsq34zp8ixxn11zmgbab306ly")) (modules '((guix build utils) (ice-9 ftw) (ice-9 textual-ports) @@ -4547,7 +4547,7 @@ (define-public xnnpack (delete-file path)))) (scandir dir (negate (cut member <> '("." ".." "simd")))))) (cons* - "test" "bench" "eval" "models" "src/enums" "src/xnnpack" + "test" "bench/models" "src/enums" "src/xnnpack" "gen" "cmake/gen" (filter identity @@ -4624,7 +4624,7 @@ (define target-deps "") ;; These need to run after the above scripts (display "Remaining files\n") (invoke "python3" "tools/update-microkernels.py") - (invoke "python3" "tools/update-microkernels.py" "-a") + ;; The -a flag is no longer supported in newer versions (invoke "python3" "tools/generate-lut-norm-test.py" "--spec" "test/u8-lut32norm.yaml" "--output" "test/u8-lut32norm.cc") -- 2.49.0 From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 2/5] gnu: miniz-for-pytorch: Update to pytorch-2.7.0. References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174900499124882 (code B ref 78687); Wed, 04 Jun 2025 02:44:02 +0000 Received: (at 78687) by debbugs.gnu.org; 4 Jun 2025 02:43:11 +0000 Received: from localhost ([127.0.0.1]:44586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMe5u-0006TE-8t for submit@debbugs.gnu.org; Tue, 03 Jun 2025 22:43:11 -0400 Received: from mx0.riseup.net ([198.252.153.6]:60000) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMe5o-0006R6-Bx for 78687@debbugs.gnu.org; Tue, 03 Jun 2025 22:43:07 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBsM64RgBz9tv4 for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749004978; bh=aakPIYSj6ws9wPEHUlgdz0VMN3ybUE1/0bNL5ApAQ4c=; h=Date:From:To:Subject:From; b=ZN72S0QClIeHMm5Ky+F4X2M0qO3nveyAbNH2yJ3/HN2jwZa0YDxFOjsTjeL/7zgGv SreWFv6gpPUVxMZG5Zu8L2Aap5AvhlqAHOFAFjkyqIDDV8Cn8sUobt4nRlUgKC9tEQ SOULcBZcFZb8gbVXXDcxtAO5t4FWIa1O26F1LmKU= X-Riseup-User-ID: 322A583A4802817FF3B10CFB400DBD2E964D41B98EADEF8D730FE6235063CFFC Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBsM62wwgzFq6k for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:42:58 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 04 Jun 2025 02:42:58 +0000 From: Ayan Das Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) >From 4afe5870c46fc4ecf5383c10bc3bbfb3b5f857f4 Mon Sep 17 00:00:00 2001 Message-ID: <4afe5870c46fc4ecf5383c10bc3bbfb3b5f857f4.1748983877.git.bvits@riseup.net> In-Reply-To: References: From: Ayan Das Date: Tue, 3 Jun 2025 22:55:58 +0530 Subject: [PATCH 2/5] gnu: miniz-for-pytorch: Update to pytorch-2.7.0. * gnu/packages/compression.scm (miniz-for-pytorch): Update to pytorch-2.7.0 using miniz 3.0.2. * gnu/packages/patches/miniz-for-pytorch.patch: Update for miniz 3.0.2. --- gnu/packages/compression.scm | 6 ++--- gnu/packages/patches/miniz-for-pytorch.patch | 26 ++++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ed5a81be19..b64c99d2c6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -3095,16 +3095,16 @@ (define-public miniz (define-public miniz-for-pytorch (package (inherit miniz) - (version "pytorch-2.2.0") + (version "pytorch-2.7.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/richgel999/miniz") - (commit "2.2.0"))) + (commit "3.0.2"))) (file-name (git-file-name (package-name miniz) version)) (sha256 (base32 - "09j9ihigfsavgcmk8l36zmbjvdf1x1w7h2v4rkww1qk1sb43y5zf")) + "0672q35vjrpakmsr1gwj9k5fwv5ihzhahm19bq4y74wqpn91p7fw")) (patches (search-patches "miniz-for-pytorch.patch")))) (arguments (substitute-keyword-arguments (package-arguments miniz) diff --git a/gnu/packages/patches/miniz-for-pytorch.patch b/gnu/packages/patches/miniz-for-pytorch.patch index 19fa705a31..dbcf916450 100644 --- a/gnu/packages/patches/miniz-for-pytorch.patch +++ b/gnu/packages/patches/miniz-for-pytorch.patch @@ -1,7 +1,7 @@ Modifications from the internal fork of the python-pytorch package. diff --git a/miniz.h b/miniz.h -index 42e1ea2..5869ab9 100644 +index 2f86380..336d33d 100644 --- a/miniz.h +++ b/miniz.h @@ -123,7 +123,7 @@ @@ -11,9 +11,9 @@ index 42e1ea2..5869ab9 100644 -/*#define MINIZ_NO_TIME */ +#define MINIZ_NO_TIME - /* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */ - /*#define MINIZ_NO_ARCHIVE_APIS */ -@@ -135,7 +135,7 @@ + /* Define MINIZ_NO_DEFLATE_APIS to disable all compression API's. */ + /*#define MINIZ_NO_DEFLATE_APIS */ +@@ -141,7 +141,7 @@ /*#define MINIZ_NO_ZLIB_APIS */ /* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */ @@ -22,21 +22,27 @@ index 42e1ea2..5869ab9 100644 /* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc -@@ -172,8 +172,7 @@ - #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) +@@ -209,7 +209,6 @@ #if MINIZ_X86_OR_X64_CPU /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ --#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 + #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 -#define MINIZ_UNALIGNED_USE_MEMCPY -+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 #else #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 #endif diff --git a/miniz_zip.h b/miniz_zip.h -index 82502bd..3d92255 100644 +index 876d844..c9aa987 100644 --- a/miniz_zip.h +++ b/miniz_zip.h -@@ -150,7 +150,7 @@ typedef enum { +@@ -94,6 +94,7 @@ typedef enum { + MZ_ZIP_FLAG_IGNORE_PATH = 0x0200, + MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400, + MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800, ++ MZ_ZIP_FLAG_DO_NOT_COMPUTE_CRC32 = 0x80000, + MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each file as its validated to ensure the func finds the file in the central dir (intended for testing) */ + MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = 0x2000, /* validate the local headers, but don't decompress the entire file and check the crc32 */ + MZ_ZIP_FLAG_WRITE_ZIP64 = 0x4000, /* always use the zip64 file format, instead of the original zip file format with automatic switch to zip64. Use as flags parameter with mz_zip_writer_init*_v2 */ +@@ -151,7 +152,7 @@ typedef enum { MZ_ZIP_TOTAL_ERRORS } mz_zip_error; -- 2.49.0 From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 3/5] gnu: python-pytorch: Update to 2.7.0. References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 02:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174900515726345 (code B ref 78687); Wed, 04 Jun 2025 02:46:02 +0000 Received: (at 78687) by debbugs.gnu.org; 4 Jun 2025 02:45:57 +0000 Received: from localhost ([127.0.0.1]:44621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMe8Y-0006ql-G8 for submit@debbugs.gnu.org; Tue, 03 Jun 2025 22:45:57 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58028) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMe8T-0006qC-NT for 78687@debbugs.gnu.org; Tue, 03 Jun 2025 22:45:52 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4bBsQH4JzHzDrjY for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749005143; bh=ThI3IDVKz2li73os1Fq15q2i7fZohbckobE+fStmIUM=; h=Date:From:To:Subject:From; b=Ghhr/PpNrQON2sI4gs72rKo5PYlstITe+XHft1fKwuL/QR0x2ac9Q2k/kfX32qT9j Myu3bZAE6ANH4gkRJFyRxOAZ2vRZHCkkCDuo18/mYGD1yCgKQsY04rYhw6C0UU9JkR lZpqNs+Rv1iZ3GsOIxveKkPYbVe0bKZF2k8z0+Yg= X-Riseup-User-ID: 0914239B465D23E8C2D7D81A333F2611F6B239615C389CF354C38935DB1687AB Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBsQH2bpBzFq0n for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:45:43 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 04 Jun 2025 02:45:43 +0000 From: Ayan Das Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) >From 2c39584ffcec63c41d4ac5155273deb8cbf000e4 Mon Sep 17 00:00:00 2001 Message-ID: <2c39584ffcec63c41d4ac5155273deb8cbf000e4.1748983877.git.bvits@riseup.net> In-Reply-To: References: From: Ayan Das Date: Wed, 4 Jun 2025 00:15:17 +0530 Subject: [PATCH 3/5] gnu: python-pytorch: Update to 2.7.0. * gnu/packages/machine-learning.scm (python-pytorch): Update to 2.7.0. [source]: Add substitution for additional miniz.h include patterns. [arguments]: Add 'skip-nccl-call' phase to use system NCCL. * gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch, gnu/packages/patches/python-pytorch-runpath-2.7.0.patch, gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch, gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 4 + gnu/packages/machine-learning.scm | 24 +- .../python-pytorch-fix-codegen-2.7.0.patch | 178 +++++++ .../python-pytorch-runpath-2.7.0.patch | 30 ++ ...ython-pytorch-system-libraries-2.7.0.patch | 442 ++++++++++++++++++ .../python-pytorch-without-kineto-2.7.0.patch | 64 +++ 6 files changed, 734 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-runpath-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index dfcac1e3e8..39488ecf28 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2147,11 +2147,15 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pytorch-fix-codegen.patch \ + %D%/packages/patches/python-pytorch-fix-codegen-2.7.0.patch \ %D%/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch \ %D%/packages/patches/python-pytorch-for-r-torch-system-libraries.patch \ %D%/packages/patches/python-pytorch-runpath.patch \ + %D%/packages/patches/python-pytorch-runpath-2.7.0.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ + %D%/packages/patches/python-pytorch-system-libraries-2.7.0.patch \ %D%/packages/patches/python-pytorch-without-kineto.patch \ + %D%/packages/patches/python-pytorch-without-kineto-2.7.0.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 32269d1513..0d82d951a0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4955,7 +4955,7 @@ (define-public ideep-pytorch-for-r-torch (base32 "0hdpkhcjry22fjx2zg2r48v7f4ljrclzj0li2pgk76kvyblfbyvm")))))) -(define %python-pytorch-version "2.5.1") +(define %python-pytorch-version "2.7.0") (define %python-pytorch-src (origin @@ -4966,14 +4966,14 @@ (define %python-pytorch-src (file-name (git-file-name "python-pytorch" %python-pytorch-version)) (sha256 (base32 - "052cvagpmm9y7jspjpcyysx8yc5fhxnjl8rcz6nndis06v8dcj8s")) - (patches (search-patches "python-pytorch-system-libraries.patch" - "python-pytorch-runpath.patch" - "python-pytorch-without-kineto.patch" + "19prdpzx34n8y2q6wx9dn9vyms6zidjvfgh58d28rfcf5z7z5ra5")) + (patches (search-patches "python-pytorch-system-libraries-2.7.0.patch" + "python-pytorch-runpath-2.7.0.patch" + "python-pytorch-without-kineto-2.7.0.patch" ;; Some autogeneration scripts depend on the ;; compile PyTorch library. Therefore, we create ;; dummy versions which are regenerated later. - "python-pytorch-fix-codegen.patch")) + "python-pytorch-fix-codegen-2.7.0.patch")) (modules '((guix build utils))) (snippet '(begin @@ -5123,8 +5123,10 @@ (define-public python-pytorch (add-before 'build 'use-system-libraries (lambda _ (substitute* '("caffe2/serialize/crc.cc" - "caffe2/serialize/inline_container.cc") - (("\"miniz\\.h\"") "")) + "caffe2/serialize/inline_container.cc" + "torch/csrc/inductor/aoti_package/model_package_loader.cpp") + (("\"miniz\\.h\"") "") + (("") "")) (substitute* "aten/src/ATen/native/vulkan/api/Allocator.h" (("") "")) @@ -5161,6 +5163,12 @@ (define-public python-pytorch (substitute* '("requirements.txt" "setup.py") (("sympy==1\\.13\\.1") "sympy>=1.13.1")))) + (add-after 'use-system-libraries 'skip-nccl-call + (lambda _ + ;; Comment-out `checkout_nccl()` invokation in build_pytorch(). + (substitute* "tools/build_pytorch_libs.py" + (("^[[:blank:]]*checkout_nccl\\(\\)" all) + (string-append "# " all " # Guix: use system NCCL\n"))))) ;; PyTorch is still built with AVX2 and AVX-512 support selected at ;; runtime, but these dependencies require it (nnpack only for ;; x86_64). diff --git a/gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch b/gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch new file mode 100644 index 0000000000..3862339b14 --- /dev/null +++ b/gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch @@ -0,0 +1,178 @@ +This patch fixes some scripts for generating source files. For +gen_jit_decompositions.py, gen_mobile_upgraders.py and +gen_jit_shape_functions.py, which depend on the compiled PyTorch library, the +option to generate "dummy" source files is added for the initial build, which +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 cc0263dbb..ac34e84b8 100644 +--- a/tools/gen_flatbuffers.sh ++++ b/tools/gen_flatbuffers.sh +@@ -1,13 +1,13 @@ + #!/bin/bash + ROOT=$(pwd) +-FF_LOCATION="$ROOT/third_party/flatbuffers" +-cd "$FF_LOCATION" || exit +-mkdir build +-cd build || exit +-cmake .. +-cmake --build . --target flatc +-mkdir -p "$ROOT/build/torch/csrc/jit/serialization" +-./flatc --cpp --gen-mutable --scoped-enums \ ++#FF_LOCATION="$ROOT/third_party/flatbuffers" ++#cd "$FF_LOCATION" || exit ++#mkdir build ++#cd build || exit ++#cmake .. ++#cmake --build . --target flatc ++#mkdir -p "$ROOT/build/torch/csrc/jit/serialization" ++flatc --cpp --gen-mutable --scoped-enums \ + -o "$ROOT/torch/csrc/jit/serialization" \ + -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 5dcf1b284..0e20b0c10 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): + native_functions = parse_native_yaml(native_functions_path, tags_path) + func_decls = [] + func_registrations = [] +- for func in native_functions: ++ done_names = set() ++ for func in native_functions[0]: + schema = func.func + name = schema.name.name.base ++ if name in done_names: ++ continue ++ else: ++ done_names.add(name) + args = schema.arguments + # Only supports extern calls for functions with out variants + if not schema.is_out_fn(): +@@ -63,7 +68,7 @@ def gen_external(native_functions_path, tags_path, external_path): + + # print(tensor_decls, name, arg_names) + func_decl = f"""\ +-void nnc_aten_{name}( ++static void nnc_aten_{name}( + int64_t bufs_num, + void** buf_data, + int64_t* buf_ranks, +diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py +index b42948045..e1cfc73a5 100644 +--- a/torchgen/decompositions/gen_jit_decompositions.py ++++ b/torchgen/decompositions/gen_jit_decompositions.py +@@ -1,8 +1,12 @@ + #!/usr/bin/env python3 + import os + from pathlib import Path ++import sys + +-from torch.jit._decompositions import decomposition_table ++if len(sys.argv) < 2 or sys.argv[1] != "dummy": ++ from torch.jit._decompositions import decomposition_table ++else: ++ decomposition_table = {} + + + # from torchgen.code_template import CodeTemplate +@@ -86,7 +90,7 @@ def write_decomposition_util_file(path: str) -> None: + + + def main() -> None: +- pytorch_dir = Path(__file__).resolve().parents[3] ++ pytorch_dir = Path(__file__).resolve().parents[2] + upgrader_path = pytorch_dir / "torch" / "csrc" / "jit" / "runtime" + 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 845034cb7..a1c5767c2 100644 +--- a/torchgen/operator_versions/gen_mobile_upgraders.py ++++ b/torchgen/operator_versions/gen_mobile_upgraders.py +@@ -6,10 +6,13 @@ import os + from enum import Enum + from operator import itemgetter + from pathlib import Path ++import sys + 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 ( + MOBILE_UPGRADERS_HEADER_DESCRIPTION, +@@ -263,7 +266,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: + def construct_version_maps( + 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": ++ version_map = torch._C._get_operator_version_map() ++ else: ++ version_map = {} + sorted_version_map_ = sorted(version_map.items(), key=itemgetter(0)) # type: ignore[no-any-return] + sorted_version_map = dict(sorted_version_map_) + +@@ -375,7 +381,10 @@ def sort_upgrader(upgrader_list: list[dict[str, Any]]) -> list[dict[str, Any]]: + + + def main() -> None: +- upgrader_list = generate_upgraders_bytecode() ++ if len(sys.argv) < 2 or sys.argv[1] != "dummy": ++ upgrader_list = generate_upgraders_bytecode() ++ else: ++ upgrader_list = [] + sorted_upgrader_list = sort_upgrader(upgrader_list) + 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 56a3d8bf0..ffd0785fd 100644 +--- a/torchgen/shape_functions/gen_jit_shape_functions.py ++++ b/torchgen/shape_functions/gen_jit_shape_functions.py +@@ -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,17 +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 = spec_from_file_location(module_name, file_path) +-assert spec is not None +-module = module_from_spec(spec) +-sys.modules[module_name] = module +-assert spec.loader is not None +-assert module is not None +-spec.loader.exec_module(module) +- +-bounded_compute_graph_mapping = module.bounded_compute_graph_mapping +-shape_compute_graph_mapping = module.shape_compute_graph_mapping +- ++if len(sys.argv) < 2 or sys.argv[1] != "dummy": ++ spec = importlib.util.spec_from_file_location(module_name, file_path) ++ assert spec is not None ++ module = importlib.util.module_from_spec(spec) ++ sys.modules[module_name] = module ++ assert spec.loader is not None ++ assert module is not None ++ spec.loader.exec_module(module) ++ ++ 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 = {} + + SHAPE_HEADER = r""" + /** diff --git a/gnu/packages/patches/python-pytorch-runpath-2.7.0.patch b/gnu/packages/patches/python-pytorch-runpath-2.7.0.patch new file mode 100644 index 0000000000..cd8bea370b --- /dev/null +++ b/gnu/packages/patches/python-pytorch-runpath-2.7.0.patch @@ -0,0 +1,30 @@ +Libraries (such as 'libtorch_cpu.so') and executables (such as 'torch_shm_manager') +get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'. +Make sure RUNPATH matches that. + +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index be45936a8..7b19e5359 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -4,7 +4,7 @@ if(APPLE) + set(CMAKE_MACOSX_RPATH ON) + set(_rpath_portable_origin "@loader_path") + else() +- set(_rpath_portable_origin $ORIGIN) ++ set(_rpath_portable_origin $ORIGIN/../lib) + endif(APPLE) + # Use separate rpaths during build and install phases + set(CMAKE_SKIP_BUILD_RPATH FALSE) +diff --git a/functorch/CMakeLists.txt b/functorch/CMakeLists.txt +index bdfa4bfe4..2a75e3825 100644 +--- a/functorch/CMakeLists.txt ++++ b/functorch/CMakeLists.txt +@@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) + + set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY + ${CMAKE_BINARY_DIR}/functorch) +-set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${_rpath_portable_origin}/../torch/lib") ++set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../torch/lib") + + # Copy-pasted prefix/suffix logic for Python extensions from + # https://github.com/pytorch/pytorch/blob/33bb8ae350611760139457b85842b1d7edf9aa11/caffe2/CMakeLists.txt#L1975 diff --git a/gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch b/gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch new file mode 100644 index 0000000000..6d8da60e41 --- /dev/null +++ b/gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch @@ -0,0 +1,442 @@ +Patch build files to also system libraries instead of bundled ones for the +libraries not supported or working only by specifying USE_SYSTEM_LIBS. This +includes using the clog, cpuinfo, fbgemm, foxi, fp16, fxdiv, googletest, +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 085af373e..3287429b4 100644 +--- a/aten/src/ATen/CMakeLists.txt ++++ b/aten/src/ATen/CMakeLists.txt +@@ -468,9 +468,9 @@ if(AT_NNPACK_ENABLED) + list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below + endif() + +-if(MKLDNN_FOUND) +- list(APPEND ATen_CPU_DEPENDENCY_LIBS ${MKLDNN_LIBRARIES}) +-endif(MKLDNN_FOUND) ++if(USE_MKLDNN) ++ list(APPEND ATen_CPU_DEPENDENCY_LIBS DNNL::dnnl) ++endif(USE_MKLDNN) + + if(USE_MKLDNN_ACL) + list(APPEND ATen_CPU_INCLUDE ${ACL_INCLUDE_DIRS}) +diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt +index d2d23b7ab..1a7e5a042 100644 +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -91,9 +91,6 @@ if(NOT MSVC AND USE_XNNPACK) + if(NOT TARGET fxdiv) + set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") +- add_subdirectory( +- "${FXDIV_SOURCE_DIR}" +- "${CMAKE_BINARY_DIR}/FXdiv") + endif() + endif() + +@@ -1135,7 +1132,6 @@ if(USE_XPU) + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +@@ -1254,8 +1250,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 +@@ -1494,6 +1490,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}) ++target_link_libraries(torch_cpu PRIVATE miniz clog) + if(USE_MPI) + target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX) + endif() +@@ -1728,7 +1725,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) +- target_link_libraries(static_runtime_test torch_library gtest_main) ++ target_link_libraries(static_runtime_test torch_library gtest_main gtest) + endif() + + if(BUILD_MOBILE_BENCHMARK) +@@ -1747,7 +1744,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}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE}) +@@ -1768,7 +1765,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 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() +@@ -1782,7 +1779,7 @@ if(BUILD_TEST) + endif() + else() + add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}") +- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main) ++ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main gtest) + endif() + target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) + target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) +@@ -1799,7 +1796,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}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + if(NOT MSVC) + target_link_libraries(${test_name} stdc++) + endif() +@@ -1823,7 +1820,7 @@ if(BUILD_TEST) + add_executable(${test_name} "${test_src}") + find_library(metal NAMES Metal) + find_library(foundation NAMES Foundation) +- target_link_libraries(${test_name} torch_library gtest_main ${metal} ${foundation}) ++ target_link_libraries(${test_name} torch_library gtest_main gtest ${metal} ${foundation}) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) +@@ -1843,7 +1840,7 @@ if(BUILD_TEST) + foreach(test_src ${Caffe2_GPU_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + if(USE_CUDNN AND ${test_name} MATCHES "cudnn") + target_link_libraries(${test_name} torch::cudnn) + endif() +@@ -1865,7 +1862,7 @@ if(BUILD_TEST) + foreach(test_src ${Caffe2_XPU_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) + add_test(NAME ${test_name} COMMAND $) +@@ -1880,7 +1877,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}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) + add_test(NAME ${test_name} COMMAND $) +@@ -1899,7 +1896,7 @@ if(BUILD_TEST) + foreach(test_src ${Caffe2_HIP_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) + target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) +diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt +index ebbff0f29..dcded2590 100644 +--- a/caffe2/serialize/CMakeLists.txt ++++ b/caffe2/serialize/CMakeLists.txt +@@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc) + + set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp}) + list(APPEND Caffe2_CPU_SRCS +- ${PROJECT_SOURCE_DIR}/third_party/miniz-3.0.2/miniz.c + ${CMAKE_CURRENT_SOURCE_DIR}/inline_container.cc + ${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 be45936a8..bb1aa1cc1 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -276,7 +276,7 @@ endif() + # --- [ PocketFFT + set(AT_POCKETFFT_ENABLED 0) + if(NOT AT_MKL_ENABLED) +- set(POCKETFFT_INCLUDE_DIR "${Torch_SOURCE_DIR}/third_party/pocketfft/") ++ set(POCKETFFT_INCLUDE_DIR "#POCKETFFT_INCLUDE_DIR") + 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") +@@ -460,15 +460,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 "") +- add_subdirectory( +- "${PYTORCH_QNNPACK_SOURCE_DIR}" +- "${CONFU_DEPENDENCIES_BINARY_DIR}/pytorch_qnnpack") +- # We build static versions of QNNPACK and pthreadpool but link +- # them into a shared library for Caffe2, so they need PIC. +- set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) +- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) +- # QNNPACK depends on gemmlowp headers +- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") + endif() + + list(APPEND Caffe2_DEPENDENCY_LIBS pytorch_qnnpack) +@@ -558,16 +549,15 @@ if(USE_XNNPACK AND NOT USE_SYSTEM_XNNPACK) + list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK microkernels-prod) + elseif(NOT TARGET XNNPACK AND USE_SYSTEM_XNNPACK) + add_library(XNNPACK SHARED IMPORTED) +- add_library(microkernels-prod SHARED IMPORTED) ++ add_library(microkernels-prod INTERFACE IMPORTED) + find_library(XNNPACK_LIBRARY XNNPACK) +- find_library(microkernels-prod_LIBRARY microkernels-prod) + set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}") +- set_property(TARGET microkernels-prod PROPERTY IMPORTED_LOCATION "${microkernels-prod_LIBRARY}") +- if(NOT XNNPACK_LIBRARY or NOT microkernels-prod_LIBRARY) ++ set_property(TARGET microkernels-prod PROPERTY INTERFACE_LINK_LIBRARIES XNNPACK) ++ if(NOT XNNPACK_LIBRARY) + message(FATAL_ERROR "Cannot find XNNPACK") + endif() + message("-- Found XNNPACK: ${XNNPACK_LIBRARY}") +- list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK microkernels-prod) ++ list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK) + endif() + + # ---[ Vulkan deps +@@ -650,11 +640,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 "") +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest) +- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp}) +- +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include) +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include) + + # 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.") +@@ -732,16 +717,6 @@ if(USE_FBGEMM) + if(USE_ASAN) + set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM") + endif() +- add_subdirectory("${FBGEMM_SOURCE_DIR}") +- set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON) +- set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) +- set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) +- set_property(TARGET fbgemm PROPERTY POSITION_INDEPENDENT_CODE ON) +- if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0) +- # See https://github.com/pytorch/pytorch/issues/74352 +- target_compile_options_if_supported(asmjit -Wno-deprecated-copy) +- target_compile_options_if_supported(asmjit -Wno-unused-but-set-variable) +- endif() + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_compile_options_if_supported(asmjit -Wno-extra-semi) + target_compile_options_if_supported(fbgemm -Wno-extra-semi) +@@ -829,7 +804,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) + "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16") + endif() + elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16) +- add_library(fp16 STATIC "/usr/include/fp16.h") ++ add_library(fp16 STATIC "#FP16_INCLUDE_DIR") + set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C) + endif() + list(APPEND Caffe2_DEPENDENCY_LIBS fp16) +@@ -1170,7 +1145,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) + message(WARNING "Archived TensorPipe forces CMake compatibility mode") + set(CMAKE_POLICY_VERSION_MINIMUM 3.5) + endif() +- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe) + if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0") + unset(CMAKE_POLICY_VERSION_MINIMUM) + endif() +@@ -1340,7 +1314,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() + # Recover the build shared libs option. + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS}) +@@ -1500,9 +1474,8 @@ if(NOT INTERN_BUILD_MOBILE) + endif() + if(USE_MKLDNN) + include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake) +- if(MKLDNN_FOUND) ++ if(DNNL_FOUND) + set(AT_MKLDNN_ENABLED 1) +- include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR}) + else() + message(WARNING "MKLDNN could not be found.") + caffe2_update_option(USE_MKLDNN OFF) +@@ -1583,7 +1556,7 @@ endif() + # + set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) ++find_package(fmt) + + # Disable compiler feature checks for `fmt`. + # +@@ -1592,7 +1565,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. +-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") + + 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 8a4a310d6..f413d2e61 100644 +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -40,7 +40,7 @@ endif() + # (3) Android, iOS, Linux, macOS - supported + ############################################################################## + +-if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") ++if(FALSE) + message(STATUS "Brace yourself, we are building NNPACK") + set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party) + +@@ -94,6 +94,5 @@ endif() + # (4) Catch-all: not supported. + ############################################################################## + +-message(WARNING "Unknown platform - I don't know how to build NNPACK. " +- "See cmake/External/nnpack.cmake for details.") +-set(USE_NNPACK OFF) ++set(NNPACK_FOUND TRUE) ++set(USE_NNPACK ON) +diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake +index 87935625f..9f8fa3df8 100644 +--- a/cmake/public/mkldnn.cmake ++++ b/cmake/public/mkldnn.cmake +@@ -4,7 +4,7 @@ if(CPU_AARCH64) + include(${CMAKE_CURRENT_LIST_DIR}/ComputeLibrary.cmake) + endif() + +-find_package(MKLDNN QUIET) ++find_package(DNNL REQUIRED) + + if(NOT TARGET caffe2::mkldnn) + add_library(caffe2::mkldnn INTERFACE IMPORTED) +@@ -15,4 +15,4 @@ set_property( + ${MKLDNN_INCLUDE_DIR}) + set_property( + TARGET caffe2::mkldnn PROPERTY INTERFACE_LINK_LIBRARIES +- ${MKLDNN_LIBRARIES}) ++ DNNL::dnnl) +diff --git a/setup.py b/setup.py +index 61ee9363f..3691cc35c 100644 +--- a/setup.py ++++ b/setup.py +@@ -508,13 +508,9 @@ def build_deps(): + # Windows has very poor support for them. + sym_files = [ + "tools/shared/_utils_internal.py", +- "torch/utils/benchmark/utils/valgrind_wrapper/callgrind.h", +- "torch/utils/benchmark/utils/valgrind_wrapper/valgrind.h", + ] + orig_files = [ + "torch/_utils_internal.py", +- "third_party/valgrind-headers/callgrind.h", +- "third_party/valgrind-headers/valgrind.h", + ] + 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 5b423241d..e069accd6 100644 +--- a/test/cpp/c10d/CMakeLists.txt ++++ b/test/cpp/c10d/CMakeLists.txt +@@ -26,17 +26,17 @@ function(c10d_add_test test_src) + endif() + endfunction() + +-c10d_add_test(BackoffTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST OFF) +-c10d_add_test(FileStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST}) +-c10d_add_test(TCPStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST}) ++c10d_add_test(BackoffTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST OFF) ++c10d_add_test(FileStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST}) ++c10d_add_test(TCPStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST}) + if(NOT WIN32) +- c10d_add_test(HashStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST}) ++ c10d_add_test(HashStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST}) + endif() + + if(USE_CUDA) + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main INSTALL_TEST ${INSTALL_TEST}) +- c10d_add_test(ProcessGroupGlooAsyncTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main INSTALL_TEST ${INSTALL_TEST}) ++ c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest INSTALL_TEST ${INSTALL_TEST}) ++ c10d_add_test(ProcessGroupGlooAsyncTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest INSTALL_TEST ${INSTALL_TEST}) + endif() + if(USE_NCCL AND USE_C10D_NCCL) + # NCCL is a private dependency of libtorch, but the tests include some +@@ -45,10 +45,10 @@ if(USE_CUDA) + # a private dependency of the tests as well. + c10d_add_test( + ProcessGroupNCCLTest.cpp +- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_nccl INSTALL_TEST ${INSTALL_TEST}) ++ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl INSTALL_TEST ${INSTALL_TEST}) + c10d_add_test( + ProcessGroupNCCLErrorsTest.cpp +- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_nccl INSTALL_TEST ${INSTALL_TEST}) ++ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl INSTALL_TEST ${INSTALL_TEST}) + if(INSTALL_TEST) + install(TARGETS c10d_cuda_test DESTINATION lib) + endif() +@@ -60,14 +60,14 @@ if(USE_CUDA) + # a private dependency of the tests as well. + c10d_add_test( + ProcessGroupUCCTest.cpp +- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_ucc INSTALL_TEST ${INSTALL_TEST}) ++ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_ucc INSTALL_TEST ${INSTALL_TEST}) + if(INSTALL_TEST) + install(TARGETS c10d_cuda_test DESTINATION lib) + endif() + endif() + else() + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST OFF) ++ c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST OFF) + endif() + endif() + +diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt +index 9c409e078..6cddd8de4 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}) + # pthreadpool header. For some build environment we need add the dependency + # explicitly. + if(USE_PTHREADPOOL) +- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface) ++ target_link_libraries(test_tensorexpr PRIVATE pthreadpool) + endif() + if(USE_CUDA) + target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA) +diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt +index 8b8ebdc6e..034b5e56c 100644 +--- a/torch/CMakeLists.txt ++++ b/torch/CMakeLists.txt +@@ -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) diff --git a/gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch b/gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch new file mode 100644 index 0000000000..1b10f18d5a --- /dev/null +++ b/gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch @@ -0,0 +1,64 @@ +Even when building without Kineto, the header is still +imported and the ActivityType type is used. This patch was copied from +https://github.com/pytorch/pytorch/pull/111048 and adapted. + +diff --git a/torch/csrc/profiler/kineto_shim.h b/torch/csrc/profiler/kineto_shim.h +index c4efd7785..2caef1f1e 100644 +--- a/torch/csrc/profiler/kineto_shim.h ++++ b/torch/csrc/profiler/kineto_shim.h +@@ -12,7 +12,55 @@ + #undef USE_KINETO + #endif + ++#ifdef USE_KINETO + #include ++#else ++namespace libkineto { ++// copied from header ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under the BSD-style license found in the ++ * LICENSE file in the root directory of this source tree. ++ */ ++ ++// Note : All activity types are not enabled by default. Please add them ++// at correct position in the enum ++enum class ActivityType { ++ // Activity types enabled by default ++ CPU_OP = 0, // cpu side ops ++ USER_ANNOTATION, ++ GPU_USER_ANNOTATION, ++ GPU_MEMCPY, ++ GPU_MEMSET, ++ CONCURRENT_KERNEL, // on-device kernels ++ EXTERNAL_CORRELATION, ++ CUDA_RUNTIME, // host side cuda runtime events ++ CUDA_DRIVER, // host side cuda driver events ++ CPU_INSTANT_EVENT, // host side point-like events ++ PYTHON_FUNCTION, ++ OVERHEAD, // CUPTI induced overhead events sampled from its overhead API. ++ ++ // Optional Activity types ++ CUDA_SYNC, // synchronization events between runtime and kernels ++ GLOW_RUNTIME, // host side glow runtime events ++ MTIA_RUNTIME, // host side MTIA runtime events ++ CUDA_PROFILER_RANGE, // CUPTI Profiler range for performance metrics ++ MTIA_CCP_EVENTS, // MTIA ondevice CCP events ++ HPU_OP, // HPU host side runtime event ++ XPU_RUNTIME, // host side xpu runtime events ++ MTIA_WORKLOADD, ++ ++ PRIVATEUSE1_RUNTIME, ++ PRIVATEUSE1_DRIVER, ++ ++ ENUM_COUNT, // This is to add buffer and not used for any profiling logic. Add your new type before it. ++ OPTIONAL_ACTIVITY_TYPE_START = CUDA_SYNC, ++}; ++} ++ ++#endif + + #include + #include -- 2.49.0 From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 4/5] gnu: python-torchvision: Update to 0.22.0. References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 02:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174900520026536 (code B ref 78687); Wed, 04 Jun 2025 02:47:03 +0000 Received: (at 78687) by debbugs.gnu.org; 4 Jun 2025 02:46:40 +0000 Received: from localhost ([127.0.0.1]:44627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMe9I-0006tv-Ha for submit@debbugs.gnu.org; Tue, 03 Jun 2025 22:46:40 -0400 Received: from mx0.riseup.net ([198.252.153.6]:44260) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMe9G-0006tQ-Sv for 78687@debbugs.gnu.org; Tue, 03 Jun 2025 22:46:39 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBsRF1MR8z9tv4 for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:46:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749005193; bh=5oL9b6kK1eehLpOnjereUWVctAq/AKydr5gtlUPTsuA=; h=Date:From:To:Subject:From; b=RY5D7RqvYVqszhv3jgZAktfhOauWQFqjHsmH2SgR2DLd/x9ZFnzpwvLt42yPMcv3Q hqQdrKNGp11q/GbY46JYzZ+pgk83twSjmge3W8M84814lHZ4UYfLbj/9RN1lGzUtJm svVw4anhr1tEP+joEKTuFEMBOyTa2TjX3TUXS7Cw= X-Riseup-User-ID: DAFCE6E8766C575322F3692222D7620F324CF3A492E652DF6FAA561CC437B0C5 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBsRF0FVQzFpjS for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:46:33 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 04 Jun 2025 02:46:32 +0000 From: Ayan Das Message-ID: <8d128dd0cdc9c886968980cd18b50d8e@riseup.net> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) >From d1b1b4765cf3a33fde255b99f0abbbcb8d7a98e8 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: Ayan Das Date: Wed, 4 Jun 2025 00:21:21 +0530 Subject: [PATCH 4/5] gnu: python-torchvision: Update to 0.22.0. * gnu/packages/machine-learning.scm (python-torchvision): Update to 0.22.0. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0d82d951a0..c72f23d76f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5848,7 +5848,7 @@ (define-public python-torchmetrics (define-public python-torchvision (package (name "python-torchvision") - (version "0.20.1") + (version "0.22.0") (source (origin (method git-fetch) (uri (git-reference @@ -5858,7 +5858,7 @@ (define-public python-torchvision (file-name (git-file-name name version)) (sha256 (base32 - "1hxcpg44bjnfzqwihzbnfgd0gpkhfgqrcg116mnvdn0fpbhf4yq5")) + "0hz6v8796vq8kinafzyq2v2wir5s3hykfn0rnlwx7qcsz62i3ggv")) (modules '((guix build utils))) (snippet '(begin -- 2.49.0 From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 5/5] gnu: python-captum: Fix tests for PyTorch 2.7.0. References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 02:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174900526227105 (code B ref 78687); Wed, 04 Jun 2025 02:48:02 +0000 Received: (at 78687) by debbugs.gnu.org; 4 Jun 2025 02:47:42 +0000 Received: from localhost ([127.0.0.1]:44636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMeAI-000736-15 for submit@debbugs.gnu.org; Tue, 03 Jun 2025 22:47:42 -0400 Received: from mx0.riseup.net ([198.252.153.6]:56740) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMeAF-00072d-Rh for 78687@debbugs.gnu.org; Tue, 03 Jun 2025 22:47:40 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBsSP2bRmz9tkN for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749005254; bh=r6qISXcITtIgiW3q3UJFAsQVfaPyCGfIcIKDBTD1N6Y=; h=Date:From:To:Subject:From; b=XjVRtjm9p/t8IHJRm2lOhnzmLyZXKG4Zy3FzRTNyPN1afFblqa7sqQqFuamW2uVVr dxGqSR4tA5LWaKD02ykJ6hGPLYMuq+7knd2+O/Tgx/dCyt1RrispzIHE95tAES6yUC 0SD8Zzs8Hz5M3Lkx4n8vq7spp31B/+WwiijWcTCc= X-Riseup-User-ID: 78961562A78C0943E78854E710DED547B6D3DD17E0D176A3B7314B5D6FC56F7F Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBsSP16rJzFq0n for <78687@debbugs.gnu.org>; Wed, 4 Jun 2025 02:47:33 +0000 (UTC) MIME-Version: 1.0 Date: Wed, 04 Jun 2025 02:47:32 +0000 From: Ayan Das Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) >From e4eba433f77c0c91f7c8767a094addfa6c719093 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: Ayan Das Date: Wed, 4 Jun 2025 01:32:38 +0530 Subject: [PATCH 5/5] gnu: python-captum: Fix tests for PyTorch 2.7.0. * gnu/packages/machine-learning.scm (python-captum)[arguments]: Skip test_exp_sets_with_diffent_lengths which fails with PyTorch 2.7.0's stricter torch.load weights_only behavior. --- gnu/packages/machine-learning.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c72f23d76f..06dd6489a9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5610,11 +5610,14 @@ (define-public python-captum (arguments (list #:test-flags - '(list "-k" - ;; These two tests (out of more than 1000 tests) fail because of - ;; accuracy problems. - "not test_softmax_classification_batch_multi_target\ - and not test_softmax_classification_batch_zero_baseline"))) + '(list "-k" (string-append + ;; These two tests (out of more than 1000 tests) fail because of + ;; accuracy problems. + "not test_softmax_classification_batch_multi_target" + " and not test_softmax_classification_batch_zero_baseline" + ;; This test fails with PyTorch 2.7.0 due to stricter + ;; torch.load weights_only behavior. + " and not test_exp_sets_with_diffent_lengths")))) (propagated-inputs (list python-matplotlib python-numpy python-pytorch python-tqdm)) (native-inputs (list jupyter -- 2.49.0 From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Jun 2025 22:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ayan Das Cc: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174933542220716 (code B ref 78687); Sat, 07 Jun 2025 22:31:01 +0000 Received: (at 78687) by debbugs.gnu.org; 7 Jun 2025 22:30:22 +0000 Received: from localhost ([127.0.0.1]:49891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uO23S-0005O4-11 for submit@debbugs.gnu.org; Sat, 07 Jun 2025 18:30:22 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58349) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uO23O-0005MR-Jf for 78687@debbugs.gnu.org; Sat, 07 Jun 2025 18:30:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E2A7F240101 for <78687@debbugs.gnu.org>; Sun, 8 Jun 2025 00:30:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=1984.ea087b; t=1749335410; bh=/eui7AlfilI7GONfl5vMoIMYiwQ9P1vOEK3jGF8IhE8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=Knn3qbID2kazwJyT/7rV7nb/qevYecurZjPxE6bRgoBkGsxXuTfj6/raokPOC4UcH aSqsbbtd0KbgAOHaUJsvLulp2Sye01lsA3XX+M0CuJ683WJJiEuCwb5NpVqbh7YEEX W/G3iIfcaomoOnLFdsdek1Z16VHPhPck93KnuNKEfZ4gcYOe6P6B9DvlUDvTV1Ocle iGlxvsj+xIXiG6+A3qQw6FflK+UA4AChkor5b4fFgqxe2jNRld4hLg9TaEAe1/x1DV v7ckXIeOuFPprJXPWXkBAHC6LW7SZSHfyiG0A+tYxAVkU+25znV4Irl92MT6qBZEsx IfFMofifg8EHKqtepU05ad3p46D8Cifcr+OPxpeNNQ/auqW7vdlCUqeYQiyftBDvhF UI070Uyz7ao6OnpZKGYpHEDzj3R4EAB2cHwfAQ/7izpZsv5fWm75OPOLtXk+SRym/4 cb/mSGv2ictPS6RSdA2dbu1njFykujQaASvTguktLTDh5zBkP2s Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4bFCYZ14x9z6v0Y; Sun, 8 Jun 2025 00:30:10 +0200 (CEST) From: David Elsing In-Reply-To: References: Date: Sat, 07 Jun 2025 22:30:09 +0000 Message-ID: <86a56j6v7y.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain 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 (---) Hello, Ayan Das writes: > This patch series updates PyTorch to version 2.7.0 along with its > required dependencies and related packages: I wanted to take a look at the patch series, but it appears that something went wrong with the formatting (such as additional newlines) and the patches fail to apply using `git am'. Maybe you can resend it or submit it on Codeberg [1] (but for the latter QA does not work yet I think)? Best, David [1] https://codeberg.org/guix/guix From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Jun 2025 15:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174939831311730 (code B ref 78687); Sun, 08 Jun 2025 15:59:01 +0000 Received: (at 78687) by debbugs.gnu.org; 8 Jun 2025 15:58:33 +0000 Received: from localhost ([127.0.0.1]:52655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uOIPo-000338-NH for submit@debbugs.gnu.org; Sun, 08 Jun 2025 11:58:33 -0400 Received: from mx1.riseup.net ([198.252.153.129]:37934) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uOIPl-00032p-Cm for 78687@debbugs.gnu.org; Sun, 08 Jun 2025 11:58:30 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4bFfq33YTCzDqLT for <78687@debbugs.gnu.org>; Sun, 8 Jun 2025 15:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749398303; bh=EDKMLKINPusuOXRMbMcioMRkWi/KYnkLbvihnI1+7bQ=; h=Date:From:To:Subject:From; b=V+bMloik2m3itmERE+Z1BnrsHQHuWCv90XZrIADJmA4J8DfG6p81BTIxDv++YTzFm 3nP1NcLZLafq1pqhedUbzMiapIO2CVcdXEoCLyrM9htoPPpzYoUTD2tJSbyqjYo5aU DGuOqviOFGBMclwKmgDrsNKHj3M0Mxp/UcJq0ZPY= X-Riseup-User-ID: 86A42BC3DC703E9FEDF6737625B2D208CF49932B6803EB5B4B70690F10E6971E Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4bFfq32P4NzJn3f for <78687@debbugs.gnu.org>; Sun, 8 Jun 2025 15:58:23 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 08 Jun 2025 15:58:23 +0000 From: Ayan Das Message-ID: <0d77e54b752fa8cbaa15aa5847821f21@riseup.net> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) Hi David, Thank you, I have resubmitted the patch series at https://issues.guix.gnu.org/78725. Closing this bug report now. Best, Ayan From unknown Sat Jun 14 19:42:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78687] [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies References: In-Reply-To: Resent-From: Ayan Das Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Jun 2025 16:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78687 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78687@debbugs.gnu.org Received: via spool by 78687-submit@debbugs.gnu.org id=B78687.174939885424609 (code B ref 78687); Sun, 08 Jun 2025 16:08:02 +0000 Received: (at 78687) by debbugs.gnu.org; 8 Jun 2025 16:07:34 +0000 Received: from localhost ([127.0.0.1]:52665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uOIYX-0006Or-MV for submit@debbugs.gnu.org; Sun, 08 Jun 2025 12:07:33 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53852) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uOIYT-0006OS-U5 for 78687@debbugs.gnu.org; Sun, 08 Jun 2025 12:07:31 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4bFg1R4lzGzDq8s for <78687@debbugs.gnu.org>; Sun, 8 Jun 2025 16:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749398843; bh=GIE6Mbm0XcgLYZzxvJN2Xut1zYIyL2RXTyZBb+Gur8g=; h=Date:From:To:Subject:From; b=N3C+XOZOcrDAP9ILxWkzMbYQTJIYcg06OuNDyMnB+VNeteu9eLi+mmN5UjV+ZBJ9Z H92lSM+jiW159xTL6oZwtuI4acIYqanGdWrWRObZgVxlTy3RocIJZtmp/6uHdQSVMT NUKe+v2YchK8bw5nwnNdMIUCott7Nm2LH54LFIvs= X-Riseup-User-ID: 7F1EBCEF60F18755A6B593A22C7E67D6165089749557D9104149E5A3E07FDBB5 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4bFg1R31JTzJn3f for <78687@debbugs.gnu.org>; Sun, 8 Jun 2025 16:07:23 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 08 Jun 2025 16:07:23 +0000 From: Ayan Das Message-ID: <6c9c2aad6d389d2a5deeee63d9a05ceb@riseup.net> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) 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.7 (-) Correction - the link is: https://issues.guix.gnu.org/78725 (The previous message's link included a trailing period) From unknown Sat Jun 14 19:42:07 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: Ayan Das Subject: bug#78687: closed (Re: [bug#78687] Update PyTorch to 2.7.0 with dependencies) Message-ID: References: X-Gnu-PR-Message: they-closed 78687 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78687@debbugs.gnu.org Date: Sun, 08 Jun 2025 16:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1749399302-25699-1" This is a multi-part message in MIME format... ------------=_1749399302-25699-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78687: [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies 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 78687@debbugs.gnu.org. --=20 78687: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78687 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1749399302-25699-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78687-done) by debbugs.gnu.org; 8 Jun 2025 16:14:44 +0000 Received: from localhost ([127.0.0.1]:52677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uOIfQ-0006ff-14 for submit@debbugs.gnu.org; Sun, 08 Jun 2025 12:14:44 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58398) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uOIfN-0006fO-Fp for 78687-done@debbugs.gnu.org; Sun, 08 Jun 2025 12:14:37 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4bFg9g3lZNzDq8s for <78687-done@debbugs.gnu.org>; Sun, 8 Jun 2025 16:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749399271; bh=UUogaes9Jjdp7/8h7TBDzvWPNqfp6LI1DbizAqwiPuE=; h=Date:From:To:Subject:From; b=Pwsm1Zz3tHF3GCCfUM1fkHOQSXUd9J1zl2fL9uq5z6js92XOR5xlyU4Nk7fvJnWKQ waTM9h/Nw6mKvrJ8VOzVnCSWITEbFW3fPLNjxkWvIaOpHeqnfiBthf1wHWdPu3Wf+I asBo1JuNA2rXSjt/t27RbwUPmIg4tW0ZYyfFw7GM= X-Riseup-User-ID: EC29AE4149C0870A84B82ECF800E15270660489FBAD7C3B44900369EF3C7A6FD Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4bFg9g2L4QzJmql for <78687-done@debbugs.gnu.org>; Sun, 8 Jun 2025 16:14:31 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 08 Jun 2025 16:14:31 +0000 From: Ayan Das To: 78687-done@debbugs.gnu.org Subject: Re: [bug#78687] Update PyTorch to 2.7.0 with dependencies Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 78687-done 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.7 (-) Resubmitted as #78725 ------------=_1749399302-25699-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Jun 2025 01:44:48 +0000 Received: from localhost ([127.0.0.1]:44150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMdBP-0000ml-2y for submit@debbugs.gnu.org; Tue, 03 Jun 2025 21:44:47 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48346) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMYrj-0001ga-Dx for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:08:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMYrd-0006lm-EU for guix-patches@gnu.org; Tue, 03 Jun 2025 17:08:05 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMYrb-0000Rs-EB for guix-patches@gnu.org; Tue, 03 Jun 2025 17:08:05 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4bBjwb6qD5z9xj1 for ; Tue, 3 Jun 2025 21:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1748984880; bh=DWgepB7C3y1gvFtS3Hscuhuywh4ERG6fTYVOTFDuvWs=; h=Date:From:To:Subject:From; b=XugA8yEGqTNFycFWmKy865lgW1IH7A1/Eze+ewUOpFKWEAWEaV8IDkLPuaUu+3sMG KTI4dCU+ly0us1ihNJArq4KHz6iN3oi/lLv7r8NDCM8rSGOAbFC6Bh14/kpNWwt0Yv tdCMGJxEtL5Isettgj+bk6wUFH2lgW5xR9YGZ45E= X-Riseup-User-ID: F5420B90BAD2612EF9277ADF441FF53902418970478DD75262929E23E7B076F2 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4bBjwb5HLnzFwv9 for ; Tue, 3 Jun 2025 21:07:59 +0000 (UTC) MIME-Version: 1.0 Date: Tue, 03 Jun 2025 21:07:59 +0000 From: Ayan Das To: guix-patches@gnu.org Subject: [PATCH 0/5] Update PyTorch to 2.7.0 with dependencies Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=198.252.153.6; envelope-from=bvits@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 03 Jun 2025 21:44:45 -0400 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 patch series updates PyTorch to version 2.7.0 along with its required dependencies and related packages: 1) xnnpack: Update to 0.0-4.51a0103 (required by PyTorch 2.7.0) 2) miniz-for-pytorch: Update to use miniz 3.0.2 (required by PyTorch 2.7.0) 3) python-pytorch: Update to 2.7.0 4) python-torchvision: Update to 0.22.0 (kept in sync with PyTorch) 5) python-captum: Fix test compatibility with PyTorch 2.7.0 All updated packages have been built and tested successfully. Ayan Das (5): gnu: xnnpack: Update to 0.0-4.51a0103. gnu: miniz-for-pytorch: Update to pytorch-2.7.0. gnu: python-pytorch: Update to 2.7.0. gnu: python-torchvision: Update to 0.22.0. gnu: python-captum: Fix tests for PyTorch 2.7.0. gnu/local.mk | 4 + gnu/packages/compression.scm | 6 +- gnu/packages/machine-learning.scm | 51 +- gnu/packages/patches/miniz-for-pytorch.patch | 26 +- .../python-pytorch-fix-codegen-2.7.0.patch | 178 +++++++ .../python-pytorch-runpath-2.7.0.patch | 30 ++ ...ython-pytorch-system-libraries-2.7.0.patch | 442 ++++++++++++++++++ .../python-pytorch-without-kineto-2.7.0.patch | 64 +++ 8 files changed, 768 insertions(+), 33 deletions(-) create mode 100644 gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-runpath-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch create mode 100644 gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch ------------=_1749399302-25699-1--