acts: added v1.02.0 (#19305)

This commit is contained in:
Hadrien G 2020-10-15 14:13:55 +02:00 committed by GitHub
parent d1bfc426b0
commit 298e18dbf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -35,6 +35,7 @@ class Acts(CMakePackage, CudaPackage):
# Supported Acts versions # Supported Acts versions
version('master', branch='master') version('master', branch='master')
version('1.02.0', commit='e69b95acc9a264e63aded7d1714632066e090542')
version('1.01.0', commit='836fddd02c3eff33825833ff97d6abda5b5c20a0') version('1.01.0', commit='836fddd02c3eff33825833ff97d6abda5b5c20a0')
version('1.00.0', commit='ec9ce0bcdc837f568d42a12ddf3fc9c80db62f5d') version('1.00.0', commit='ec9ce0bcdc837f568d42a12ddf3fc9c80db62f5d')
version('0.32.0', commit='a4cedab7e727e1327f2835db29d147cc86b21054') version('0.32.0', commit='a4cedab7e727e1327f2835db29d147cc86b21054')
@ -88,6 +89,7 @@ class Acts(CMakePackage, CudaPackage):
variant('unit_tests', default=False, description='Build the unit tests') variant('unit_tests', default=False, description='Build the unit tests')
# Variants that enable / disable Acts plugins # Variants that enable / disable Acts plugins
variant('autodiff', default=False, description='Build the auto-differentiation plugin')
variant('dd4hep', default=False, description='Build the DD4hep plugin') variant('dd4hep', default=False, description='Build the DD4hep plugin')
variant('digitization', default=False, description='Build the geometric digitization plugin') variant('digitization', default=False, description='Build the geometric digitization plugin')
variant('fatras', default=False, description='Build the FAst TRAcking Simulation package') variant('fatras', default=False, description='Build the FAst TRAcking Simulation package')
@ -103,6 +105,7 @@ class Acts(CMakePackage, CudaPackage):
variant('pythia8', default=False, description='Build the Pythia8-based examples') variant('pythia8', default=False, description='Build the Pythia8-based examples')
# Build dependencies # Build dependencies
# FIXME: Use spack's autodiff package once there is one
depends_on('boost @1.62:1.69.99 +program_options +test', when='@:0.10.3') depends_on('boost @1.62:1.69.99 +program_options +test', when='@:0.10.3')
depends_on('boost @1.69: +filesystem +program_options +test', when='@0.10.4:') depends_on('boost @1.69: +filesystem +program_options +test', when='@0.10.4:')
depends_on('cmake @3.11:', type='build') depends_on('cmake @3.11:', type='build')
@ -119,6 +122,7 @@ class Acts(CMakePackage, CudaPackage):
depends_on('root @6.10: cxxstd=17', when='+tgeo @0.8.1:') depends_on('root @6.10: cxxstd=17', when='+tgeo @0.8.1:')
# Some variant combinations do not make sense # Some variant combinations do not make sense
conflicts('+autodiff', when='@:1.01')
conflicts('+benchmarks', when='@:0.15') conflicts('+benchmarks', when='@:0.15')
conflicts('+dd4hep', when='-tgeo') conflicts('+dd4hep', when='-tgeo')
conflicts('+examples', when='@:0.22') conflicts('+examples', when='@:0.22')
@ -166,6 +170,7 @@ def plugin_cmake_variant(plugin_name, spack_variant):
legacy_plugin_label = "LEGACY" legacy_plugin_label = "LEGACY"
args = [ args = [
plugin_cmake_variant("AUTODIFF", "autodiff"),
cmake_variant("BENCHMARKS", "benchmarks"), cmake_variant("BENCHMARKS", "benchmarks"),
plugin_cmake_variant("CUDA", "cuda"), plugin_cmake_variant("CUDA", "cuda"),
plugin_cmake_variant("DD4HEP", "dd4hep"), plugin_cmake_variant("DD4HEP", "dd4hep"),
@ -192,6 +197,8 @@ def plugin_cmake_variant(plugin_name, spack_variant):
cxxstd = spec['root'].variants['cxxstd'].value cxxstd = spec['root'].variants['cxxstd'].value
args.append("-DCMAKE_CXX_STANDARD={0}".format(cxxstd)) args.append("-DCMAKE_CXX_STANDARD={0}".format(cxxstd))
# FIXME: Once we can use spack's autodiff package, set
# ACTS_USE_SYSTEM_AUTODIFF too.
if spec.satisfies('@0.33: +json'): if spec.satisfies('@0.33: +json'):
args.append("-DACTS_USE_SYSTEM_NLOHMANN_JSON=ON") args.append("-DACTS_USE_SYSTEM_NLOHMANN_JSON=ON")
elif spec.satisfies('@0.14.0: +json'): elif spec.satisfies('@0.14.0: +json'):