hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ArborX: Explicitly set path to Kokkos (#26347)

Browse source 
* Explicitly set path to Kokkos for ArborX testing

* Improve formatting

* Update var/spack/repos/builtin/packages/arborx/package.py

Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>

* Remove blank line

Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
This commit is contained in:
Daniel Arndt 2021-10-03 23:04:52 -04:00 committed by GitHub
parent 2f6590ddd1
commit 862bcc5059
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/arborx/package.py
View file

@ -92,10 +92,6 @@ def cached_tests_work_dir(self):
def build_tests(self): def build_tests(self):
"""Build the stand-alone/smoke test.""" """Build the stand-alone/smoke test."""
# We don't need to append the path to Kokkos to CMAKE_PREFIX_PATH since
# a hint is already hardcoded inside the CMake ArborX configuration.
# Omitting it here allows us to avoid to distinguish between Kokkos
# being installed as a standalone or as part of Trilinos.
arborx_dir = self.spec['arborx'].prefix arborx_dir = self.spec['arborx'].prefix
cmake_prefix_path = "-DCMAKE_PREFIX_PATH={0}".format(arborx_dir) cmake_prefix_path = "-DCMAKE_PREFIX_PATH={0}".format(arborx_dir)
if '+mpi' in self.spec: if '+mpi' in self.spec:
@ -103,7 +99,10 @@ def build_tests(self):
cmake_args = [".", cmake_args = [".",
cmake_prefix_path, cmake_prefix_path,
"-DCMAKE_CXX_COMPILER={0}".format(self.compiler.cxx)] "-DCMAKE_CXX_COMPILER={0}".format(self.compiler.cxx),
self.define('Kokkos_ROOT', self.spec['kokkos'].prefix
if '~trilinos' in self.spec
else self.spec['trilinos'].prefix)]
self.run_test("cmake", cmake_args, self.run_test("cmake", cmake_args,
purpose="test: calling cmake", purpose="test: calling cmake",