From patchwork Wed Jun 4 02:42:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Das X-Patchwork-Id: 43004 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 687A627BC4A; Wed, 4 Jun 2025 14:34:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC8A427BC49 for ; Wed, 4 Jun 2025 14:34:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMoEz-0000kv-Px; Wed, 04 Jun 2025 09:33:18 -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 1uMe6k-0008Qv-Uh for guix-patches@gnu.org; Tue, 03 Jun 2025 22:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uMe6k-0006ZZ-Kz for guix-patches@gnu.org; Tue, 03 Jun 2025 22:44:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:Date:MIME-Version:To:In-Reply-To:References:Subject; bh=WzkBVipFKT6d0B/RtZCUBNlp+M/50d2a49+afNK/W6I=; b=ohUPyCnSc3UAcVZ1ItceHx+eIjuiLb3uWxSGUNowGhTSZ7UvWW+3nxz4W6P5EGLfAk5oTcn8zrExTHvM+UuhVM07m8/Aa/gYbiLEVsl/6sc8/B+2U8xpi0eANxZDYYBL/lcNVUTxyF3AOevpA71aeQLKOktHY6iX5rzHcrC48InGihGYU1KzZ1qBGjtVxGRnshCeJHU8Nn+qVolbj1scWf3U8mtY5IhpyAS9GKPrzI5K9ZdGnaDMSBdCo1nMlNoaMi72RuPggle0bgWlKmfHNJaB8nuqW8C2anrqpX++hKX5GyYCzav6U4v7to0ysZQMgne34r4SEwdIxTDd7X9wSA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMe6k-0006YW-EL for guix-patches@gnu.org; Tue, 03 Jun 2025 22:44:02 -0400 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: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 04 Jun 2025 09:32:45 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) 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; 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