Merge branch 'master' into 'onnx-1.15.0'

# Conflicts: # spack.sh
eic · Jan 1, 2024 · 37b7b30 · 37b7b30
2 parents bf7d5fa + 2d50b30
commit 37b7b30
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
@@ -174,14 +174,12 @@ if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; the
   spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}=main']"
   spack deconcretize -y eicrecon
 fi
-cat ${SPACK_ENV}/spack.yaml
-cat ${SPACK_ENV}/../packages.yaml
 spack concretize --fresh --force --quiet
 make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
   SPACK_ENV=${SPACK_ENV} \
   BUILDCACHE_OCI_PROMPT="eicweb" \
   BUILDCACHE_OCI_FINAL="ghcr" \
-  BUILDCACHE_S3_FINAL="eics3rw"
+  BUILDCACHE_S3_PROMPT="eics3rw"
 ccache --show-stats
 ccache --zero-stats
 EOF

diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml
@@ -70,6 +70,7 @@ spack:
   - py-mplhep
   - py-htgettoken
   - py-numpy
+  - py-onnx
   - py-pandas
   - py-pip
   - py-pre-commit

diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
@@ -234,7 +234,7 @@ packages:
     - +fastjet +root
   python:
     require:
-    - '@3.11.6'
+    - '@3.10.13'
   py-awkward:
     require:
     - '@2.1.1'
@@ -286,12 +286,15 @@ packages:
   py-numpy:
     require:
     - '@1.26.1'
+  py-onnx:
+    require:
+    - '@1.15.0'
   py-pandas:
     require:
     - '@1.5.3'
   py-pip:
     require:
-    - '@23.1.2'
+    - any_of: ['@23.1.2', '@23.0']
   py-pre-commit:
     require:
     - '@2.20.0'

diff --git a/spack.sh b/spack.sh
@@ -26,6 +26,7 @@ c07ddf83c32b7129247fe90eed486dd844047087
 7a0c4e8017033430e5f15ed628be6b539e935ba9
 48fcfda1e7c1781cab4cada6d099823b263ab0cc
 8c29e90fa9962f4a44f39f47217b46c85176af28
+1255620a14afa3ad4aad681a847a3a1704141976
 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
@@ -48,4 +49,5 @@ c07ddf83c32b7129247fe90eed486dd844047087
 ## 7a0c4e8017033430e5f15ed628be6b539e935ba9: acts: new versions 31.*
 ## 48fcfda1e7c1781cab4cada6d099823b263ab0cc: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
 ## 8c29e90fa9962f4a44f39f47217b46c85176af28: Build cache: make signed/unsigned a mirror property
+## 1255620a14afa3ad4aad681a847a3a1704141976: Fix infinite recursion when computing concretization errors
 ## 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1: (py-)onnx: new version 1.14.{0,1}, 1.15.0