From patchwork Sun Aug 4 22:15:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66737 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 907FF27BBE2; Sun, 4 Aug 2024 23:19:00 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 0D31127BBE9 for ; Sun, 4 Aug 2024 23:19:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007hD-W0; Sun, 04 Aug 2024 18:17:58 -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 1sajY1-0007dj-Fc for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:53 -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 1sajXy-0000tn-22 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ubFTnzQ3dTycZTYEZbPFIFo/qKqeewpEV6IdkbgyJWE=; b=PGkeYpuxAI0fl8fsh0zjF2yQcgUmvJd1pQIhQrvx4RP8pBm2DvkhqsyFtYfM28OWhQ6whodbbCMkZBsB9CqDmLuX9J/hMpRDXJQ0GHyhf4U9TeyY+4IhRtD9jO6uOaLL0Ex3s4atkI3MtTlY3V/ONt1ufQ2o2bzJRHPcwZTW5v7CGS3K317+S5782OPEvSkqUs7tMUhD/lfLa2liXXGAIyLvYmHyLrfsijFKAYdob57Lqn4wU+DoUp5cDSNl7o2fKkdcr/R9+aIPtfr6vIosX97Ebtfsw89NCF+O3BdiNYE6HbYkHNM0BgSL2VhDhpQlPF/kT4Fek8LvLcpvxY+6UA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYJ-0004UT-Ia for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 21/24] gnu: python-torchvision: Update to 0.19.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987417044 (code B ref 72471); Sun, 04 Aug 2024 22:18:11 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:54 +0000 Received: from localhost ([127.0.0.1]:57525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY1-0004Ql-V2 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Ly-UX for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 57065240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809823; bh=I3DiqOBLzD/nhQYzvUen8Al56f8dGjALpR9k6KtxS3Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=JW2IigmD8kiGLaTyvKwFwqnhQTbXruOxuwLHxjMJZmP0D4HcfA6p4CKauwIujdFob AidvoA3eXx1MZ2ay7V8wHgc7BFRs7BnndWVD+ZnkCLc4wSs9ExmztrAHX+fWBG+RxD wr91zAFfPvzZlywqU1W/+DM2pkdghdHyKTUnQQMMoq+BHmtahBXXofGugrv0YmsuUv 94PduEoA5r0F5ssN8zqJlJJmNlHz913VDaYDWIdEsfNk3ClEeqK5b90meAejZqqOWo YnCeciCLBHSQQO/Yi/YqABoDrXv2X/cK/xxFZaszfUhuitsBwBUq83tPQ6xSa70boK QL12fAfR+wGXg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp66gwLz6tlh; Mon, 5 Aug 2024 00:17:02 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:59 +0000 Message-ID: <20240804221635.3805-21-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-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 * gnu/packages/machine-learning.scm (python-torchvision): Update to 0.19.0. [arguments]: Add 'setenv' phase for finding libjpeg-turbo. [inputs]: Add ffmpeg. --- gnu/packages/machine-learning.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 822881f15a..006e31892c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5330,7 +5330,7 @@ (define-public python-torchmetrics (define-public python-torchvision (package (name "python-torchvision") - (version "0.17.1") + (version "0.19.0") (source (origin (method git-fetch) (uri (git-reference @@ -5340,7 +5340,7 @@ (define-public python-torchvision (file-name (git-file-name name version)) (sha256 (base32 - "094jz0ryzh0yjxf687r61r482fdh3bax8ix2csghraps0z1sns1b")) + "15zyq2k4x9yapx7qfghhslznz1mwybhf086pirsr98c4l891sp1r")) (modules '((guix build utils))) (snippet '(begin @@ -5348,10 +5348,21 @@ (define-public python-torchvision (delete-file-recursively "ios"))))) (build-system pyproject-build-system) (arguments - (list #:tests? #false)) ;the test suite is expensive and there is no easy - ;way to subset it. + (list + ;; The test suite is expensive and there is no easy way to subset it. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'setenv + (lambda _ + (let ((jpegdir #$(this-package-input "libjpeg-turbo"))) + (setenv "TORCHVISION_INCLUDE" + (string-append jpegdir "/include/")) + (setenv "TORCHVISION_LIBRARY" + (string-append jpegdir "/lib/")))))))) (inputs - (list libpng + (list ffmpeg + libpng libjpeg-turbo)) (propagated-inputs (list python-numpy