diff options
| author | Andrey Prokopenko <prokopenkoav@ornl.gov> | 2019-10-15 05:19:16 -0400 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2019-10-15 11:19:16 +0200 |
| commit | 41e7e5693e86dba94ed4237a3962c311887aa5a8 (patch) | |
| tree | f8d61a8c594559e31428fb5a68f141c798ce29b1 | |
| parent | ce5333c1fd248ad078f3712774c57a94143b17bd (diff) | |
| download | spack-41e7e5693e86dba94ed4237a3962c311887aa5a8.tar.gz spack-41e7e5693e86dba94ed4237a3962c311887aa5a8.tar.bz2 spack-41e7e5693e86dba94ed4237a3962c311887aa5a8.tar.xz spack-41e7e5693e86dba94ed4237a3962c311887aa5a8.zip | |
arborx: update v0.8-beta to v0.8-beta2 (#13143)
- Require Kokkos with c++14
- Update the case of CMake options
| -rw-r--r-- | var/spack/repos/builtin/packages/arborx/package.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index 55e064f8bb..45e368884e 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -10,11 +10,11 @@ class Arborx(CMakePackage): """ArborX is a performance-portable library for geometric search""" homepage = "http://github.com/arborx/arborx" - url = "https://github.com/arborx/arborx/archive/v0.8-beta.tar.gz" + url = "https://github.com/arborx/arborx/archive/v0.8-beta2.tar.gz" git = "https://github.com/arborx/arborx.git" version('master', branch='master') - version('0.8-beta', sha256='d90254656df089b1321bf26d55f69d0db465fff12a972c446562ceaca5f090ad') + version('0.8-beta2', sha256='e68733bc77fbb84313f3ff059f746fa79ab2ffe24a0a391126eefa47ec4fd2df') variant('cuda', default=False, description='enable Cuda backend') variant('openmp', default=False, description='enable OpenMP backend') @@ -28,18 +28,19 @@ class Arborx(CMakePackage): # ArborX relies on Kokkos to provide devices, thus having one-to-one match # The only way to disable those devices is to make sure Kokkos does not # provide them - depends_on('kokkos@2.7.00:+cuda+enable_lambda', when='+cuda') - depends_on('kokkos@2.7.00:+openmp', when='+openmp') - depends_on('kokkos@2.7.00:+serial', when='+serial') + depends_on('kokkos@2.7.00:+cuda+enable_lambda cxxstd=c++14', when='+cuda') + depends_on('kokkos@2.7.00:+openmp cxxstd=c++14', when='+openmp') + depends_on('kokkos@2.7.00:+serial cxxstd=c++14', when='+serial') def cmake_args(self): spec = self.spec options = [ '-DCMAKE_PREFIX_PATH=%s' % spec['kokkos'].prefix, - '-DArborX_ENABLE_TESTS=OFF', - '-DArborX_ENABLE_EXAMPLES=OFF', - '-DArborX_ENABLE_MPI=%s' % ('ON' if '+mpi' in spec else 'OFF') + '-DARBORX_ENABLE_TESTS=OFF', + '-DARBORX_ENABLE_EXAMPLES=OFF', + '-DARBORX_ENABLE_BENCHMARKS=OFF', + '-DARBORX_ENABLE_MPI=%s' % ('ON' if '+mpi' in spec else 'OFF') ] if '+cuda' in spec: |