Add missing tags and a cherry pick (#659)

key4hep · Oct 8, 2024 · 3b5efe5 · 3b5efe5
1 parent 0d58258
commit 3b5efe5
Show file tree

Hide file tree

Showing 24 changed files with 363 additions and 290 deletions.
diff --git a/.cherry-pick b/.cherry-pick
@@ -11,7 +11,7 @@ git cherry-pick 42c070632bcb0f8333bc029e17a53646d9589d7e -X theirs --no-commit
 # 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
+# add a recent version of madgraph, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | patch -p1
 
 # add vdt for CPATH, needed for podio+rntuple
@@ -32,29 +32,42 @@ git cherry-pick c8191268c3ea4aca6e870ad40d695e92f94d0e47 -X theirs --no-commit
 # zziplib: add 0.13.78, remove!
 git cherry-pick db5538f5f12de8d1599ef4339e2dd1756d1230ad -X theirs --no-commit
 
-# pybind11: fix pkgconfig, remove when https://github.com/spack/spack/pull/46298 is merged
+# pybind11: fix pkgconfig, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46298.diff | patch -p1
 
-# gaudi: add patches, remove when https://github.com/spack/spack/pull/46365 is merged
+# gaudi: add patches, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46365.diff | patch -p1
 
 # 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
+# curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46390.diff | patch -p1
+git cherry-pick 096ab11961995ac8d69f7b177cbcadf618d3068e -X theirs --no-commit
 
 # texlive: add new versions, remove!
 git cherry-pick 5398b1be15245e1be480c5aa4706f57795208505 -X theirs --no-commit
 
-# texlive: fix mtxrun, remove when https://github.com/spack/spack/pull/46465 is merged
+# texlive: fix mtxrun, remove!
 curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff | patch -p1
 
 # py-onnx: add a patch for the standard, remove after 1.15.0
 git add .
 git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit
 
-# Versions for the release, in order DD4hep and podio&edm4hep
+# py-cython: add version 3.0.11, remove when https://github.com/spack/spack/pull/46772 is merged
+git cherry-pick 072d308c0b4b53c0d0528ee3a7e59de110133968 -X theirs --no-commit
+# py-lxml: add version 5.3.0, remove when https://github.com/spack/spack/pull/46771 is merged
+git cherry-pick 94ef87d013b3ea9627c1aa850b8929dbe217bf20 -X theirs --no-commit
+
+# madgraph5amc: add v3.5.6, remove!
+git cherry-pick 5777576e37ee28d674e2520d3f10b3f651a7680e -X theirs --no-commit
+
+# py-gevent: add a patch for cython 3.0.10 and 3.0.11, remove!
+git cherry-pick 06f21ae4e2499bccaa6c52359bafbb93c161944b -X theirs --no-commit
+
+# Versions for the release, in order DD4hep and podio&edm4hep and LCIO
 git cherry-pick 43d1cdb0bd4780bff369dafa681a8a7939313784 -X theirs --no-commit
 git cherry-pick 5d9c534018593fdef5db1028c60026d26bf4d65b -X theirs --no-commit
 git cherry-pick be8112e1ff9dea12296bfafb341cc5953e72c415 -X theirs --no-commit
+git cherry-pick 1c6b6d0a0819409b75d7a59a90c3daf24fe80fee -X theirs --no-commit
diff --git a/.github/workflows/concretize.yaml b/.github/workflows/concretize.yaml
@@ -49,7 +49,7 @@ jobs:
             source /key4hep-spack/.cherry-pick
 
             if [ "${{ matrix.build_type }}" = "release" ]; then
-                env=key4hep-release
+                env=key4hep-release-opt
             elif [ "${{ matrix.build_type }}" = "nightly" ]; then
                 env=key4hep-nightly-opt
                 pip3 install pyyaml

diff --git a/environments/key4hep-common-dbg/packages.yaml b/environments/key4hep-common-dbg/packages.yaml
@@ -0,0 +1,126 @@
+packages:
+  acts:
+    require: build_type=Debug
+  aidatt:
+    require: build_type=Debug
+  ced:
+    require: build_type=Debug
+  cedviewer:
+    require: build_type=Debug
+  cepcsw:
+    require: build_type=Debug
+  clicperformance:
+    require: build_type=Debug
+  conformaltracking:
+    require: build_type=Debug
+  dd4hep:
+    require: build_type=Debug
+  ddfastshowerml:
+    require: build_type=Debug
+  ddkaltest:
+    require: build_type=Debug
+  ddmarlinpandora:
+    require: build_type=Debug
+  delphes:
+    require: build_type=Debug
+  dual-readout:
+    require: build_type=Debug
+  edm4hep:
+    require: build_type=Debug cxxstd=20
+  fcalclusterer:
+    require: build_type=Debug
+  fccanalyses:
+    require: build_type=Debug
+  fccdetectors:
+    require: build_type=Debug
+  fccsw:
+    require: build_type=Debug
+  forwardtracking:
+    require: build_type=Debug
+  gaudi:
+    require: build_type=Debug
+  gear:
+    require: build_type=Debug
+  ilcutil:
+    require: build_type=Debug cxxstd=20
+  ildperformance:
+    require: build_type=Debug
+  key4hep-stack:
+    require: build_type=Debug
+  k4clue:
+    require: build_type=Debug
+  k4edm4hep2lcioconv:
+    require: build_type=Debug
+  k4fwcore:
+    require: build_type=Debug
+  k4gaudipandora:
+    require: build_type=Debug
+  k4gen:
+    require: build_type=Debug
+  k4generatorsconfig:
+    require: build_type=Debug
+  k4geo:
+    require: build_type=Debug
+  k4marlinwrapper:
+    require: build_type=Debug
+  k4projecttemplate:
+    require: build_type=Debug
+  k4reccalorimeter:
+    require: build_type=Debug
+  k4reco:
+    require: build_type=Debug
+  k4rectracker:
+    require: build_type=Debug
+  k4simdelphes:
+    require: build_type=Debug
+  k4simgeant4:
+    require: build_type=Debug
+  kaltest:
+    require: build_type=Debug
+  kitrack:
+    require: build_type=Debug
+  kitrackmarlin:
+    require: build_type=Debug
+  lccd:
+    require: build_type=Debug
+  lcfiplus:
+    require: build_type=Debug
+  lcio:
+    require: build_type=Debug cxxstd=20
+  lctuple:
+    require: build_type=Debug
+  marlin:
+    require: build_type=Debug
+  marlindd4hep:
+    require: build_type=Debug
+  marlinfastjet:
+    require: build_type=Debug
+  marlinkinfit:
+    require: build_type=Debug
+  marlinkinfitprocessors:
+    require: build_type=Debug
+  marlinmlflavortagging:
+    require: build_type=Debug
+  marlinreco:
+    require: build_type=Debug
+  marlintrk:
+    require: build_type=Debug
+  marlintrkprocessors:
+    require: build_type=Debug
+  marlinutil:
+    require: build_type=Debug
+  opendatadetector:
+    require: build_type=Debug
+  overlay:
+    require: build_type=Debug
+  pandoraanalysis:
+    require: build_type=Debug
+  physsim:
+    require: build_type=Debug
+  podio:
+    require: build_type=Debug
+  raida:
+    require: build_type=Debug
+  sio:
+    require: build_type=Debug cxxstd=20
+
diff --git a/environments/key4hep-common-opt/packages.yaml b/environments/key4hep-common-opt/packages.yaml
@@ -0,0 +1,126 @@
+packages:
+  acts:
+    require: build_type=Release
+  aidatt:
+    require: build_type=Release
+  ced:
+    require: build_type=Release
+  cedviewer:
+    require: build_type=Release
+  cepcsw:
+    require: build_type=Release
+  clicperformance:
+    require: build_type=Release
+  conformaltracking:
+    require: build_type=Release
+  dd4hep:
+    require: build_type=Release
+  ddfastshowerml:
+    require: build_type=Release
+  ddkaltest:
+    require: build_type=Release
+  ddmarlinpandora:
+    require: build_type=Release
+  delphes:
+    require: build_type=Release
+  dual-readout:
+    require: build_type=Release
+  edm4hep:
+    require: build_type=Release cxxstd=20
+  fcalclusterer:
+    require: build_type=Release
+  fccanalyses:
+    require: build_type=Release
+  fccdetectors:
+    require: build_type=Release
+  fccsw:
+    require: build_type=Release
+  forwardtracking:
+    require: build_type=Release
+  gaudi:
+    require: build_type=Release
+  gear:
+    require: build_type=Release
+  ilcutil:
+    require: build_type=Release cxxstd=20
+  ildperformance:
+    require: build_type=Release
+  key4hep-stack:
+    require: build_type=Release
+  k4clue:
+    require: build_type=Release
+  k4edm4hep2lcioconv:
+    require: build_type=Release
+  k4fwcore:
+    require: build_type=Release
+  k4gaudipandora:
+    require: build_type=Release
+  k4gen:
+    require: build_type=Release
+  k4generatorsconfig:
+    require: build_type=Release
+  k4geo:
+    require: build_type=Release
+  k4marlinwrapper:
+    require: build_type=Release
+  k4projecttemplate:
+    require: build_type=Release
+  k4reccalorimeter:
+    require: build_type=Release
+  k4reco:
+    require: build_type=Release
+  k4rectracker:
+    require: build_type=Release
+  k4simdelphes:
+    require: build_type=Release
+  k4simgeant4:
+    require: build_type=Release
+  kaltest:
+    require: build_type=Release
+  kitrack:
+    require: build_type=Release
+  kitrackmarlin:
+    require: build_type=Release
+  lccd:
+    require: build_type=Release
+  lcfiplus:
+    require: build_type=Release
+  lcio:
+    require: build_type=Release cxxstd=20
+  lctuple:
+    require: build_type=Release
+  marlin:
+    require: build_type=Release
+  marlindd4hep:
+    require: build_type=Release
+  marlinfastjet:
+    require: build_type=Release
+  marlinkinfit:
+    require: build_type=Release
+  marlinkinfitprocessors:
+    require: build_type=Release
+  marlinmlflavortagging:
+    require: build_type=Release
+  marlinreco:
+    require: build_type=Release
+  marlintrk:
+    require: build_type=Release
+  marlintrkprocessors:
+    require: build_type=Release
+  marlinutil:
+    require: build_type=Release
+  opendatadetector:
+    require: build_type=Release
+  overlay:
+    require: build_type=Release
+  pandoraanalysis:
+    require: build_type=Release
+  physsim:
+    require: build_type=Release
+  podio:
+    require: build_type=Release
+  raida:
+    require: build_type=Release
+  sio:
+    require: build_type=Release cxxstd=20
+