zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add camp & BLT dependencies to Umpire (#19411)

Browse Source 
* Add camp & BLT dependencies to Umpire

* Remove tests variant
This commit is contained in:
David Beckingsale 2020-10-26 14:12:03 -07:00 committed by GitHub
parent 1c2c30a139
commit 4f9c621284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/camp/package.py
View File

@ -39,6 +39,7 @@ def cmake_args(self):
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

9
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -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 @@ def cmake_args(self):
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',