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

This commit is contained in:
Brian Van Essen 2020-08-04 10:52:59 -07:00 committed by GitHub
parent b3dd90b95c
commit 54dc871524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -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):
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)])

View File

@ -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'))

View File

@ -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')