diff options
| author | Daniel Arndt <arndtd@ornl.gov> | 2021-03-23 16:07:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 20:07:14 +0000 |
| commit | 73311bc6cd2ef32755406540c6a9d34084d7f313 (patch) | |
| tree | a5d6566686d97622d2a1a97f98cfc96d813ce93b | |
| parent | 3d74592be248c16f20d58c8566be2011949b56f1 (diff) | |
| download | spack-73311bc6cd2ef32755406540c6a9d34084d7f313.tar.gz spack-73311bc6cd2ef32755406540c6a9d34084d7f313.tar.bz2 spack-73311bc6cd2ef32755406540c6a9d34084d7f313.tar.xz spack-73311bc6cd2ef32755406540c6a9d34084d7f313.zip | |
Allow DataTransferKit to be built with external ArborX package (#22486)
| -rw-r--r-- | var/spack/repos/builtin/packages/arborx/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/datatransferkit/package.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index 93cc206f66..e030cbcd54 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -15,7 +15,8 @@ class Arborx(CMakePackage): maintainers = ['aprokop'] - version('master', branch='master') + version('master', branch='master') + version('1.0', sha256='9b5f45c8180622c907ef0b7cc27cb18ba272ac6558725d9e460c3f3e764f1075') version('0.9-beta', sha256='b349b5708d1aa00e8c20c209ac75dc2d164ff9bf1b85adb5437346d194ba6c0d') # ArborX relies on Kokkos to provide devices, providing one-to-one matching diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py index 1d5c3f445f..6cb90de775 100644 --- a/var/spack/repos/builtin/packages/datatransferkit/package.py +++ b/var/spack/repos/builtin/packages/datatransferkit/package.py @@ -19,11 +19,14 @@ class Datatransferkit(CMakePackage): version('master', branch='master', submodules=True) version('3.1-rc2', commit='1abc1a43b33dffc7a16d7497b4185d09d865e36a', submodules=True) + variant('external-arborx', default=False, + description='use an external ArborX library instead of the submodule') variant('openmp', default=False, description='enable OpenMP backend') variant('serial', default=True, description='enable Serial backend (default)') variant('shared', default=True, description='enable the build of shared lib') + depends_on('arborx@1.0:', when='+external-arborx') depends_on('cmake', type='build') depends_on('trilinos+intrepid2+shards~dtk', when='+serial') depends_on('trilinos+intrepid2+shards+openmp~dtk', when='+openmp') @@ -37,6 +40,8 @@ class Datatransferkit(CMakePackage): '-DBUILD_SHARED_LIBS:BOOL=%s' % ( 'ON' if '+shared' in spec else 'OFF'), '-DDataTransferKit_ENABLE_DataTransferKit=ON', + '-DDataTransferKit_ENABLE_ArborX_TPL=%s' % ( + 'ON' if '+external-arborx' in spec else 'OFF'), '-DDataTransferKit_ENABLE_TESTS=OFF', '-DDataTransferKit_ENABLE_EXAMPLES=OFF', '-DCMAKE_CXX_EXTENSIONS=OFF', |