From 238a948b6c29a689ead73d86a0a0b81e3fa94a1d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sun, 24 Nov 2024 21:30:26 +0000 Subject: [PATCH 1/4] feat: celeritas: require +root --- spack-environment/packages.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 267190fd9..22778d4a2 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -49,6 +49,10 @@ packages: require: - '@3.4.0' - -ipo + celeritas: + require: + - '@0.5.0' + - +geant4 +hepmc3 +root +vecgeom cernlib: require: - '@2022.11.08.0-free' -- GitLab From 4cd2d5fd123fb9be1d4b89d8aff72e76abf16f53 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Thu, 28 Nov 2024 22:44:37 +0000 Subject: [PATCH 2/4] fix: celeritas: require: one_of: [~cuda +root, +cuda ~root] --- spack-environment/packages.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 22778d4a2..59f66227f 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -52,7 +52,8 @@ packages: celeritas: require: - '@0.5.0' - - +geant4 +hepmc3 +root +vecgeom + - +geant4 +hepmc3 +vecgeom + - one_of: [~cuda +root, +cuda ~root] cernlib: require: - '@2022.11.08.0-free' -- GitLab From de34e89dbc7aca42bf44de2c20ee76654df78463 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Fri, 29 Nov 2024 18:57:53 +0000 Subject: [PATCH 3/4] fix: celeritas: +cuda ~ipo +root --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 59f66227f..5c4c7bd34 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -53,7 +53,7 @@ packages: require: - '@0.5.0' - +geant4 +hepmc3 +vecgeom - - one_of: [~cuda +root, +cuda ~root] + - one_of: [~cuda +root, +cuda ~ipo +root] cernlib: require: - '@2022.11.08.0-free' -- GitLab From 223567f25baed17c165de5526f5bad5de7bbde9a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Fri, 29 Nov 2024 20:01:39 +0000 Subject: [PATCH 4/4] fix: celeritas: +cuda +ipo ~root --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 5c4c7bd34..7645760c7 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -53,7 +53,7 @@ packages: require: - '@0.5.0' - +geant4 +hepmc3 +vecgeom - - one_of: [~cuda +root, +cuda ~ipo +root] + - one_of: [~cuda +root, +cuda +ipo ~root] cernlib: require: - '@2022.11.08.0-free' -- GitLab