.gitlab-ci.yml

@@ -310,8 +310,8 @@ eic:
         BUILD_IMAGE: eic_
         PLATFORM: linux/amd64
         ENV:
-#        - dbg
-#        - prod
+        - dbg
+        - prod
         - xl
 #      - BUILD_TYPE:
 #        - default

spack-environment/dbg/spack.yaml

@@ -2,6 +2,8 @@ spack:
   include:
   - ../concretizer.yaml
   - ../packages.yaml
+  concretizer:
+    unify: true
   config:
     install_missing_compilers: false
   specs:

spack-environment/packages.yaml

@@ -18,8 +18,9 @@ packages:
     - any_of: [build_type=Release, '@:']
   acts:
     require:
-    - '@31.2.0'
-    - cxxstd=20 +binaries +dd4hep +edm4hep +examples +fatras +geant4 +identification +json +onnx +podio +python +tgeo
+    - '%clang'
+    - '@33.1.0'
+    - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +identification +json +onnx +podio +python +tgeo
   actsvg:
     require:
     - '@0.4.26'
@@ -77,8 +78,8 @@ packages:
   dd4hep:
     require:
     - '@1.29'
-    - +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
-    - any_of: [+ddeve, -ddeve]
+    - +ddg4 +ddcad +hepmc3 +xercesc
+    - any_of: [+ddeve +utilityapps, -ddeve -utilityapps]
   dpmjet:
     require:
     - '@19.3.5'
@@ -103,6 +104,7 @@ packages:
     - '@1.1.12'
   eicrecon:
     require:
+    - '%clang'
     - '@1.16.1' # EICRECON_VERSION
   eigen:
     require:
@@ -146,7 +148,7 @@ packages:
   geant4:
     require:
     - '@11.2.2.east'
-    - cxxstd=20 -vecgeom +threads -vtk
+    - cxxstd=20 -vecgeom +threads -timemory -vtk
     - any_of: [+opengl +qt +x11, -opengl -qt -x11]
   gettext: 
     require:

spack-environment/prod/spack.yaml

@@ -2,6 +2,8 @@ spack:
   include:
   - ../concretizer.yaml
   - ../packages.yaml
+  concretizer:
+    unify: true
   config:
     install_missing_compilers: false
   specs:
@@ -25,5 +27,5 @@ spack:
   - py-jinja2
   - py-jinja2-cli
   - py-pip
-  - root -opengl
-  - xrootd
+  - root -opengl ~webgui ~x
+  - xrootd
\ No newline at end of file

spack.sh

@@ -28,6 +28,7 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67
 3b59817ea7be35f4222dc88313734f7a30733ad7
 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf
 a66586d749197841bd74e289802126f2359287a8
+7503a417731910d918a7863d1862f62c9b76429d
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -55,3 +56,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## 3b59817ea7be35f4222dc88313734f7a30733ad7: deal with TimeoutError from ssl.py
 ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand
 ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort
+## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1