Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions spack-environment/cuda/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +21,6 @@ spack:
- dawncut
- dd4hep
- dpmjet
- east
- edm4hep
- eic-smear
- eigen
Expand All @@ -33,7 +30,7 @@ spack:
- fmt
- gaudi
- gdb
- geant4
- geant4 +vecgeom
- graphviz
- hepmc3
- heppdt
Expand Down Expand Up @@ -96,5 +93,6 @@ spack:
- spdlog
- stow
- valgrind
- vecgeom +cuda cuda_arch=75
- xrootd
- xeyes
10 changes: 6 additions & 4 deletions spack-environment/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,9 @@ packages:
geant4:
require:
- '@11.3.2.east'
- cxxstd=20 -vecgeom +threads -timemory -vtk
- any_of: [+opengl +qt +x11, -opengl -qt -x11]
- cxxstd=20 +threads -vtk
- one_of: [+opengl +qt +x11, -opengl -qt -x11]
- one_of: [-vecgeom, +vecgeom]
gettext:
require:
- +libxml2
Expand Down Expand Up @@ -298,7 +299,7 @@ packages:
require:
- '@1.4.6'
- +http
- any_of: [+geocad, -geocad]
- one_of: [+geocad, -geocad]
ollama:
require:
- '@0.13.1:'
Expand Down Expand Up @@ -532,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'
Expand Down Expand Up @@ -577,6 +578,7 @@ packages:
vecgeom:
require:
- '@1.2.11'
- cxxstd=20 +gdml ~geant4 +root
Copy link

Copilot AI Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vecgeom requirement includes ~geant4 which disables geant4 integration in vecgeom. However, this PR adds geant4 +vecgeom to make geant4 use vecgeom. These settings may conflict depending on how Spack resolves the dependency. Consider whether the ~geant4 variant on vecgeom should be changed to allow geant4 integration, or verify that this configuration is intentional and will work as expected with geant4's new +vecgeom variant.

Suggested change
- cxxstd=20 +gdml ~geant4 +root
- cxxstd=20 +gdml +root

Copilot uses AI. Check for mistakes.
xerces-c:
require:
- cxxstd=20
Expand Down
Loading