From ffe364f4b8bb2a7e2614613c1c18023e95753d50 Mon Sep 17 00:00:00 2001 From: Paolo Andreetto Date: Fri, 5 Jul 2024 10:39:57 +0200 Subject: [PATCH] Tentative changes for release 2.9 --- environments/mucoll-release-debug/spack.yaml | 59 +++++++++++++++++- environments/mucoll-release/spack.yaml | 64 +++++++++++++++++++- packages/actstracking/package.py | 9 ++- packages/conformaltracking/package.py | 1 + packages/forwardtracking/package.py | 1 + packages/lcgeo/package.py | 1 + packages/lcio/package.py | 1 + packages/marlintrkprocessors/package.py | 1 + packages/mucoll-stack/package.py | 4 +- packages/muoncvxddigitiser/package.py | 7 ++- packages/overlay/package.py | 1 + 11 files changed, 137 insertions(+), 12 deletions(-) diff --git a/environments/mucoll-release-debug/spack.yaml b/environments/mucoll-release-debug/spack.yaml index 50f2d6f..57d8d62 100644 --- a/environments/mucoll-release-debug/spack.yaml +++ b/environments/mucoll-release-debug/spack.yaml @@ -1,6 +1,61 @@ spack: - include: - - packages.yaml packages: + geant4: + require: '@11.2.0 +opengl+vecgeom' + clhep: + require: '@2.4.7.1 ~cms~ipo' + root: + require: '@6.32.00 +fftw+http+mlp+pythia8+r+root7+sqlite+ssl+tmva+vc+xrootd' + dd4hep: + require: '@1.29 +hepmc3+lcio+xercesc' + edm4hep: + require: '@0.10.5 ~ipo' + podio: + require: '@0.17.3 ~ipo~rntuple~sio' + acts: + require: '@32.1.0' + whizard: + require: '@3.1.4 +lcio+openloops+openmp+pythia8' + pythia8: + require: '@8.311 ~hepmc' + k4simdelphes: + require: '@00-06-02 ~delphes_hepmc' + gaudi: + require: '@38.1 +aida+gaudialg' + + overlay: + require: '@0.25' + lcgeo: + require: '@0.20' + lcio: + require: '@2.22' + forwardtracking: + require: '@1.14.2' + conformaltracking: + require: '@1.12.1' + marlintrkprocessors: + require: '@2.15.1' + actstracking: + require: '@1.2' + muoncvxddigitiser: + require: '@0.2' + + gear: + require: '@1.9.2' + ilcutil: + require: '@1.7.2' + marlin: + require: '@1.19.1' + pandorapfa: + require: '@4.8.1' + gdb: + require: '@14.1' + all: + target: [x86_64] variants: build_type=Debug cxxstd=17 + buildable: true + providers: + gl: [mesa] + glu: [mesa] + diff --git a/environments/mucoll-release/spack.yaml b/environments/mucoll-release/spack.yaml index 372d332..a1ec04c 100644 --- a/environments/mucoll-release/spack.yaml +++ b/environments/mucoll-release/spack.yaml @@ -1,3 +1,63 @@ spack: - include: - - packages.yaml + packages: + geant4: + require: '@11.2.0 +opengl+vecgeom' + clhep: + require: '@2.4.7.1 ~cms~ipo' + root: + require: '@6.32.00 +fftw+http+mlp+pythia8+r+root7+sqlite+ssl+tmva+vc+xrootd' + dd4hep: + require: '@1.29 +hepmc3+lcio+xercesc' + edm4hep: + require: '@0.10.5 ~ipo' + podio: + require: '@0.17.3 ~ipo~rntuple~sio' + acts: + require: '@32.1.0' + whizard: + require: '@3.1.4 +lcio+openloops+openmp+pythia8' + pythia8: + require: '@8.311 ~hepmc' + k4simdelphes: + require: '@00-06-02 ~delphes_hepmc' + gaudi: + require: '@38.1 +aida+gaudialg' + mucoll-stack: + require: '~devtools' + + overlay: + require: '@0.25' + lcgeo: + require: '@0.20' + lcio: + require: '@2.22' + forwardtracking: + require: '@1.14.2' + conformaltracking: + require: '@1.12.1' + marlintrkprocessors: + require: '@2.15.1' + actstracking: + require: '@1.2' + muoncvxddigitiser: + require: '@0.2' + + gear: + require: '@1.9.2' + ilcutil: + require: '@1.7.2' + marlin: + require: '@1.19.1' + pandorapfa: + require: '@4.8.1' + gdb: + require: '@14.1' + + all: + target: [x86_64] + variants: build_type=Release cxxstd=17 + buildable: true + providers: + gl: [mesa] + glu: [mesa] + diff --git a/packages/actstracking/package.py b/packages/actstracking/package.py index 9343ecb..63d6c7c 100644 --- a/packages/actstracking/package.py +++ b/packages/actstracking/package.py @@ -3,10 +3,10 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.pkg.k4.key4hep_stack import Key4hepPackage +from spack.pkg.mucoll.mucoll_stack import MCIlcsoftpackage -class Actstracking(CMakePackage, Key4hepPackage): +class Actstracking(CMakePackage, MCIlcsoftpackage): """Marlin package for track reconstructions using the ACTS library""" homepage = "https://github.com/MuonColliderSoft/ACTSTracking" @@ -15,7 +15,8 @@ class Actstracking(CMakePackage, Key4hepPackage): maintainers = ['gianelle', 'kkrizka'] - + version('main', branch='main') + version('1.2', sha256='7390d03ab848f7ad9e67c5aabda8122942a885256775174db30964fb9fe028e1', preferred=True) version('1.1.0', sha256='d565e70a2fec97d0d2e81ada69ed54ef8dacc44b0f608b4cf3dffa561091afeb') version('1.0.0', sha256='0e98f2185920358d9c220883a48df42f3b5282beb32a91a19f9f3f5c1adc103b') @@ -34,6 +35,8 @@ class Actstracking(CMakePackage, Key4hepPackage): def setup_run_environment(self, spack_env): spack_env.prepend_path('MARLIN_DLL', self.prefix.lib + "/libACTSTracking.so") + spack_env.set("ACTS_TGeoFile", self.prefix.share.ACTSTracking.data + "/MuColl_v1.root") + spack_env.set("ACTS_MatFile", self.prefix.share.ACTSTracking.data + "/material-maps.json") def cmake_args(self): # C++ Standard diff --git a/packages/conformaltracking/package.py b/packages/conformaltracking/package.py index e8381dd..21e8969 100644 --- a/packages/conformaltracking/package.py +++ b/packages/conformaltracking/package.py @@ -20,6 +20,7 @@ class Conformaltracking(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version('master', branch='master') + version('1.12.1', sha256='2fca66be42850afbea910dd8eabc5761d7cb4c517ff7e936503b10bc83218950', preferred=True) version('1.12', sha256='676d20c3f6b6c03910377d0cb241120567cd6c6bd4fbdd0df708965302872e53') version('1.11', sha256='ea5a8e600546f4a67b555c89bb4f60bd95e6fab2259fe72af78ca865cc76819a') version('1.10', sha256='fa3d8c12e92dc0748bb427fe3a388b8d500acb5c0e171736068fffe2135b4b7d') diff --git a/packages/forwardtracking/package.py b/packages/forwardtracking/package.py index 3f35dee..3d17990 100644 --- a/packages/forwardtracking/package.py +++ b/packages/forwardtracking/package.py @@ -16,6 +16,7 @@ class Forwardtracking(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version('master', branch='master') + version('1.14.2', sha256='e07cf6e71e2198253c53a1ea017d827d432de7c541c84642c89edf99184785b4', preferred=True) version('1.14', sha256='00e4fd4fc4be2c0c6febf6927fd5b37856ecb80a82d62836086ce4b53c1fb107') patch('testing.patch', when="@:1.15") diff --git a/packages/lcgeo/package.py b/packages/lcgeo/package.py index 2414e80..c11e367 100644 --- a/packages/lcgeo/package.py +++ b/packages/lcgeo/package.py @@ -18,6 +18,7 @@ class Lcgeo(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version('master', branch='master') + version('0.20', sha256='7afdb3ad06b577481ca17003981b2dc8182d5c49ac032a3ee20ae545d97695e1', preferred=True) version("0.18.1", sha256="5fcfcbd6110792bb607aba82a8dcbf887b40065aa12835f720af700f26c53bcc") version("0.18", sha256="271062288aac419ce6affc98e199c597c340be57830c30f3b3e1d774cccc608b") version('0.17', sha256='5ab33aaf5bc37deba82c2dde78cdce6c0041257222ed7ea052ecdd388a41cf9b') diff --git a/packages/lcio/package.py b/packages/lcio/package.py index 0696935..b4f10db 100644 --- a/packages/lcio/package.py +++ b/packages/lcio/package.py @@ -20,6 +20,7 @@ class Lcio(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version("master", branch="master") + version('2.22', sha256='2ae4361c0c67f7dffb24a06525ef909e97a18545d1cef4e36887e220b2420e4b', preferred=True) version('2.19.1', sha256='ae2c417381025bbebeef9c9806ab104c3404474ab555569f64c5dabd5c69b5d5') version('2.17', sha256='b04422eaf224a0e64d5410bedc47bf0259912990fda136ec3dcdaee8c79e6b86') version('2.16.1', sha256='e5319053c1f8fe7be40fb250e3694c926595533b13e108a08cb718a04bef137e') diff --git a/packages/marlintrkprocessors/package.py b/packages/marlintrkprocessors/package.py index 4cddef7..1307ee7 100644 --- a/packages/marlintrkprocessors/package.py +++ b/packages/marlintrkprocessors/package.py @@ -17,6 +17,7 @@ class Marlintrkprocessors(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version('master', branch='master') + version('2.15.1', sha256='c8e8ff7bdea755fa1b5f65341a50009cbc05e59ab206c8046d43e169939b5418', preferred=True) version("2.15", sha256="439c2d01bd36c165a2a9e19caeceb807466691a5f240984a2654e2b6d3d0bcbf") version('2.14', sha256='3fda69fbbd23e8e3e7f3c47d898dcd301693286f0a17854e919cfbe68bf3918f') version('2.13', sha256='a44fe66a62d252f5226ca710a913fca6337812af1b7937bfb050d8f2d34df011') diff --git a/packages/mucoll-stack/package.py b/packages/mucoll-stack/package.py index 312610d..95d480a 100644 --- a/packages/mucoll-stack/package.py +++ b/packages/mucoll-stack/package.py @@ -29,7 +29,7 @@ class MucollStack(BundlePackage, Key4hepPackage): ### stable build # to install exact specified version for every dependecy # should use `environments/mucoll-release/packages.yaml` - version('2.8') + version('2.9') # this bundle package installs a custom setup script, # so need to add the install phase @@ -46,7 +46,7 @@ class MucollStack(BundlePackage, Key4hepPackage): ############################### Key4hep ############### ####################################################### depends_on('whizard +lcio +openloops') - depends_on('k4lcioreader') + depends_on('k4marlinwrapper') depends_on('k4simdelphes') depends_on('delphes') diff --git a/packages/muoncvxddigitiser/package.py b/packages/muoncvxddigitiser/package.py index 8960c19..62bfd3a 100644 --- a/packages/muoncvxddigitiser/package.py +++ b/packages/muoncvxddigitiser/package.py @@ -3,10 +3,10 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack.pkg.k4.key4hep_stack import Ilcsoftpackage +from spack.pkg.mucoll.mucoll_stack import MCIlcsoftpackage -class Muoncvxddigitiser(CMakePackage, Ilcsoftpackage): +class Muoncvxddigitiser(CMakePackage, MCIlcsoftpackage): """Realistic digitiser of pixelated sensors for Muon Collider""" homepage = "https://github.com/MuonColliderSoft/MuonCVXDDigitiser" @@ -14,7 +14,8 @@ class Muoncvxddigitiser(CMakePackage, Ilcsoftpackage): url = "https://github.com/MuonColliderSoft/MuonCVXDDigitiser/archive/refs/tags/v00-01.tar.gz" version("master", branch="master") - version("0.1", sha256="b4fe817025aeda01e0d503a91a5988b4c1d906dfcb02d2a505f013f8de90efc0") + version("0.2", sha256="7f3711c028bb646979e4356981da6e97b30da244e71aac0dd4fe206b69820c22", preferred=True) + version("0.1", sha256="b4fe817025aeda01e0d503a91a5988b4c1d906dfcb02d2a505f013f8de90efc0") depends_on('ilcutil') diff --git a/packages/overlay/package.py b/packages/overlay/package.py index 7a9c691..aefd7ee 100644 --- a/packages/overlay/package.py +++ b/packages/overlay/package.py @@ -16,6 +16,7 @@ class Overlay(CMakePackage, MCIlcsoftpackage): maintainers = ['gianelle', 'pandreetto'] version('master', branch='master') + version('0.25', sha256='32a840a14b4d74b3689c83ae05ffb63cfa5996c8ab3beb8d83e2d098f2cda18d', preferred=True) version('0.24', sha256='83ddebb4c3e36b9b5bda2acfb658e5fd0fd2b31f5e5a38c54f72601379949c04') version('0.23', sha256='b885bed6c386676e74db21dafde6bc08bcac2a16df89892759415fb8bbb331ed') version('0.22.2', sha256='9d4ed2d218897f0cbec233d5c588db41bd002dcd5ce809f5b3bad7767408de58')