From 00b7a40a5d035de9dc3c06f2f425010b69f2aceb 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 8ef8197b..b0b89815 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -185,8 +185,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 @@ -577,6 +578,7 @@ packages: vecgeom: require: - '@1.2.11' + - cxxstd=20 +gdml +geant4 +root xerces-c: require: - cxxstd=20 From aaf4eba69df4378f768dfa2783dbc1653e32ecc4 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 b0b89815..6d2caf72 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -186,8 +186,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 @@ -299,7 +299,7 @@ packages: require: - '@1.4.6' - +http - - any_of: [+geocad, -geocad] + - one_of: [+geocad, -geocad] ollama: require: - '@0.13.1:' @@ -533,7 +533,7 @@ packages: require: - '@6.38.00' - 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 aa5a16a49ce66527d818e00b6c8fc1d99eaeddf2 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 0a5e16a4..3da45223 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -33,7 +33,7 @@ spack: - fmt - gaudi - gdb - - geant4 + - geant4 +vecgeom - graphviz - hepmc3 - heppdt From 8751a9644e067f1671631a759756f0e03300f970 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 3da45223..883fdc1e 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -96,5 +96,6 @@ spack: - spdlog - stow - valgrind + - vecgeom +cuda cuda_arch=75 - xrootd - xeyes From 1ef1af6d655cb7bf21f65a87e727ec2d4a8e781c 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 6d2caf72..e3804c6b 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -187,7 +187,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 df18ab71017a1ec6651762046c7d4d9f75cb6e45 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 e3804c6b..6c27ed68 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -578,7 +578,7 @@ packages: vecgeom: require: - '@1.2.11' - - cxxstd=20 +gdml +geant4 +root + - cxxstd=20 +gdml ~geant4 +root xerces-c: require: - cxxstd=20 From 4f3b0d9a3fa66fcb374b4d04aa378ad748941282 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 883fdc1e..b81617c8 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -4,8 +4,6 @@ spack: - ../packages.yaml - ../packages_root_with_opengl.yaml - ../view.yaml - concretizer: - unify: when_possible # multiple epic versions specs: - acts +cuda cuda_arch=75 - actsvg From bf1ae006f655670cb6bf8b8b94ffa07322bfd620 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 b81617c8..b5330d8b 100644 --- a/spack-environment/cuda/spack.yaml +++ b/spack-environment/cuda/spack.yaml @@ -21,7 +21,6 @@ spack: - dawncut - dd4hep - dpmjet - - east - edm4hep - eic-smear - eigen