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

arborx: update v0.8-beta to v0.8-beta2 (#13143)

Browse Source 
- Require Kokkos with c++14
- Update the case of CMake options
This commit is contained in:
Andrey Prokopenko
2019-10-15 05:19:16 -04:00
committed by Massimiliano Culpo
parent ce5333c1fd
commit 41e7e5693e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/arborx/package.py
View File

@@ -10,11 +10,11 @@ class Arborx(CMakePackage):
"""ArborX is a performance-portable library for geometric search""" """ArborX is a performance-portable library for geometric search"""
homepage = "http://github.com/arborx/arborx" 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" git = "https://github.com/arborx/arborx.git"
version('master', branch='master') 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('cuda', default=False, description='enable Cuda backend')
variant('openmp', default=False, description='enable OpenMP 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 # 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 # The only way to disable those devices is to make sure Kokkos does not
# provide them # provide them
depends_on('kokkos@2.7.00:+cuda+enable_lambda', when='+cuda') depends_on('kokkos@2.7.00:+cuda+enable_lambda cxxstd=c++14', when='+cuda')
depends_on('kokkos@2.7.00:+openmp', when='+openmp') depends_on('kokkos@2.7.00:+openmp cxxstd=c++14', when='+openmp')
depends_on('kokkos@2.7.00:+serial', when='+serial') depends_on('kokkos@2.7.00:+serial cxxstd=c++14', when='+serial')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
options = [ options = [
'-DCMAKE_PREFIX_PATH=%s' % spec['kokkos'].prefix, '-DCMAKE_PREFIX_PATH=%s' % spec['kokkos'].prefix,
'-DArborX_ENABLE_TESTS=OFF', '-DARBORX_ENABLE_TESTS=OFF',
'-DArborX_ENABLE_EXAMPLES=OFF', '-DARBORX_ENABLE_EXAMPLES=OFF',
'-DArborX_ENABLE_MPI=%s' % ('ON' if '+mpi' in spec else 'OFF') '-DARBORX_ENABLE_BENCHMARKS=OFF',
'-DARBORX_ENABLE_MPI=%s' % ('ON' if '+mpi' in spec else 'OFF')
] ]
if '+cuda' in spec: if '+cuda' in spec: