Skip to content
Snippets Groups Projects
Unverified Commit 54dc8715 authored by Brian Van Essen's avatar Brian Van Essen Committed by GitHub
Browse files

Renamed the aluminum variant for thhe intra-node RMA functions. (#17861)

parent b3dd90b9
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,8 @@ class Aluminum(CMakePackage, CudaPackage): ...@@ -32,8 +32,8 @@ class Aluminum(CMakePackage, CudaPackage):
variant('nccl', default=False, description='Builds with support for NCCL communication lib') variant('nccl', default=False, description='Builds with support for NCCL communication lib')
variant('ht', default=False, description='Builds with support for host-enabled MPI' variant('ht', default=False, description='Builds with support for host-enabled MPI'
' communication of accelerator data') ' communication of accelerator data')
variant('mpi_gpu_rdma', default=False, description='Builds with support for using RMA' variant('cuda_rma', default=False, description='Builds with support for CUDA intra-node '
' features in a MPI-GPU RDMA enabled library') ' Put/Get and IPC RMA functionality')
depends_on('cmake@3.16.0:', type='build') depends_on('cmake@3.16.0:', type='build')
depends_on('mpi') depends_on('mpi')
...@@ -53,9 +53,9 @@ def cmake_args(self): ...@@ -53,9 +53,9 @@ def cmake_args(self):
args.extend([ args.extend([
'-DALUMINUM_ENABLE_HOST_TRANSFER:BOOL=%s' % ('+ht' in spec), '-DALUMINUM_ENABLE_HOST_TRANSFER:BOOL=%s' % ('+ht' in spec),
'-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' %
('+mpi_gpu_rdma' in spec), ('+cuda_rma' in spec),
'-DALUMINUM_ENABLE_MPI_CUDA_RMA:BOOL=%s' % '-DALUMINUM_ENABLE_MPI_CUDA_RMA:BOOL=%s' %
('+mpi_gpu_rdma' in spec)]) ('+cuda_rma' in spec)])
else: else:
args.extend([ args.extend([
'-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+ht' in spec)]) '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+ht' in spec)])
......
...@@ -57,7 +57,7 @@ class Dihydrogen(CMakePackage, CudaPackage): ...@@ -57,7 +57,7 @@ class Dihydrogen(CMakePackage, CudaPackage):
depends_on('catch2', type='test') depends_on('catch2', type='test')
depends_on('aluminum', when='+al ~cuda') depends_on('aluminum', when='+al ~cuda')
depends_on('aluminum +cuda +nccl +ht +mpi_gpu_rdma', when='+al +cuda') depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda')
depends_on('cuda', when=('+cuda' or '+legacy')) depends_on('cuda', when=('+cuda' or '+legacy'))
depends_on('cudnn', when=('+cuda' or '+legacy')) depends_on('cudnn', when=('+cuda' or '+legacy'))
......
...@@ -86,7 +86,7 @@ class Hydrogen(CMakePackage, CudaPackage): ...@@ -86,7 +86,7 @@ class Hydrogen(CMakePackage, CudaPackage):
depends_on('netlib-lapack +external-blas', when='blas=essl') depends_on('netlib-lapack +external-blas', when='blas=essl')
depends_on('aluminum', when='+al ~cuda') depends_on('aluminum', when='+al ~cuda')
depends_on('aluminum +cuda +nccl +ht +mpi_gpu_rdma', when='+al +cuda') depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda')
# Note that this forces us to use OpenBLAS until #1712 is fixed # Note that this forces us to use OpenBLAS until #1712 is fixed
depends_on('lapack', when='blas=openblas ~openmp_blas') depends_on('lapack', when='blas=openblas ~openmp_blas')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment