From 768b4e20ab5e7753b62e5bf0bc21af157ce6745a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 24 Nov 2024 21:43:40 +0000 Subject: [PATCH 1/8] feat: geant4 +vecgeom ^vecgeom +cuda when building cuda --- spack-environment/packages.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index d893d0aa..24ee2b45 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -173,8 +173,9 @@ packages: geant4: require: - '@11.3.2.east' - - cxxstd=20 -vecgeom +threads -timemory -vtk + - cxxstd=20 +threads -vtk - any_of: [+opengl +qt +x11, -opengl -qt -x11] + - any_of: [-vecgeom, +vecgeom ^vecgeom +cuda] gettext: require: - +libxml2 @@ -535,6 +536,7 @@ packages: vecgeom: require: - '@1.2.11' + - cxxstd=20 +gdml +geant4 +root xerces-c: require: - cxxstd=20 From dd760ffcd280be1db5f0851b015327ab6d05d79a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 25 Nov 2024 00:50:24 +0000 Subject: [PATCH 2/8] fix: use one_of instead of any_of --- spack-environment/packages.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 24ee2b45..62c2452c 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -174,8 +174,8 @@ packages: require: - '@11.3.2.east' - cxxstd=20 +threads -vtk - - any_of: [+opengl +qt +x11, -opengl -qt -x11] - - any_of: [-vecgeom, +vecgeom ^vecgeom +cuda] + - one_of: [+opengl +qt +x11, -opengl -qt -x11] + - one_of: [-vecgeom, +vecgeom ^vecgeom +cuda] gettext: require: - +libxml2 @@ -281,7 +281,7 @@ packages: require: - '@1.4.6' - +http - - any_of: [+geocad, -geocad] + - one_of: [+geocad, -geocad] onnx: require: - '@1.17.0' @@ -491,7 +491,7 @@ packages: require: - '@6.36.04' - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +vc +x +xrootd +ssl - - any_of: [+opengl +webgui, -opengl -webgui] + - one_of: [+opengl +webgui, -opengl -webgui] sherpa: require: - '@3.0.1' From 3089f78c99738018795e7194cf270db6efa4b155 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 25 Nov 2024 02:36:02 +0000 Subject: [PATCH 3/8] fix: cuda: geant4 +vecgeom --- spack-environment/cuda/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml index 450b8705..a896552f 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -32,7 +32,7 @@ spack: - fmt - gaudi - gdb - - geant4 + - geant4 +vecgeom - graphviz - hepmc3 - heppdt From 65902f955b3dbd6e78d97eedd35ca66bb1ca2d49 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 26 Nov 2024 21:22:29 +0000 Subject: [PATCH 4/8] fix: cuda: vecgeom +cuda cuda_arch=75 --- spack-environment/cuda/spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml index a896552f..e1714dc0 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -93,5 +93,6 @@ spack: - spdlog - stow - valgrind + - vecgeom +cuda cuda_arch=75 - xrootd - xeyes From ca656c11927664a034c528b538c0217f73856e8d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 27 Nov 2024 03:33:17 +0000 Subject: [PATCH 5/8] fix: geant4: one_of [-vecgeom, +vecgeom] --- 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 62c2452c..76f21db8 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -175,7 +175,7 @@ packages: - '@11.3.2.east' - cxxstd=20 +threads -vtk - one_of: [+opengl +qt +x11, -opengl -qt -x11] - - one_of: [-vecgeom, +vecgeom ^vecgeom +cuda] + - one_of: [-vecgeom, +vecgeom] gettext: require: - +libxml2 From 556a598835566b5544c3fe05049f0255bc60721d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 13 Jan 2025 19:48:12 +0000 Subject: [PATCH 6/8] fix: vecgeom ~geant4 to avoid circular dependency --- 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 76f21db8..4e365dcd 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -536,7 +536,7 @@ packages: vecgeom: require: - '@1.2.11' - - cxxstd=20 +gdml +geant4 +root + - cxxstd=20 +gdml ~geant4 +root xerces-c: require: - cxxstd=20 From 4021211ac12a284a25a897291363e542ea19e355 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 7 Sep 2025 23:33:07 -0500 Subject: [PATCH 7/8] fix: cuda: concretizer: unify: true; single epic --- spack-environment/cuda/spack.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml index e1714dc0..d6c555e2 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -3,8 +3,6 @@ spack: - ../concretizer.yaml - ../packages.yaml - ../view.yaml - concretizer: - unify: when_possible # multiple epic versions specs: - acts +cuda cuda_arch=75 - actsvg From 525cbabe0f8142b89cae6ceb440edd61df2ac772 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 8 Sep 2025 07:36:37 -0500 Subject: [PATCH 8/8] fix: cuda: rm east --- spack-environment/cuda/spack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml index d6c555e2..18fd6915 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -20,7 +20,6 @@ spack: - dawncut - dd4hep +ddeve - dpmjet - - east - edm4hep - eic-smear - eigen