From 2d50b302622556e06f12593afa02f0082a97d829 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 1 Jan 2024 01:46:25 +0000
Subject: [PATCH] feat: py-onnx-1.15.0
---
containers/jug/dev.Dockerfile | 2 +-
spack-environment/dev/spack.yaml | 1 +
spack-environment/packages.yaml | 9 ++++++---
spack.sh | 4 ++++
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index ee2090d52..1ddbced22 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -179,7 +179,7 @@ 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
index 73cba0f6b..91b29572c 100644
--- 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
index 91b81bf1c..ac80b18c1 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -201,7 +201,7 @@ packages:
- any_of: [+geocad, -geocad]
onnx:
require:
- - '@1.13.1'
+ - '@1.15.0'
opencascade:
require:
- '@7.7.1'
@@ -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
index 4bc44a1b5..265269173 100644
--- a/spack.sh
+++ b/spack.sh
@@ -26,6 +26,8 @@ c07ddf83c32b7129247fe90eed486dd844047087
7a0c4e8017033430e5f15ed628be6b539e935ba9
48fcfda1e7c1781cab4cada6d099823b263ab0cc
8c29e90fa9962f4a44f39f47217b46c85176af28
+1255620a14afa3ad4aad681a847a3a1704141976
+0fed2d66bf0eec799707dd1b88ac9419f6ae14e1
---
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
@@ -47,3 +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
--
GitLab