From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8N9MLgFq+2VWuwAA62LTzQ:P1 (envelope-from ) for ; Wed, 20 Mar 2024 23:58:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 8N9MLgFq+2VWuwAA62LTzQ (envelope-from ) for ; Wed, 20 Mar 2024 23:58:09 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IFw2ElPe; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710975489; a=rsa-sha256; cv=none; b=ichHNCC+nz2ZxdlYyN/R2Q0xZgOulbaIePmkNHSY3kKYWaR3pZQjoV1dBlDLKpRAaDW/SP xhgTXwmqLsLPn1ZKYbh5d8oYpELQPVKe5++iz5gDbJudSRqdQw63dk16w4MiFMRmX2pph3 shTJMwBByWt+HzZZcyF7/aFSVeZi8y6a6BhoPagnayZifbhW2s5yWOUh8VibamWR1wqrYH tNXhRWn/uMG79X0OT83kFN/hkPZYwkCtem51Pz3p/PRj77XqANBxIEl0YexyfEizd3vYuc wyXHdOthd+vwY49H+0yHdk29kJSLO3bOs1MKuMBs6QIwWUyC8uCK97WtNUJgNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IFw2ElPe; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710975489; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XgiWRNUITLOA9mNeubOwM+RVslkxt1WFhmDrBx0twEw=; b=A1KZWsABCcbh2rzZf8kxP9ZK4NuTvBd3ow6h4J5FtUyuIQxcV78fFXQpU/XdzsufvnGrPb zPW/g17qYAVEmQuDwSp5WO+XEfg8nZzUttJII0IYa75oceVmddEh9HQeseQ5JZQMSaf7ZZ oIVJraRldhT5QYrzTdHqmUk72p1Jf/ACPn7HPB54Oom3xjO/KdTGDhb83Ci0IgOheEsysq rouWKgZxb9xLOnCKpVZczT7EcxyAoXb5UXX7SIsOeCCOmaTpG8y4/OB4LwSDLywTWnx2ad oZDZcNfOb5JJpYb2CVionQPhtIUWWlwe65TGylF74tS0EryY0gfcgH1VTziK/A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 846982567C for ; Wed, 20 Mar 2024 23:58:09 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rn4bn-0005wi-02; Wed, 20 Mar 2024 18:40:31 -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 1rn4bi-0005ug-ON for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:26 -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 1rn4bi-0007c1-G8 for guix-patches@gnu.org; Wed, 20 Mar 2024 18:40:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rn4cL-0006Cz-W3 for guix-patches@gnu.org; Wed, 20 Mar 2024 18:41:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v3 09/32] gnu: Add miniz-for-pytorch. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2024 22:41:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.171097442523543 (code B ref 69591); Wed, 20 Mar 2024 22:41:05 +0000 Received: (at 69591) by debbugs.gnu.org; 20 Mar 2024 22:40:25 +0000 Received: from localhost ([127.0.0.1]:36801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4bh-00067Y-1v for submit@debbugs.gnu.org; Wed, 20 Mar 2024 18:40:25 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rn4bJ-00062h-9n for 69591@debbugs.gnu.org; Wed, 20 Mar 2024 18:40:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1C795240103 for <69591@debbugs.gnu.org>; Wed, 20 Mar 2024 23:39:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710974356; bh=E4wIn7qn7CCbSI86fGLYbuVGf0twXWiPv3T8+ISg4Oc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=IFw2ElPerj0+bHwOc1c18rooPqHuQcTsISvMby6RwTgrb5E9ALRZC6VnwAg28MXxA Pc07vrMSmXcfrN7QbdQtPdgZxXGF7ZBXWMnK6r3PIpdqI8b3Y5J/LeKsS1E+lOJcpv Cx2STBqIXpDBEmNiyu4/amSlS2OAf6Z/GiAIifEmkxvJob9I9WDL6NIpXu5L/QK+Ag bFge2sGCnAvsJP6zcIteqgQClQgn6FU+M7QZMWHQPh7zmLkt7MvbLiorILWS8cn83r z0B68XEGJLXTHmH+SOs0m0qkylx/GbgXna81Z8ZdRofqNr9lwsLwLGCgHcEJoVbmeM zqLr/fFJfJbEw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V0Nmz64Xzz6tsf; Wed, 20 Mar 2024 23:39:15 +0100 (CET) From: David Elsing Date: Wed, 20 Mar 2024 22:38:34 +0000 Message-ID: <20240320223906.13214-9-david.elsing@posteo.net> In-Reply-To: <20240320223737.12883-1-david.elsing@posteo.net> References: <20240320223737.12883-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.92 X-Spam-Score: -3.92 X-Migadu-Queue-Id: 846982567C X-TUID: SqZwk2h4uHZ+ * gnu/packages/compression.scm (miniz-for-pytorch): New variable. * gnu/packages/patches/miniz-for-pytorch.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 21 +++++++++ gnu/packages/patches/miniz-for-pytorch.patch | 47 ++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/miniz-for-pytorch.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7f1006010b..ca83a84ea2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1691,6 +1691,7 @@ dist_patch_DATA = \ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ + %D%/packages/patches/miniz-for-pytorch.patch \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fcfc2c30f3..589c9bb834 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2867,3 +2867,24 @@ (define-public miniz specification standards. It supports the most commonly used functions exported by the zlib library.") (license license:expat))) + +(define-public miniz-for-pytorch + (package + (inherit miniz) + (version "pytorch-2.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/richgel999/miniz") + (commit "2.2.0"))) + (file-name (git-file-name (package-name miniz) version)) + (sha256 + (base32 + "09j9ihigfsavgcmk8l36zmbjvdf1x1w7h2v4rkww1qk1sb43y5zf")) + (patches (search-patches "miniz-for-pytorch.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments miniz) + ((#:configure-flags flags '()) + ;; The changes break the examples. + `(cons "-DBUILD_EXAMPLES=OFF" ,flags)))) + (properties '((hidden? . #t))))) diff --git a/gnu/packages/patches/miniz-for-pytorch.patch b/gnu/packages/patches/miniz-for-pytorch.patch new file mode 100644 index 0000000000..19fa705a31 --- /dev/null +++ b/gnu/packages/patches/miniz-for-pytorch.patch @@ -0,0 +1,47 @@ +Modifications from the internal fork of the python-pytorch package. + +diff --git a/miniz.h b/miniz.h +index 42e1ea2..5869ab9 100644 +--- a/miniz.h ++++ b/miniz.h +@@ -123,7 +123,7 @@ + /* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */ + /* get/set file times, and the C run-time funcs that get/set times won't be called. */ + /* The current downside is the times written to your archives will be from 1979. */ +-/*#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_ZLIB_APIS */ + + /* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */ +-/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ ++#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES + + /* 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) + #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_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 +--- a/miniz_zip.h ++++ b/miniz_zip.h +@@ -150,7 +150,7 @@ typedef enum { + MZ_ZIP_TOTAL_ERRORS + } mz_zip_error; + +-typedef struct ++typedef struct mz_zip_archive + { + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; -- 2.41.0