From 128c84af50a93edb73fa9c445ca3e86a9a08fad0 Mon Sep 17 00:00:00 2001
From: Sakib Rahman <rahmans@myumanitoba.ca>
Date: Mon, 18 Dec 2023 22:42:26 +0000
Subject: [PATCH] Add py-torch to container
---
spack-environment/Makefile | 2 +-
spack-environment/dev/spack.yaml | 1 +
spack-environment/packages.yaml | 6 ++++++
spack.sh | 6 ++++++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/spack-environment/Makefile b/spack-environment/Makefile
index 4492e0a9f..708b95293 100644
--- a/spack-environment/Makefile
+++ b/spack-environment/Makefile
@@ -1,7 +1,7 @@
MAKEFLAGS += -Orecurse
SPACK ?= spack
-SPACK_INSTALL_FLAGS += --no-check-signature
+SPACK_INSTALL_FLAGS += --no-check-signature --show-log-on-error
export SPACK_COLOR = always
diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml
index 8b1125400..dcff7e367 100644
--- a/spack-environment/dev/spack.yaml
+++ b/spack-environment/dev/spack.yaml
@@ -75,6 +75,7 @@ spack:
- py-scipy
- py-seaborn
- py-toml
+ - py-torch
- py-uproot
- py-wurlitzer
- py-yapf
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index dda011358..a8e9dcbf9 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -128,6 +128,9 @@ packages:
- '@11.1.3.east'
- cxxstd=20 -vecgeom +threads -vtk
- any_of: [+opengl +qt +x11, -opengl -qt -x11]
+ gloo:
+ require:
+ - '@2023-05-19'
graphviz:
require:
- '@8.0.1'
@@ -303,6 +306,9 @@ packages:
py-toml:
require:
- '@0.10.2'
+ py-torch:
+ require:
+ - '@2.1.0'
py-uproot:
require:
- '@5.0.5'
diff --git a/spack.sh b/spack.sh
index f2f899aa8..5d791120b 100644
--- a/spack.sh
+++ b/spack.sh
@@ -20,6 +20,9 @@ f01774f1d41781bc4b9e5abb5469e234168da663
d171f314c77ba61b3cd780f159afe6abced5707d
b111064e221aae83e62226672cd8bf9a7524423d
3c54177c5d9032cb36cf154b553d739cbeb2d024
+c07ddf83c32b7129247fe90eed486dd844047087
+00875fbc749a7e4e979c35d59c0a8d60d32d4cd7
+64cf67822471ec2d3df2625a6d713f80cbe7ff43
---
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
@@ -35,3 +38,6 @@ b111064e221aae83e62226672cd8bf9a7524423d
## d171f314c77ba61b3cd780f159afe6abced5707d: py-pygithub: new versions, dependencies
## b111064e221aae83e62226672cd8bf9a7524423d: py-htgettoken: use os.environ, avoid AttributeError
## 3c54177c5d9032cb36cf154b553d739cbeb2d024: edm4hep: add latest tag for 0.10.2
+## c07ddf83c32b7129247fe90eed486dd844047087: py-torch: set env OpenBLAS_HOME
+## 00875fbc749a7e4e979c35d59c0a8d60d32d4cd7: py-torch: patch for ${OpenBLAS_HOME}/include/openblas
+## 64cf67822471ec2d3df2625a6d713f80cbe7ff43: py-torch: move patch before def patch
--
GitLab