From patchwork Tue Mar 12 22:46:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 2365 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 9548C27BBEA; Tue, 12 Mar 2024 22:49:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 86AAD27BBE2 for ; Tue, 12 Mar 2024 22:49:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkAvF-0005Jq-JF; Tue, 12 Mar 2024 18:48:37 -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 1rkAv6-0005EP-Vl for guix-patches@gnu.org; Tue, 12 Mar 2024 18:48:32 -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 1rkAv5-00085o-KN for guix-patches@gnu.org; Tue, 12 Mar 2024 18:48:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkAve-0001Vn-2P for guix-patches@gnu.org; Tue, 12 Mar 2024 18:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v2 00/31] Unbundle and update python-pytorch Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 22:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.17102837195673 (code B ref 69591); Tue, 12 Mar 2024 22:49:02 +0000 Received: (at 69591) by debbugs.gnu.org; 12 Mar 2024 22:48:39 +0000 Received: from localhost ([127.0.0.1]:43997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAvG-0001TO-My for submit@debbugs.gnu.org; Tue, 12 Mar 2024 18:48:39 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAvB-0001SG-RX for 69591@debbugs.gnu.org; Tue, 12 Mar 2024 18:48:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 53FC4240027 for <69591@debbugs.gnu.org>; Tue, 12 Mar 2024 23:47:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710283672; bh=7pqyjW8VPAJtLShPcLbwUvduvgnnV7hDrZ1XxBIcdi0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Wf6tFtZiRp/ruCCcU52806pU5LhD18FQIQ8+IfU16nYGzwRmYCsRWmDEWjePSa+QN 4veqEIzK4Sb7KcJlF1q1n+uGER4gObG9NfTTatY/apPzCMMJA0QL017eO9TI8ypxEO EWc5gU/cQxTS5DqNbgX7jMka/7gjv/vOKtKu8WfarVdh4X8MY7QNPliXG4e/ISlAKV u4Tv937DLgdKkRAUvPQapy35UadWQ4IBH5u4D81jNB+IKcOzFeQoa195grEIuf+Cvj GwcKus6ue1bZnW31ABRokFQyvY9SMbLwVt7EfOjaXUbMK1bVXXHdmNqGWvtqzilBSw zNSxGzFBFCU5A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TvTLb53hWz6tx1; Tue, 12 Mar 2024 23:47:51 +0100 (CET) From: David Elsing Date: Tue, 12 Mar 2024 22:46:43 +0000 Message-ID: <20240312224712.15578-1-david.elsing@posteo.net> In-Reply-To: <20240306193725.17463-1-david.elsing@posteo.net> References: <20240306193725.17463-1-david.elsing@posteo.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches In the previous version, FFmpeg, Vulkan and OpenCV were not included, so I added them to the inputs and enabled the corresponding build options. In a basic test, the Vulkan backend seemed to work. I also adjusted the copyright headers, which I forgot ealier. David Elsing (31): gnu: asmjit: Update to commit 3ca5c18. gnu: Add python-typing-extensions-4.10. gnu: Add python-optree. gnu: Add python-pytest-flakefinder. gnu: Add python-pytest-shard. gnu: Add python-expecttest. gnu: Add python-pytest-rerunfailures-13. gnu: Add miniz. gnu: Add miniz-for-pytorch. gnu: Add libnop. gnu: Remove flatbuffers-next-shared. gnu: python-flatbuffers-next: Update to 23.5.26. gnu: pthreadpool: Update to commit 178e3e0. gnu: cpuinfo: Update to commit aa4b216. gnu: clog: Add "-DUSE_SYSTEM_LIBS=ON" configure flag. gnu: nnpack: Update to commit 70a77f4. gnu: oneapi-dnnl: Update to 3.3.5. gnu: Add tensorpipe. gnu: Add fbgemm. gnu: Add qnnpack. gnu: Add foxi. gnu: Add ideep-pytorch. gnu: xnnpack: Update to commit 51a9875. gnu: Remove xnnpack-for-torch2. gnu: Add qnnpack-pytorch. gnu: python-pytorch: Update to 2.2.1 and unbundle dependencies. gnu: python-torchvision: Update to 0.17.1. gnu: Add ideep-pytorch-for-r-torch. gnu: Add oneapi-dnnl-for-r-torch. gnu: Add qnnpack-pytorch-for-r-torch. gnu: python-pytorch-for-r-torch: Adjust to new python-pytorch. gnu/local.mk | 10 +- gnu/packages/compression.scm | 50 + gnu/packages/cpp.scm | 6 +- gnu/packages/machine-learning.scm | 890 +++- gnu/packages/parallel.scm | 31 +- .../patches/clog-fix-shared-build.patch | 39 +- .../patches/cpuinfo-system-libraries.patch | 50 - .../patches/fbgemm-use-system-libraries.patch | 62 + gnu/packages/patches/foxi-fix-build.patch | 55 + gnu/packages/patches/miniz-for-pytorch.patch | 47 + .../patches/python-optree-fix-32-bit.patch | 122 + ...ython-pytorch-1.9.0-system-libraries.patch | 139 - .../patches/python-pytorch-fix-codegen.patch | 167 + ...thon-pytorch-for-r-torch-fix-codegen.patch | 167 + ...pytorch-for-r-torch-system-libraries.patch | 399 ++ .../patches/python-pytorch-runpath.patch | 19 +- .../python-pytorch-system-libraries.patch | 317 +- .../python-pytorch-without-kineto.patch | 60 + .../python-pytorch2-system-libraries.patch | 156 - .../xnnpack-for-torch2-system-libraries.patch | 2660 ----------- .../patches/xnnpack-remove-broken-tests.patch | 335 ++ .../patches/xnnpack-system-libraries.patch | 4133 ++++++++++------- gnu/packages/python-build.scm | 14 +- gnu/packages/python-check.scm | 89 + gnu/packages/python-xyz.scm | 30 + gnu/packages/serialization.scm | 54 +- 26 files changed, 5144 insertions(+), 4957 deletions(-) delete mode 100644 gnu/packages/patches/cpuinfo-system-libraries.patch create mode 100644 gnu/packages/patches/fbgemm-use-system-libraries.patch create mode 100644 gnu/packages/patches/foxi-fix-build.patch create mode 100644 gnu/packages/patches/miniz-for-pytorch.patch create mode 100644 gnu/packages/patches/python-optree-fix-32-bit.patch delete mode 100644 gnu/packages/patches/python-pytorch-1.9.0-system-libraries.patch create mode 100644 gnu/packages/patches/python-pytorch-fix-codegen.patch create mode 100644 gnu/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch create mode 100644 gnu/packages/patches/python-pytorch-for-r-torch-system-libraries.patch create mode 100644 gnu/packages/patches/python-pytorch-without-kineto.patch delete mode 100644 gnu/packages/patches/python-pytorch2-system-libraries.patch delete mode 100644 gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch create mode 100644 gnu/packages/patches/xnnpack-remove-broken-tests.patch