From a6aff211d2e455db91b49ab6156fe6b2c22dcd82 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Wed, 2 Mar 2022 23:16:18 +0100 Subject: [acts] Add version 17 and 17.1, digitization plugin went in core (#28745) --- var/spack/repos/builtin/packages/acts/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index f27bed177d..134cd4882a 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -39,6 +39,8 @@ class Acts(CMakePackage, CudaPackage): # Supported Acts versions version('main', branch='main') version('master', branch='main', deprecated=True) # For compatibility + version('17.1.0', commit='0d9c3a6da022da48d6401e10c273896a1f775a9e', submodules=True) + version('17.0.0', commit='ccbf4c7d4ec3698bac4db9687fab2455a3f9c203', submodules=True) version('16.0.0', commit='9bd86921155e708189417b5a8019add10fd5b273', submodules=True) version('15.1.0', commit='a96e6db7de6075e85b6d5346bc89845eeb89b324', submodules=True) version('15.0.1', commit='b9469b8914f6a1bc47af0998eb7c9e8e20e4debc', submodules=True) @@ -115,7 +117,8 @@ class Acts(CMakePackage, CudaPackage): # Variants that affect the core Acts library variant('benchmarks', default=False, description='Build the performance benchmarks', when='@0.16:') - variant('examples', default=False, description='Build the examples', when='@0.23: +digitization +fatras +identification +json +tgeo') + variant('examples', default=False, description='Build the examples', when='@0.23:16 +digitization +fatras +identification +json +tgeo') + variant('examples', default=False, description='Build the examples', when='@17: +fatras +identification +json +tgeo') variant('integration_tests', default=False, description='Build the integration tests') variant('unit_tests', default=False, description='Build the unit tests') variant('log_failure_threshold', default='MAX', description='Log level above which examples should auto-crash') @@ -123,7 +126,7 @@ class Acts(CMakePackage, CudaPackage): # Variants that enable / disable Acts plugins variant('autodiff', default=False, description='Build the auto-differentiation plugin', when='@1.2:') variant('dd4hep', default=False, description='Build the DD4hep plugin', when='+tgeo') - variant('digitization', default=False, description='Build the geometric digitization plugin') + variant('digitization', default=False, description='Build the geometric digitization plugin', when='@:16') variant('fatras', default=False, description='Build the FAst TRAcking Simulation package', when='@0.16:') variant('fatras_geant4', default=False, description='Build Geant4 Fatras package') variant('identification', default=False, description='Build the Identification plugin') @@ -144,7 +147,7 @@ class Acts(CMakePackage, CudaPackage): # Build dependencies # FIXME: Use spack's vecmem package once there is one # (https://github.com/acts-project/acts/pull/998) - depends_on('autodiff @0.6:', when='@develop +autodiff') + depends_on('autodiff @0.6:', when='@17: +autodiff') depends_on('autodiff @0.5.11:0.5.99', when='@1.2:16 +autodiff') depends_on('boost @1.62:1.69 +program_options +test', when='@:0.10.3') depends_on('boost @1.71: +filesystem +program_options +test', when='@0.10.4:') @@ -202,7 +205,6 @@ class Acts(CMakePackage, CudaPackage): cmake_variant("BENCHMARKS", "benchmarks"), plugin_cmake_variant("CUDA", "cuda"), plugin_cmake_variant("DD4HEP", "dd4hep"), - plugin_cmake_variant("DIGITIZATION", "digitization"), cmake_variant("EXAMPLES", "examples"), example_cmake_variant("DD4HEP", "dd4hep"), example_cmake_variant("GEANT4", "geant4"), @@ -241,4 +243,7 @@ class Acts(CMakePackage, CudaPackage): elif spec.satisfies('@0.14.0: +json'): args.append("-DACTS_USE_BUNDLED_NLOHMANN_JSON=OFF") + if spec.satisfies('@:16'): + args.append(plugin_cmake_variant("DIGITIZATION", "digitization")) + return args -- cgit v1.2.3-70-g09d2