From a9e4ce6a58dd57dcb1f3f4943d379df66716e145 Mon Sep 17 00:00:00 2001 From: David Elsing Date: Sun, 4 Aug 2024 22:15:59 +0000 Subject: [PATCH] gnu: python-torchvision: Update to 0.19.0. * 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 41f1271ed5..8b22faa2b5 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