From 45db9e77578c5e70f0e00fa66cfda6b9586fda11 Mon Sep 17 00:00:00 2001 From: Sakib Rahman <rahmans@myumanitoba.ca> Date: Sat, 16 Nov 2024 16:00:14 +0000 Subject: [PATCH] feat: add celeritas to the cuda and xl image --- spack-environment/cuda/spack.yaml | 3 ++- spack-environment/xl/spack.yaml | 3 ++- spack.sh | 13 +++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml index f76c41970..629837c00 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -11,6 +11,7 @@ spack: - algorithms - cairo - catch2 + - celeritas +cuda cuda_arch=75 - cernlib - cli11 - cmake @@ -100,4 +101,4 @@ spack: - stow - valgrind - xrootd - - xeyes + - xeyes \ No newline at end of file diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml index f826b2252..0dc91e347 100644 --- a/spack-environment/xl/spack.yaml +++ b/spack-environment/xl/spack.yaml @@ -11,6 +11,7 @@ spack: - algorithms - cairo - catch2 + - celeritas - cernlib - cli11 - cmake @@ -110,4 +111,4 @@ spack: - strace - valgrind - xrootd - - xeyes + - xeyes \ No newline at end of file diff --git a/spack.sh b/spack.sh index ac559b450..5f2ec4e06 100644 --- a/spack.sh +++ b/spack.sh @@ -47,12 +47,17 @@ ddf1a1a74ba2ee99377edc2100e0478c1ddd3653 2fc056e27cb6e362b56946907c48feda61766319 fc7125fdf3f594683d264e48160ca86717c2109d b98e5886e5c9b5e005b54fa727704da384d81f21 +e992e1efbdfd6072891e402371cac4741a3047a9 +8d2a6d6744cfe9663ca0aa3610bfd96c45a62333 +6d51d94dab4f780b39c614a9ecb10f5940bdae4b +b90ac6441cfdf6425cb59551e7b0538899b69527 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ --- || true [67536058077995cab1ed23b8ca62aaf75463ae04]=var/spack/repos/builtin/packages/py-protobuf/package.py -[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py,var/spack/repos/builtin/packages/strace/package.py +[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/celeritas/package.py,var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py,var/spack/repos/builtin/packages/strace/package.py +[8d2a6d6744cfe9663ca0aa3610bfd96c45a62333]=var/spack/repos/builtin/packages/celeritas/package.py --- ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] @@ -94,4 +99,8 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## ddf1a1a74ba2ee99377edc2100e0478c1ddd3653: py-urllib3: add v1.26.20 ## 2fc056e27cb6e362b56946907c48feda61766319: py-flask-compress: add v1.14 ## fc7125fdf3f594683d264e48160ca86717c2109d: py-fsspec-xrootd: new package -## b98e5886e5c9b5e005b54fa727704da384d81f21: py-pyppeteer: new package \ No newline at end of file +## b98e5886e5c9b5e005b54fa727704da384d81f21: py-pyppeteer: new package +## e992e1efbdfd6072891e402371cac4741a3047a9: celeritas: new version 0.4.4 +## 8d2a6d6744cfe9663ca0aa3610bfd96c45a62333: sethrj: update maintained package language dependencies +## 6d51d94dab4f780b39c614a9ecb10f5940bdae4b: celeritas: add v0.5.0 +## b90ac6441cfdf6425cb59551e7b0538899b69527: celeritas: remove ancient versions and add CUDA package dependency \ No newline at end of file -- GitLab