diff options
| author | Jim Galarowicz <jeg@trenzasynergy.com> | 2022-03-28 09:20:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 09:20:14 -0700 |
| commit | a7e365536be06c0af6cd91feb05aeb7b5de13fe3 (patch) | |
| tree | e8fed98613f4fbb90151a9c5f01fcfa548f2651f /var | |
| parent | 6aedbb32da8927118424493af20f54e91b7ef1f3 (diff) | |
| download | spack-a7e365536be06c0af6cd91feb05aeb7b5de13fe3.tar.gz spack-a7e365536be06c0af6cd91feb05aeb7b5de13fe3.tar.bz2 spack-a7e365536be06c0af6cd91feb05aeb7b5de13fe3.tar.xz spack-a7e365536be06c0af6cd91feb05aeb7b5de13fe3.zip | |
survey package: add versions 1.0.2/1.0.3; add tls model variant (#29375)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/survey/package.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/survey/package.py b/var/spack/repos/builtin/packages/survey/package.py index 3455e4a0e1..462cbd8d50 100644 --- a/var/spack/repos/builtin/packages/survey/package.py +++ b/var/spack/repos/builtin/packages/survey/package.py @@ -33,6 +33,8 @@ class Survey(CMakePackage): maintainers = ['jgalarowicz'] version('master', branch='master') + version('1.0.3', tag='1.0.3') + version('1.0.2', tag='1.0.2') version('1.0.1.1', tag='1.0.1.1') version('1.0.1', tag='1.0.1') version('1.0.0', branch='1.0.0') @@ -40,15 +42,21 @@ class Survey(CMakePackage): variant('mpi', default=False, description="Enable mpi, build MPI data collector") + variant('tls_model', default='implicit', + description='The TLS model to build with', + values=('implicit', 'explicit')) + # must have cmake at 3.12 or greater to find python3 depends_on('cmake@3.12:', type='build') # for collectors - depends_on("libmonitor@2021.04.27+commrank", type=('build', 'link', 'run')) + depends_on("libmonitor@2021.04.27+commrank", type=('build', 'link', 'run'), when='@:1.0.2') + depends_on('libmonitor@2021.11.08+commrank', type=('build', 'link', 'run'), when='@1.0.3:') depends_on("papi@5:", type=('build', 'link', 'run')) depends_on("gotcha@master", type=('build', 'link', 'run')) - depends_on("llvm-openmp@9.0.0", type=('build', 'link', 'run')) + depends_on("llvm-openmp@9.0.0", type=('build', 'link', 'run'), when='@:1.0.2') + depends_on('llvm-openmp@12.0.1', type=('build', 'link', 'run'), when='@1.0.3:') # MPI Installation depends_on("mpi", when="+mpi") @@ -74,11 +82,16 @@ class Survey(CMakePackage): def cmake_args(self): spec = self.spec + if 'tls_model=implicit' in spec: + spack_tls_model = "implicit" + else: + spack_tls_model = "explicit" + # Add in paths for finding package config files that tell us # where to find these packages cmake_args = [ '-DCMAKE_VERBOSE_MAKEFILE=ON', - '-DTLS_MODEL=implicit', + '-DTLS_MODEL=%s' % spack_tls_model, '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix, '-DPAPI_DIR=%s' % spec['papi'].prefix, '-DLIBIOMP_DIR=%s' % spec['llvm-openmp'].prefix, |