[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/214: gnu: r-torch: Do not hardcode Python version.
From: |
guix-commits |
Subject: |
07/214: gnu: r-torch: Do not hardcode Python version. |
Date: |
Tue, 20 Sep 2022 11:06:52 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 8e321254c0e11ec1e73083324fdfff52a8321d67
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Sep 19 21:58:29 2022 +0200
gnu: r-torch: Do not hardcode Python version.
* gnu/packages/cran.scm (r-torch)[arguments]: Do not hardcode Python
version 3.9.
---
gnu/packages/cran.scm | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index af672c0c5e..46e6d8a380 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24535,19 +24535,23 @@ Visualizations are also available for most of these
settings.")
(arguments
(list
#:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'link-libraries
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((deps (string-append #$output "/site-library/torch/deps")))
- (mkdir-p deps)
- (symlink
- (search-input-file
- inputs "/lib/python3.9/site-packages/torch/lib/libtorch.so")
- (string-append deps "/libtorch.so"))
- (symlink
- (search-input-file
- inputs "/lib/liblantern.so")
- (string-append deps "/liblantern.so"))))))))
+ (let ((python-version (version-major+minor (package-version python))))
+ #~(modify-phases %standard-phases
+ (add-after 'install 'link-libraries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((deps (string-append #$output
"/site-library/torch/deps"))
+ (site-packages (string-append "/lib/python"
+ #$python-version
+ "/site-packages")))
+ (mkdir-p deps)
+ (symlink
+ (search-input-file
+ inputs (string-append site-packages
"/torch/lib/libtorch.so"))
+ (string-append deps "/libtorch.so"))
+ (symlink
+ (search-input-file
+ inputs "/lib/liblantern.so")
+ (string-append deps "/liblantern.so")))))))))
(inputs
(list python-pytorch-for-r-torch
liblantern))
- 73/214: gnu: r-performance: Update to 0.9.2., (continued)
- 73/214: gnu: r-performance: Update to 0.9.2., guix-commits, 2022/09/20
- 138/214: gnu: r-zseq: Update to 0.2.1., guix-commits, 2022/09/20
- 64/214: gnu: r-labelled: Update to 2.10.0., guix-commits, 2022/09/20
- 50/214: gnu: r-radiant-data: Update to 1.4.5., guix-commits, 2022/09/20
- 47/214: gnu: r-urca: Update to 1.3-3., guix-commits, 2022/09/20
- 90/214: gnu: r-gmp: Update to 0.6-6., guix-commits, 2022/09/20
- 71/214: gnu: r-tmb: Update to 1.9.1., guix-commits, 2022/09/20
- 113/214: gnu: r-uwot: Update to 0.1.14., guix-commits, 2022/09/20
- 33/214: gnu: r-paletteer: Update to 1.4.1., guix-commits, 2022/09/20
- 139/214: gnu: r-latex2exp: Update to 0.9.5., guix-commits, 2022/09/20
- 07/214: gnu: r-torch: Do not hardcode Python version.,
guix-commits <=
- 08/214: gnu: r-torch: Update to 0.8.1., guix-commits, 2022/09/20
- 79/214: gnu: r-chk: Update to 0.8.1., guix-commits, 2022/09/20
- 94/214: gnu: r-future-apply: Update to 1.9.1., guix-commits, 2022/09/20
- 53/214: gnu: r-zip: Update to 2.2.1., guix-commits, 2022/09/20
- 151/214: gnu: r-janeaustenr: Update to 1.0.0., guix-commits, 2022/09/20
- 120/214: gnu: r-parameters: Update to 0.18.2., guix-commits, 2022/09/20
- 35/214: gnu: r-prismatic: Update to 1.1.1., guix-commits, 2022/09/20
- 142/214: gnu: r-posterior: Update to 1.3.1., guix-commits, 2022/09/20
- 118/214: gnu: r-terra: Update to 1.6-17., guix-commits, 2022/09/20
- 92/214: gnu: r-globals: Update to 0.16.1., guix-commits, 2022/09/20