Changes for the new nightlies

.cherry-pick

@@ -1,15 +1,22 @@
 git remote add jmcarcell https://github.com/jmcarcell/spack || true
 git fetch jmcarcell -q
 
+# Hardcode CMAKE_INSTALL_LIBDIR to lib. This is needed for AlmaLinux 9 where
+# CMAKE_INSTALL_LIBDIR gets chosen as lib64 and this causes problems in some
+# packages that expect lib. Since spack installs each package to its own prefix
+# we don't need to worry about multilib environments
+git cherry-pick 42c070632bcb0f8333bc029e17a53646d9589d7e -X theirs --no-commit
+
+# Because the patch above and py-onnx being a python package, it will try to find
+# protobuf in CMAKE_INSTALL_LIBDIR which is lib64 so a symlink is created here
+git cherry-pick 3ec184fad8582cc501f55e0ea0b0f6b3fb9b70bf -X theirs --no-commit
+
 # add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | patch -p1
 
 # add vdt for CPATH, needed for podio+rntuple
 git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit
 
-# podio: add rdatasource, remove!
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46078.diff | patch -p1
-
 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/42844.diff | patch -p1
 
@@ -22,48 +29,29 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/42844.diff
 # Both geant4 changes in a single commit
 git cherry-pick c8191268c3ea4aca6e870ad40d695e92f94d0e47 -X theirs --no-commit
 
-# sherpa v3: remove!
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45101.diff | patch -p1
-
-# gaudi: use fmt 10 for now, remove!
-# remember to fix the range before v40
-
-# py-onnx: make sure py-setuptools 64 and onwards is used for editable_mode
-git cherry-pick a8c4b3a03f0988cc201580f979980d61d3d5e417 -X theirs --no-commit
-
-# xrootd: don't download from SLAC until the certificate issue is solved
-git cherry-pick afcd8b32383b1425062b25126890e12338d70e36 -X theirs --no-commit
-
-# root: Add version 6.32.04, remove!
-git cherry-pick b6a5e4f8eb6276a68d7d42cf14812397cf6d2743 -X theirs --no-commit
-
-# acts: Add versions 36.0.0 and 36.1.0, remove when https://github.com/spack/spack/pull/45851 is merged
-git cherry-pick 5bab73925c6da457f2fdf5c7d8fbeb14ff6e2986 -X theirs --no-commit
-
-# sleef: Add the -fPIC flag
-git cherry-pick f4b2c42028405591cf44a2c5910840e894144f67 -X theirs --no-commit
-
-# pthreadpool: Add the -fPIC flag
-git cherry-pick 2be66bfa5748544b3b85e5023c60c5bc020a7135 -X theirs --no-commit
-
-# poppler: fix URL, remove!
-git cherry-pick 8becc0ca3c86f1fa26593909da03effbc665c31c -X theirs --no-commit
+# zziplib: add 0.13.78, remove!
+git cherry-pick db5538f5f12de8d1599ef4339e2dd1756d1230ad -X theirs --no-commit
 
-# texlive: clean up recipe, remove when https://github.com/spack/spack/pull/45863 is merged
-# git cherry-pick 4ab7f72041d49f947230df2aa6426b6e39069a3a -X theirs --no-commit
+# pybind11: fix pkgconfig, remove when https://github.com/spack/spack/pull/46298 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46298.diff | patch -p1
 
-# whizard: add fix for hepmc3 3.3.10 or above, remove when https://github.com/spack/spack/pull/45862 is merged
-curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45862.diff | patch -p1
+# gaudi: add patches, remove when https://github.com/spack/spack/pull/46365 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46365.diff | patch -p1
 
-# dd4hep: add patch not to install plugins at CMAKE_INSTALL_LIBDIR
-git cherry-pick 21c9d43cdbdb1de3164c1754696d74cb7fb448d9 -X theirs --no-commit
+# py-awkward and py-awkward-cpp: fixes, remove!
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46372.diff | patch -p1
 
+# py-onnx: add fixes for GCC 14, remove!
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46390.diff | patch -p1
 
