Merge branch 'main' into dev/20241213-py-pyhepmc

.github/workflows/concretize-current-nightly.yaml

@@ -67,14 +67,26 @@ jobs:
             elif [ "${{ matrix.build_type }}" = "nightly" ]; then
                 env=key4hep-nightly-opt
                 pip3 install pyyaml
-                python3 /key4hep-spack/scripts/fetch_nightly_versions.py --path /key4hep-spack/environments/key4hep-common/packages.yaml --extra-path /key4hep-spack/environments/key4hep-nightly-opt/packages.yaml ""
+                python3 /key4hep-spack/scripts/fetch_nightly_versions.py --path /key4hep-spack/environments/key4hep-common/packages.yaml --extra-path /key4hep-spack/environments/key4hep-common-opt/packages.yaml ""
             else
                 echo "Unknown build type"
                 exit 1
             fi
             cd /key4hep-spack/environments/${env}
             spack env activate .
             spack config add "upstreams:nightly-from-scratch:install_tree: $rel"
+
+            echo "========="
+            echo "spack.yaml"
+            cat spack.yaml
+            echo "========="
+            echo "packages.yaml"
+            cat packages.yaml
+            echo "========="
+            echo "key4hep-common/packages.yaml"
+            cat /key4hep-spack/environments/key4hep-common/packages.yaml
+            echo "========="
+
             spack concretize >> conc.txt
             cat conc.txt
             echo "========================================="

.github/workflows/concretize.yaml

@@ -53,12 +53,24 @@ jobs:
             elif [ "${{ matrix.build_type }}" = "nightly" ]; then
                 env=key4hep-nightly-opt
                 pip3 install pyyaml
-                python3 /key4hep-spack/scripts/fetch_nightly_versions.py --path /key4hep-spack/environments/key4hep-common/packages.yaml --extra-path /key4hep-spack/environments/key4hep-nightly-opt/packages.yaml ""
+                python3 /key4hep-spack/scripts/fetch_nightly_versions.py --path /key4hep-spack/environments/key4hep-common/packages.yaml --extra-path /key4hep-spack/environments/key4hep-common-opt/packages.yaml ""
             else
                 echo "Unknown build type"
                 exit 1
             fi
             cd /key4hep-spack/environments/${env}
+
+            echo "========="
+            echo "spack.yaml"
+            cat spack.yaml
+            echo "========="
+            echo "packages.yaml"
+            cat packages.yaml
+            echo "========="
+            echo "key4hep-common/packages.yaml"
+            cat /key4hep-spack/environments/key4hep-common/packages.yaml
+            echo "========="
+
             spack env activate .
             spack concretize
 

environments/key4hep-common/packages.yaml

@@ -12,6 +12,8 @@ packages:
     buildable: true
   curl:
     require: +gssapi
+  ddmarlinpandora:
+    require: +monitoring
   dd4hep:
     require: +edm4hep+lcio+xercesc+hepmc3
   gaudi:
@@ -26,8 +28,12 @@ packages:
   hepmc3:
     require: +python+rootio
   # https://github.com/key4hep/key4hep-spack/issues/517
+  larcontent:
+    require: +monitoring
   lccd:
     require: +conddbmysql
+  lccontent:
+    require: +monitoring
   llvm:
     variants: ~flang~lldb~lld~lua~mlir~internal_unwind~polly~libomptarget~libomptarget_debug~gold~split_dwarf~llvm_dylib~link_llvm_dylib~omp_tsan~omp_as_runtime~code_signing~python~version_suffix~shlib_symbol_version~z3~zstd compiler-rt="none" libcxx="none" targets="x86"
   marlin:

packages/aidatt/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/babayaga/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 import os
 
 

packages/bhlumi/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 import os
 
 

packages/ced/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/cedviewer/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/cepcsw/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/cldconfig/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class Cldconfig(CMakePackage):

packages/clicperformance/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/clupatra/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/conddbmysql/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/conformaltracking/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/ddfastshowerml/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/ddkaltest/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/ddmarlinpandora/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 
@@ -42,10 +43,15 @@ class Ddmarlinpandora(CMakePackage, Ilcsoftpackage):
     depends_on("larcontent")
     depends_on("dd4hep")
     depends_on("marlintrk")
+    depends_on("pandoramonitoring", when="+monitoring")
+
+    variant("monitoring", default=False, description="Enable Pandora Monitoring")
 
     def setup_run_environment(self, env):
         env.prepend_path("MARLIN_DLL", self.prefix.lib + "/libDDMarlinPandora.so")
 
     def cmake_args(self):
-        # C++ Standard
-        return [f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}"]
+        return [
+            f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}",
+            self.define_from_variant("PANDORA_MONITORING", "monitoring"),
+        ]

packages/dual-readout/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/emela/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 
 class Emela(CMakePackage):
     """Library that implements the evolution in pure QED of the unpolarised electron parton distribution functions (PDFs) up to next-to-leading logarithmic (NLL) approximation"""

packages/fcalclusterer/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 from spack.pkg.k4.key4hep_stack import k4_setup_env_for_framework_tests
 

packages/fcc-config/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
+from spack.package import *
 
 
 class FccConfig(CMakePackage):

packages/fccanalyses/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/fccdetectors/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/fccsw/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/forwardtracking/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/garlic/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/gear/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/generalbrokenlines/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 
 class Generalbrokenlines(CMakePackage):
     """Track refitting with broken lines in 3D."""

packages/guinea-pig/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 
 class GuineaPig(CMakePackage):
     """Generator of Unwanted Interactions for Numerical Experiment

packages/ilcsoft/package.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 from spack.pkg.k4.key4hep_stack import install_setup_script
 
@@ -79,6 +80,7 @@ class Ilcsoft(BundlePackage, Key4hepPackage):
     depends_on("marlinmlflavortagging")
     depends_on("overlay")
     depends_on("pandoraanalysis")
+    depends_on("pandoramonitoring")
     depends_on("pandorapfa")
     depends_on("physsim")
     depends_on("raida")

packages/ilcutil/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/ildperformance/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/k4actstracking/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/k4clue/package.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/k4edm4hep2lcioconv/package.py

@@ -3,8 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack import *
-
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/k4fwcore/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Ilcsoftpackage
 
 

packages/k4gaudipandora/package.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/k4gen/package.py

@@ -1,3 +1,4 @@
+from spack.package import *
 from spack.pkg.k4.key4hep_stack import Key4hepPackage
 
 

packages/k4generatorsconfig/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 
 class K4generatorsconfig(CMakePackage):
     """A python based module for the automatic generation of inputfiles for Monte-Carlo(MC) generators."""

packages/k4geo/package.py

@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
+
 
 class K4geo(CMakePackage):
     """DD4hep geometry models for future colliders."""