From 46c4edf2ca7ce47b8d28ef9f1125eb239af953f6 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:15:15 +0100 Subject: [PATCH 1/4] Add a few debugging messages for the CI (#682) * Add a few debugging messages for the CI * Fix yaml merging --------- Co-authored-by: jmcarcell --- .github/workflows/concretize-current-nightly.yaml | 14 +++++++++++++- .github/workflows/concretize.yaml | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/concretize-current-nightly.yaml b/.github/workflows/concretize-current-nightly.yaml index 14f7199d..2d4b6686 100644 --- a/.github/workflows/concretize-current-nightly.yaml +++ b/.github/workflows/concretize-current-nightly.yaml @@ -67,7 +67,7 @@ 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 @@ -75,6 +75,18 @@ jobs: 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 "=========================================" diff --git a/.github/workflows/concretize.yaml b/.github/workflows/concretize.yaml index 4c0482ee..3270b7c1 100644 --- a/.github/workflows/concretize.yaml +++ b/.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 From f670606b472db119b0420a98b3f7c3dd9a28caa5 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:21:21 +0100 Subject: [PATCH 2/4] Enable PandoraMonitoring and add variants for the packages that use it (#681) --- environments/key4hep-common/packages.yaml | 6 ++++++ packages/ddmarlinpandora/package.py | 7 +++++++ packages/ilcsoft/package.py | 1 + packages/larcontent/package.py | 10 +++++++++- packages/lccontent/package.py | 10 +++++++++- 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 16cdea1a..69587c5d 100644 --- a/environments/key4hep-common/packages.yaml +++ b/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: diff --git a/packages/ddmarlinpandora/package.py b/packages/ddmarlinpandora/package.py index 44781db6..9563ef16 100644 --- a/packages/ddmarlinpandora/package.py +++ b/packages/ddmarlinpandora/package.py @@ -42,6 +42,13 @@ 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_build_environment(self, env): + if "+monitoring" in self.spec: + env.set("PANDORA_MONITORING", "ON") def setup_run_environment(self, env): env.prepend_path("MARLIN_DLL", self.prefix.lib + "/libDDMarlinPandora.so") diff --git a/packages/ilcsoft/package.py b/packages/ilcsoft/package.py index 4c0c6310..44d51e08 100644 --- a/packages/ilcsoft/package.py +++ b/packages/ilcsoft/package.py @@ -79,6 +79,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") diff --git a/packages/larcontent/package.py b/packages/larcontent/package.py index 5a69b540..1336ab44 100644 --- a/packages/larcontent/package.py +++ b/packages/larcontent/package.py @@ -39,10 +39,18 @@ class Larcontent(CMakePackage): depends_on("pandorasdk") depends_on("eigen") + depends_on("pandoramonitoring", when="+monitoring") + + variant("monitoring", default=False, description="Enable Pandora Monitoring") + + def setup_build_environment(self, env): + if "+monitoring" in self.spec: + env.set("PANDORA_MONITORING", "ON") + def cmake_args(self): args = [ "-DCMAKE_MODULE_PATH=%s" % self.spec["pandorapfa"].prefix.cmakemodules, - "-DCMAKE_CXX_FLAGS=-std=c++17 -Wno-error", + "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-error", ] return args diff --git a/packages/lccontent/package.py b/packages/lccontent/package.py index f8f59fb0..2deee98e 100644 --- a/packages/lccontent/package.py +++ b/packages/lccontent/package.py @@ -34,9 +34,17 @@ class Lccontent(CMakePackage): depends_on("pandorapfa") depends_on("pandorasdk") + depends_on("pandoramonitoring", when="+monitoring") + + variant("monitoring", default=False, description="Enable Pandora Monitoring") + + def setup_build_environment(self, env): + if "+monitoring" in self.spec: + env.set("PANDORA_MONITORING", "ON") + def cmake_args(self): args = [ - "-DCMAKE_CXX_STANDARD=17", + "-DCMAKE_CXX_STANDARD=20", "-DCMAKE_MODULE_PATH=%s" % self.spec["pandorapfa"].prefix.cmakemodules, "-DCMAKE_CXX_FLAGS=-Wno-error", ] From 9132e595b724fa8d8df9cb8bc2455053c1edfb92 Mon Sep 17 00:00:00 2001 From: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:22:15 +0100 Subject: [PATCH 3/4] Fix setting the PANDORA_MONITORING cmake variable (#683) --- packages/ddmarlinpandora/package.py | 10 ++++------ packages/larcontent/package.py | 7 ++----- packages/lccontent/package.py | 5 +---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/ddmarlinpandora/package.py b/packages/ddmarlinpandora/package.py index 9563ef16..55d10f35 100644 --- a/packages/ddmarlinpandora/package.py +++ b/packages/ddmarlinpandora/package.py @@ -46,13 +46,11 @@ class Ddmarlinpandora(CMakePackage, Ilcsoftpackage): variant("monitoring", default=False, description="Enable Pandora Monitoring") - def setup_build_environment(self, env): - if "+monitoring" in self.spec: - env.set("PANDORA_MONITORING", "ON") - 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"), + ] diff --git a/packages/larcontent/package.py b/packages/larcontent/package.py index 1336ab44..0560795d 100644 --- a/packages/larcontent/package.py +++ b/packages/larcontent/package.py @@ -43,14 +43,11 @@ class Larcontent(CMakePackage): variant("monitoring", default=False, description="Enable Pandora Monitoring") - def setup_build_environment(self, env): - if "+monitoring" in self.spec: - env.set("PANDORA_MONITORING", "ON") - def cmake_args(self): args = [ "-DCMAKE_MODULE_PATH=%s" % self.spec["pandorapfa"].prefix.cmakemodules, - "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-error", + "-DCMAKE_CXX_FLAGS=-std=c++17 -Wno-error", + self.define_from_variant("PANDORA_MONITORING", "monitoring"), ] return args diff --git a/packages/lccontent/package.py b/packages/lccontent/package.py index 2deee98e..4d6e0fa8 100644 --- a/packages/lccontent/package.py +++ b/packages/lccontent/package.py @@ -38,15 +38,12 @@ class Lccontent(CMakePackage): variant("monitoring", default=False, description="Enable Pandora Monitoring") - def setup_build_environment(self, env): - if "+monitoring" in self.spec: - env.set("PANDORA_MONITORING", "ON") - def cmake_args(self): args = [ "-DCMAKE_CXX_STANDARD=20", "-DCMAKE_MODULE_PATH=%s" % self.spec["pandorapfa"].prefix.cmakemodules, "-DCMAKE_CXX_FLAGS=-Wno-error", + self.define_from_variant("PANDORA_MONITORING", "monitoring"), ] return args From 5e7831faf74347d1ddb1d20b8a3fbad4d6f04e10 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 9 Dec 2024 01:06:41 -0600 Subject: [PATCH 4/4] fix: ensure from spack.package import * (#685) --- packages/aidatt/package.py | 1 + packages/babayaga/package.py | 2 ++ packages/bhlumi/package.py | 2 ++ packages/ced/package.py | 2 +- packages/cedviewer/package.py | 2 +- packages/cepcsw/package.py | 1 + packages/cldconfig/package.py | 2 +- packages/clicperformance/package.py | 1 + packages/clupatra/package.py | 2 +- packages/conddbmysql/package.py | 1 + packages/conformaltracking/package.py | 2 +- packages/ddfastshowerml/package.py | 1 + packages/ddkaltest/package.py | 2 +- packages/ddmarlinpandora/package.py | 1 + packages/dual-readout/package.py | 2 +- packages/emela/package.py | 2 ++ packages/fcalclusterer/package.py | 1 + packages/fcc-config/package.py | 2 +- packages/fccanalyses/package.py | 1 + packages/fccdetectors/package.py | 1 + packages/fccsw/package.py | 1 + packages/forwardtracking/package.py | 1 + packages/garlic/package.py | 2 +- packages/gear/package.py | 1 + packages/generalbrokenlines/package.py | 2 ++ packages/guinea-pig/package.py | 2 ++ packages/ilcsoft/package.py | 1 + packages/ilcutil/package.py | 1 + packages/ildperformance/package.py | 1 + packages/k4actstracking/package.py | 1 + packages/k4clue/package.py | 2 +- packages/k4edm4hep2lcioconv/package.py | 3 +-- packages/k4fwcore/package.py | 1 + packages/k4gaudipandora/package.py | 1 + packages/k4gen/package.py | 1 + packages/k4generatorsconfig/package.py | 2 ++ packages/k4geo/package.py | 2 ++ packages/k4marlinwrapper/package.py | 1 + packages/k4pandora/package.py | 1 + packages/k4projecttemplate/package.py | 1 + packages/k4reccalorimeter/package.py | 1 + packages/k4reco/package.py | 1 + packages/k4rectracker/package.py | 1 + packages/k4simdelphes/package.py | 1 + packages/k4simgeant4/package.py | 1 + packages/kaldet/package.py | 2 +- packages/kaltest/package.py | 2 +- packages/key4hep-stack/common.py | 2 +- packages/kitrack/package.py | 2 +- packages/kitrackmarlin/package.py | 2 +- packages/kkmcee/package.py | 2 ++ packages/larcontent/package.py | 2 ++ packages/lccd/package.py | 1 + packages/lccontent/package.py | 2 ++ packages/lcfiplus/package.py | 2 +- packages/lcfivertex/package.py | 1 + packages/lctuple/package.py | 1 + packages/lich/package.py | 2 +- packages/marlin/package.py | 1 + packages/marlindd4hep/package.py | 2 +- packages/marlinfastjet/package.py | 1 + packages/marlinkinfit/package.py | 1 + packages/marlinkinfitprocessors/package.py | 1 + packages/marlinmlflavortagging/package.py | 3 +-- packages/marlinreco/package.py | 1 + packages/marlintrk/package.py | 2 +- packages/marlintrkprocessors/package.py | 2 +- packages/marlinutil/package.py | 2 +- packages/overlay/package.py | 1 + packages/pandoraanalysis/package.py | 1 + packages/physsim/package.py | 1 + packages/py-pybdsim/package.py | 2 ++ packages/py-pyg4ometry/package.py | 2 ++ packages/py-pyhepmc/package.py | 2 ++ packages/py-pymadx/package.py | 2 ++ packages/py-pytransport/package.py | 2 ++ packages/raida/package.py | 1 + 77 files changed, 92 insertions(+), 25 deletions(-) diff --git a/packages/aidatt/package.py b/packages/aidatt/package.py index 14793b32..e644cf73 100644 --- a/packages/aidatt/package.py +++ b/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 diff --git a/packages/babayaga/package.py b/packages/babayaga/package.py index 830f27cb..c4535c79 100644 --- a/packages/babayaga/package.py +++ b/packages/babayaga/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + import os diff --git a/packages/bhlumi/package.py b/packages/bhlumi/package.py index 88e80a3d..373bbf5d 100644 --- a/packages/bhlumi/package.py +++ b/packages/bhlumi/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + import os diff --git a/packages/ced/package.py b/packages/ced/package.py index c1fc20d9..536586ed 100644 --- a/packages/ced/package.py +++ b/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 diff --git a/packages/cedviewer/package.py b/packages/cedviewer/package.py index 2bdf6a10..67116d1b 100644 --- a/packages/cedviewer/package.py +++ b/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 diff --git a/packages/cepcsw/package.py b/packages/cepcsw/package.py index 60ad6712..de2de217 100644 --- a/packages/cepcsw/package.py +++ b/packages/cepcsw/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/cldconfig/package.py b/packages/cldconfig/package.py index cbb17a7b..7d940d97 100644 --- a/packages/cldconfig/package.py +++ b/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): diff --git a/packages/clicperformance/package.py b/packages/clicperformance/package.py index 864b5104..b835c50e 100644 --- a/packages/clicperformance/package.py +++ b/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 diff --git a/packages/clupatra/package.py b/packages/clupatra/package.py index ef2cf6f4..522771ae 100644 --- a/packages/clupatra/package.py +++ b/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 diff --git a/packages/conddbmysql/package.py b/packages/conddbmysql/package.py index 63a7a48e..709a1bcb 100644 --- a/packages/conddbmysql/package.py +++ b/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 diff --git a/packages/conformaltracking/package.py b/packages/conformaltracking/package.py index 152fa775..91e5c2a9 100644 --- a/packages/conformaltracking/package.py +++ b/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 diff --git a/packages/ddfastshowerml/package.py b/packages/ddfastshowerml/package.py index b5d3812e..09af9fdb 100644 --- a/packages/ddfastshowerml/package.py +++ b/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 diff --git a/packages/ddkaltest/package.py b/packages/ddkaltest/package.py index 7a5dbc08..fd3cc0ca 100644 --- a/packages/ddkaltest/package.py +++ b/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 diff --git a/packages/ddmarlinpandora/package.py b/packages/ddmarlinpandora/package.py index 55d10f35..a941b573 100644 --- a/packages/ddmarlinpandora/package.py +++ b/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 diff --git a/packages/dual-readout/package.py b/packages/dual-readout/package.py index 251ad18a..15c25c2e 100644 --- a/packages/dual-readout/package.py +++ b/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 diff --git a/packages/emela/package.py b/packages/emela/package.py index 2943226a..2e90ef0a 100644 --- a/packages/emela/package.py +++ b/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""" diff --git a/packages/fcalclusterer/package.py b/packages/fcalclusterer/package.py index 1279f70a..c62e0954 100644 --- a/packages/fcalclusterer/package.py +++ b/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 diff --git a/packages/fcc-config/package.py b/packages/fcc-config/package.py index 6ce84044..a68c17cc 100644 --- a/packages/fcc-config/package.py +++ b/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): diff --git a/packages/fccanalyses/package.py b/packages/fccanalyses/package.py index d41a91bb..a049d0d5 100644 --- a/packages/fccanalyses/package.py +++ b/packages/fccanalyses/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/fccdetectors/package.py b/packages/fccdetectors/package.py index f09a676d..e80a5fd0 100644 --- a/packages/fccdetectors/package.py +++ b/packages/fccdetectors/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/fccsw/package.py b/packages/fccsw/package.py index 35859fe3..6dccf079 100644 --- a/packages/fccsw/package.py +++ b/packages/fccsw/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/forwardtracking/package.py b/packages/forwardtracking/package.py index 71a7e5ef..ec9eba51 100644 --- a/packages/forwardtracking/package.py +++ b/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 diff --git a/packages/garlic/package.py b/packages/garlic/package.py index 429cdd7c..97cd1028 100644 --- a/packages/garlic/package.py +++ b/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 diff --git a/packages/gear/package.py b/packages/gear/package.py index 9458ccae..e58ca3c4 100644 --- a/packages/gear/package.py +++ b/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 diff --git a/packages/generalbrokenlines/package.py b/packages/generalbrokenlines/package.py index cc0a9c4d..0a6cd96c 100644 --- a/packages/generalbrokenlines/package.py +++ b/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.""" diff --git a/packages/guinea-pig/package.py b/packages/guinea-pig/package.py index cd9997b1..6751d857 100644 --- a/packages/guinea-pig/package.py +++ b/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 diff --git a/packages/ilcsoft/package.py b/packages/ilcsoft/package.py index 44d51e08..003059c4 100644 --- a/packages/ilcsoft/package.py +++ b/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 diff --git a/packages/ilcutil/package.py b/packages/ilcutil/package.py index 3e96b3ba..18391738 100644 --- a/packages/ilcutil/package.py +++ b/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 diff --git a/packages/ildperformance/package.py b/packages/ildperformance/package.py index 75c3964e..25caf054 100644 --- a/packages/ildperformance/package.py +++ b/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 diff --git a/packages/k4actstracking/package.py b/packages/k4actstracking/package.py index cd588c0d..8d1a5c63 100644 --- a/packages/k4actstracking/package.py +++ b/packages/k4actstracking/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4clue/package.py b/packages/k4clue/package.py index 19e2599e..ae37eb08 100644 --- a/packages/k4clue/package.py +++ b/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 diff --git a/packages/k4edm4hep2lcioconv/package.py b/packages/k4edm4hep2lcioconv/package.py index 49f08ce8..978cb6dd 100644 --- a/packages/k4edm4hep2lcioconv/package.py +++ b/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 diff --git a/packages/k4fwcore/package.py b/packages/k4fwcore/package.py index 5f61c788..13a47550 100644 --- a/packages/k4fwcore/package.py +++ b/packages/k4fwcore/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Ilcsoftpackage diff --git a/packages/k4gaudipandora/package.py b/packages/k4gaudipandora/package.py index 835d3c82..51678166 100644 --- a/packages/k4gaudipandora/package.py +++ b/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 diff --git a/packages/k4gen/package.py b/packages/k4gen/package.py index 68a53573..a74967b5 100644 --- a/packages/k4gen/package.py +++ b/packages/k4gen/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4generatorsconfig/package.py b/packages/k4generatorsconfig/package.py index aad97f05..6cc0b61a 100644 --- a/packages/k4generatorsconfig/package.py +++ b/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.""" diff --git a/packages/k4geo/package.py b/packages/k4geo/package.py index 3962c79f..6b8ad30c 100644 --- a/packages/k4geo/package.py +++ b/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.""" diff --git a/packages/k4marlinwrapper/package.py b/packages/k4marlinwrapper/package.py index 1741db8a..0ecbf0c3 100644 --- a/packages/k4marlinwrapper/package.py +++ b/packages/k4marlinwrapper/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 diff --git a/packages/k4pandora/package.py b/packages/k4pandora/package.py index f2565ede..c0a0af4f 100644 --- a/packages/k4pandora/package.py +++ b/packages/k4pandora/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 diff --git a/packages/k4projecttemplate/package.py b/packages/k4projecttemplate/package.py index ddc76f55..a1c93c4a 100644 --- a/packages/k4projecttemplate/package.py +++ b/packages/k4projecttemplate/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4reccalorimeter/package.py b/packages/k4reccalorimeter/package.py index 7a2bad85..223ef579 100644 --- a/packages/k4reccalorimeter/package.py +++ b/packages/k4reccalorimeter/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4reco/package.py b/packages/k4reco/package.py index 4bff01d3..ddfc0d1b 100644 --- a/packages/k4reco/package.py +++ b/packages/k4reco/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4rectracker/package.py b/packages/k4rectracker/package.py index 4b03a17d..b4dd06c0 100644 --- a/packages/k4rectracker/package.py +++ b/packages/k4rectracker/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/k4simdelphes/package.py b/packages/k4simdelphes/package.py index e3c0f254..e63285b1 100644 --- a/packages/k4simdelphes/package.py +++ b/packages/k4simdelphes/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 diff --git a/packages/k4simgeant4/package.py b/packages/k4simgeant4/package.py index 571f81c6..33a8c52d 100644 --- a/packages/k4simgeant4/package.py +++ b/packages/k4simgeant4/package.py @@ -1,3 +1,4 @@ +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/kaldet/package.py b/packages/kaldet/package.py index bcd05315..c61e53a9 100644 --- a/packages/kaldet/package.py +++ b/packages/kaldet/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 diff --git a/packages/kaltest/package.py b/packages/kaltest/package.py index e560d096..1bc088a9 100644 --- a/packages/kaltest/package.py +++ b/packages/kaltest/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 diff --git a/packages/key4hep-stack/common.py b/packages/key4hep-stack/common.py index c3f4caa6..1ed6f399 100644 --- a/packages/key4hep-stack/common.py +++ b/packages/key4hep-stack/common.py @@ -2,7 +2,7 @@ Common methods for use in Key4hep recipes """ -from spack import * +from spack.package import * from spack.directives import * from spack.user_environment import * diff --git a/packages/kitrack/package.py b/packages/kitrack/package.py index 34cf0ce9..0d8eecd1 100644 --- a/packages/kitrack/package.py +++ b/packages/kitrack/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 diff --git a/packages/kitrackmarlin/package.py b/packages/kitrackmarlin/package.py index 05232fee..292443ba 100644 --- a/packages/kitrackmarlin/package.py +++ b/packages/kitrackmarlin/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 diff --git a/packages/kkmcee/package.py b/packages/kkmcee/package.py index a864df11..f2d1210b 100644 --- a/packages/kkmcee/package.py +++ b/packages/kkmcee/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + import os import glob diff --git a/packages/larcontent/package.py b/packages/larcontent/package.py index 0560795d..231defea 100644 --- a/packages/larcontent/package.py +++ b/packages/larcontent/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class Larcontent(CMakePackage): """Pandora algorithms and tools for LAr TPC event reconstruction""" diff --git a/packages/lccd/package.py b/packages/lccd/package.py index a792ded1..19ebfc4e 100644 --- a/packages/lccd/package.py +++ b/packages/lccd/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 diff --git a/packages/lccontent/package.py b/packages/lccontent/package.py index 4d6e0fa8..6cf7c8da 100644 --- a/packages/lccontent/package.py +++ b/packages/lccontent/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class Lccontent(CMakePackage): """Pandora algorithms and tools for Linear Collider event reconstruction.""" diff --git a/packages/lcfiplus/package.py b/packages/lcfiplus/package.py index b0aed5bc..d31d342c 100644 --- a/packages/lcfiplus/package.py +++ b/packages/lcfiplus/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 diff --git a/packages/lcfivertex/package.py b/packages/lcfivertex/package.py index 37413107..7837fdf3 100644 --- a/packages/lcfivertex/package.py +++ b/packages/lcfivertex/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 diff --git a/packages/lctuple/package.py b/packages/lctuple/package.py index 8d615cca..89d64799 100644 --- a/packages/lctuple/package.py +++ b/packages/lctuple/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 diff --git a/packages/lich/package.py b/packages/lich/package.py index 5a54b7f3..6006dec3 100644 --- a/packages/lich/package.py +++ b/packages/lich/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 diff --git a/packages/marlin/package.py b/packages/marlin/package.py index a354f029..fae81c54 100644 --- a/packages/marlin/package.py +++ b/packages/marlin/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 diff --git a/packages/marlindd4hep/package.py b/packages/marlindd4hep/package.py index ae211772..724aeb08 100644 --- a/packages/marlindd4hep/package.py +++ b/packages/marlindd4hep/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 diff --git a/packages/marlinfastjet/package.py b/packages/marlinfastjet/package.py index 7ccf19e8..15198a9d 100644 --- a/packages/marlinfastjet/package.py +++ b/packages/marlinfastjet/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 diff --git a/packages/marlinkinfit/package.py b/packages/marlinkinfit/package.py index ca75532e..ee35e521 100644 --- a/packages/marlinkinfit/package.py +++ b/packages/marlinkinfit/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 diff --git a/packages/marlinkinfitprocessors/package.py b/packages/marlinkinfitprocessors/package.py index e4e15cad..0b122355 100644 --- a/packages/marlinkinfitprocessors/package.py +++ b/packages/marlinkinfitprocessors/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 diff --git a/packages/marlinmlflavortagging/package.py b/packages/marlinmlflavortagging/package.py index 4d955a4e..548c8a0d 100644 --- a/packages/marlinmlflavortagging/package.py +++ b/packages/marlinmlflavortagging/package.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python3 - +from spack.package import * from spack.pkg.k4.key4hep_stack import Key4hepPackage diff --git a/packages/marlinreco/package.py b/packages/marlinreco/package.py index 0268d813..294c9716 100644 --- a/packages/marlinreco/package.py +++ b/packages/marlinreco/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 diff --git a/packages/marlintrk/package.py b/packages/marlintrk/package.py index 72a49a60..43170aec 100644 --- a/packages/marlintrk/package.py +++ b/packages/marlintrk/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 diff --git a/packages/marlintrkprocessors/package.py b/packages/marlintrkprocessors/package.py index 9cd67a84..39cb233c 100644 --- a/packages/marlintrkprocessors/package.py +++ b/packages/marlintrkprocessors/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 diff --git a/packages/marlinutil/package.py b/packages/marlinutil/package.py index 6037fe42..663e8796 100644 --- a/packages/marlinutil/package.py +++ b/packages/marlinutil/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 diff --git a/packages/overlay/package.py b/packages/overlay/package.py index 3f30f398..d22c7a64 100644 --- a/packages/overlay/package.py +++ b/packages/overlay/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 diff --git a/packages/pandoraanalysis/package.py b/packages/pandoraanalysis/package.py index 00227430..6ae683ba 100644 --- a/packages/pandoraanalysis/package.py +++ b/packages/pandoraanalysis/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 diff --git a/packages/physsim/package.py b/packages/physsim/package.py index e9ade2bd..6f1ea434 100644 --- a/packages/physsim/package.py +++ b/packages/physsim/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 diff --git a/packages/py-pybdsim/package.py b/packages/py-pybdsim/package.py index 5044f09b..ca269f6d 100644 --- a/packages/py-pybdsim/package.py +++ b/packages/py-pybdsim/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class PyPybdsim(PythonPackage): """Utilities for preparing and analysing BDSIM input and output as well as controlling BDSIM""" diff --git a/packages/py-pyg4ometry/package.py b/packages/py-pyg4ometry/package.py index 1e48c574..b9953690 100644 --- a/packages/py-pyg4ometry/package.py +++ b/packages/py-pyg4ometry/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class PyPyg4ometry(PythonPackage): """Geometry package for high energy physics (Geant4, Fluka)""" diff --git a/packages/py-pyhepmc/package.py b/packages/py-pyhepmc/package.py index 72895dfb..c8c63e93 100644 --- a/packages/py-pyhepmc/package.py +++ b/packages/py-pyhepmc/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class PyPyhepmc(PythonPackage): """Python bindings for HepMC3""" diff --git a/packages/py-pymadx/package.py b/packages/py-pymadx/package.py index f0abc4e4..b50baf6b 100644 --- a/packages/py-pymadx/package.py +++ b/packages/py-pymadx/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class PyPymadx(PythonPackage): """Utilities for processing and analysing MADX output""" diff --git a/packages/py-pytransport/package.py b/packages/py-pytransport/package.py index 28f99ceb..20067fde 100644 --- a/packages/py-pytransport/package.py +++ b/packages/py-pytransport/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + class PyPytransport(PythonPackage): """A Python based converter for TRANSPORT files to BDSIM readable gmad files""" diff --git a/packages/raida/package.py b/packages/raida/package.py index b945bb95..56d39497 100644 --- a/packages/raida/package.py +++ b/packages/raida/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