+# texlive: add new versions, remove!
+git cherry-pick 5398b1be15245e1be480c5aa4706f57795208505 -X theirs --no-commit
 
-if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then
+# texlive: fix mtxrun, remove when https://github.com/spack/spack/pull/46465 is merged
+curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff | patch -p1
 
-  # patch to rename libz so texlive can be built
-  git cherry-pick f8c6f240ba9b99218eb72bfadce9f99952fec1de -X theirs --no-commit
+# py-onnx: add a patch for the standard, remove after 1.15.0
+git add .
+git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit
 
-fi
 

.latest-commit

@@ -1 +1 @@
-f596a8cdad601bb226723c551624d86abe3a6237
+6cb16c39ab85fbc211e50be804fa7a15f24ccebc

environments/key4hep-common/packages.yaml

@@ -43,7 +43,7 @@ packages:
     require: backend=qt5agg
   # Requested by Thomas Madlener for DESY, without CUDA and before v2
   py-torch:
-    require: ~cuda
+    require: ~cuda+custom-protobuf
   xrootd:
     require: +krb5 cxxstd=20
 
@@ -91,7 +91,7 @@ packages:
 
   # The version seems to be necessary, otherwise it defaults to an older version
   root:
-    require: '@6.32: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia8+python+r+roofit+root7+rpath~shadow+sqlite+ssl+tbb+threads+tmva+tmva-cpu+unuran+vc+vdt+x+xml+xrootd cxxstd=20'
+    require: '@6.32: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia8+python+r+roofit+root7+rpath~shadow+spectrum+sqlite+ssl+tbb+threads+tmva+tmva-cpu+unuran+vc+vdt+x+xml+xrootd cxxstd=20'
   py-tensorflow:
     require: ~cuda~nccl
   k4simdelphes:
@@ -120,11 +120,8 @@ packages:
   sio:
     variants: cxxstd=20
 
-  # onnx and py-onnx should have the same versions
-  # And all should be consistent based on this table:
+  # The versions of py-onnx and py-onnxruntime should be consistent based on this table
   # https://onnxruntime.ai/docs/reference/compatibility.html#onnx-opset-support
-  onnx:
-    require: '@1.15.0'
   py-onnx:
     require: '@1.15.0'
   py-onnxruntime:

environments/key4hep-nightly-dbg/spack.yaml

@@ -7,6 +7,7 @@ spack:
   - ./packages.yaml
   - ../key4hep-common/packages.yaml
   - ../key4hep-common/compilers.yaml
+  - ../key4hep-nightly-share/packages.yaml
   repos:
   - ../..
   specs:

environments/key4hep-nightly-opt/spack.yaml

@@ -7,6 +7,7 @@ spack:
   - ./packages.yaml
   - ../key4hep-common/packages.yaml
   - ../key4hep-common/compilers.yaml
+  - ../key4hep-nightly-share/packages.yaml
   repos:
   - ../..
   specs:

environments/key4hep-nightly-share/config.yaml

@@ -0,0 +1,5 @@
+config:
+  install_tree:
+    projections:
+      all: "{name}/{version}"
+    root: /cvmfs/sw-nightlies.hsf.org/key4hep/share

environments/key4hep-nightly-share/packages.yaml

@@ -0,0 +1,56 @@
+packages:
+  g4ndl:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4ndl/4.7.1
+    buildable: False
+  g4emlow:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4emlow/8.5
+    buildable: False
+  g4photonevaporation:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4photonevaporation/5.7
+    buildable: False
+  g4radioactivedecay:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4radioactivedecay/5.6
+    buildable: False
+  g4particlexs:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4particlexs/4.0
+    buildable: False
+  g4pii:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4pii/1.3
+    buildable: False
+  g4realsurface:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4realsurface/2.2
+    buildable: False
+  g4saiddata:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4saiddata/2.0
+    buildable: False
+  g4abla:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4abla/3.3
+    buildable: False
+  g4incl:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4incl/1.2
+    buildable: False
+  g4ensdfstate:
+    externals:
+    - spec: "[email protected]"
+      prefix: /cvmfs/sw-nightlies.hsf.org/key4hep/share/g4ensdfstate/2.3
+    buildable: False

