diff options
| author | David Beckingsale <davidbeckingsale@gmail.com> | 2020-10-26 14:12:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 16:12:03 -0500 |
| commit | 4f9c621284ce1890e2e37976b567fd1082b701a9 (patch) | |
| tree | de639a54c39b3e35c1d9d9d152c67ad145ec2c2c /var | |
| parent | 1c2c30a139296d53a7474a6f53e542a05b5e685d (diff) | |
| download | spack-4f9c621284ce1890e2e37976b567fd1082b701a9.tar.gz spack-4f9c621284ce1890e2e37976b567fd1082b701a9.tar.bz2 spack-4f9c621284ce1890e2e37976b567fd1082b701a9.tar.xz spack-4f9c621284ce1890e2e37976b567fd1082b701a9.zip | |
Add camp & BLT dependencies to Umpire (#19411)
* Add camp & BLT dependencies to Umpire
* Remove tests variant
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/camp/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py index e2b33a172d..29af11819c 100644 --- a/var/spack/repos/builtin/packages/camp/package.py +++ b/var/spack/repos/builtin/packages/camp/package.py @@ -39,6 +39,7 @@ class Camp(CMakePackage, CudaPackage): else: options.append('-DENABLE_CUDA=OFF') - options.append('-DENABLE_TESTS=ON') + options.append('-DENABLE_TESTS={0}'.format( + "On" if self.run_tests else "Off")) return options diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index afb3d28d4b..c4668e4c6d 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -16,6 +16,9 @@ class Umpire(CMakePackage, CudaPackage): version('develop', branch='develop', submodules='True') version('main', branch='main', submodules='True') + version('4.1.2', tag='v4.1.2', submodules='True') + version('4.1.1', tag='v4.1.1', submodules='True') + version('4.1.0', tag='v4.1.0', submodules='True') version('4.0.1', tag='v4.0.1', submodules='True') version('4.0.0', tag='v4.0.0', submodules='True') version('3.0.0', tag='v3.0.0', submodules='True') @@ -54,6 +57,9 @@ class Umpire(CMakePackage, CudaPackage): depends_on('cmake@3.8:', type='build') depends_on('cmake@3.9:', when='+cuda', type='build') + depends_on('blt', type='build') + depends_on('camp') + conflicts('+numa', when='@:0.3.2') conflicts('~c', when='+fortran', msg='Fortran API requires C API') @@ -62,6 +68,9 @@ class Umpire(CMakePackage, CudaPackage): options = [] + options.append("-DBLT_SOURCE_DIR={0}".format(spec['blt'].prefix)) + options.append("-Dcamp_DIR={0}".format(spec['camp'].prefix)) + if '+cuda' in spec: options.extend([ '-DENABLE_CUDA=On', |