environments/key4hep-nightly-share/spack.yaml

@@ -0,0 +1,12 @@
+spack:
+  view: false
+  include:
+  - ./config.yaml
+  # Put packages before the common packages so that it doesn't get overwritten
+  # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528
+  - ../key4hep-common/packages.yaml
+  - ../key4hep-common/compilers.yaml
+  repos:
+  - ../..
+  specs:
+  - [email protected]

packages/clicperformance/package.py

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
-from spack.pkg.k4.key4hep_stack import k4_setup_env_for_framework_tests
 
 
 class Clicperformance(CMakePackage, Ilcsoftpackage):
@@ -70,13 +69,10 @@ def setup_run_environment(self, env):
         env.prepend_path("MARLIN_DLL", self.prefix.lib + "/libClicPerformance.so")
 
     def setup_build_environment(self, env):
-        # k4_setup_env_for_framework_tests(self.spec, env)
         env.prepend_path("ROOT_INCLUDE_PATH", self.spec["lcfiplus"].prefix.include)
         env.prepend_path("LD_LIBRARY_PATH", self.spec["dd4hep"].prefix.lib)
-        env.prepend_path("LD_LIBRARY_PATH", self.spec["dd4hep"].prefix.lib64)
 
     def cmake_args(self):
-        # C++ Standard
         return [f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}"]
 
     # tests need installation, so skip here ...

packages/dual-readout/package.py

@@ -17,6 +17,11 @@ class DualReadout(CMakePackage, Key4hepPackage):
     maintainers = ["vvolkl", "SanghyunKo"]
 
     version("master", branch="master")
+
+    version(
+        "0.1.4",
+        sha256="fca86bd8e2ab922957babbfcaeb902fda09205ddd23cb1f85b7659b79b205d53",
+    )
     version(
         "0.1.3",
         sha256="befaf3b0a66e14f4c4d6a2f09e6884f8c5e1e9f3fbe7bde47212e3aa79a5cbef",
@@ -29,22 +34,22 @@ class DualReadout(CMakePackage, Key4hepPackage):
         "0.1.1",
         sha256="8d856b47b0b834ac0a53920434da210639c55a1ef375f7e0341731ad14a25318",
     )
-    version(
-        "0.1.0",
-        sha256="f4b9387ccae0d4d364b1340eb116c5b4b93a6bc74c896fcd221619ddec31d5f6",
+
+    patch(
+        "https://patch-diff.githubusercontent.com/raw/HEP-FCC/dual-readout/pull/40.patch?full_index=1",
+        sha256="9ff1cad595e631336f49c2430e147f29ddedb5e3eee650c36f9147f420f62423",
+        when="@0.1.3 %gcc@14",
     )
 
-    # backport fix for build error with clang
     patch(
-        "https://github.com/HEP-FCC/dual-readout/commit/31c01d2f7867f6c44da63fdc7db69e30c4bb34bb.diff",
-        when="@0.1.0",
-        sha256="0fc3b0e77d52e1dec72a0dae73f15689720b28298deea1992301e8c41c80271c",
+        "https://patch-diff.githubusercontent.com/raw/HEP-FCC/dual-readout/pull/42.patch?full_index=1",
+        sha256="8dbe67f968eb81a07820b4e6758ace0d5170a35ccfd896440187160988bc6c79",
+        when="@0.1.4",
     )
 
     depends_on("dd4hep")
     depends_on("edm4hep")
-    depends_on("[email protected]:")
-    depends_on("[email protected]:", when="@0.1.1:")
+    depends_on("podio")
     depends_on("fastjet")
     depends_on("root")
     depends_on("pythia8")
@@ -63,7 +68,6 @@ class DualReadout(CMakePackage, Key4hepPackage):
 
     def cmake_args(self):
         args = []
-        # C++ Standard
         args.append(
             f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}"
         )