diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index fbcf0f5be8ab4a2c1e2d4f4df3daccf42032cddd..ee060b836888750f1d26da2f852e3713fd383043 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -32,8 +32,8 @@ class Aluminum(CMakePackage, CudaPackage): variant('nccl', default=False, description='Builds with support for NCCL communication lib') variant('ht', default=False, description='Builds with support for host-enabled MPI' ' communication of accelerator data') - variant('mpi_gpu_rdma', default=False, description='Builds with support for using RMA' - ' features in a MPI-GPU RDMA enabled library') + variant('cuda_rma', default=False, description='Builds with support for CUDA intra-node ' + ' Put/Get and IPC RMA functionality') depends_on('cmake@3.16.0:', type='build') depends_on('mpi') @@ -53,9 +53,9 @@ def cmake_args(self): args.extend([ '-DALUMINUM_ENABLE_HOST_TRANSFER:BOOL=%s' % ('+ht' in spec), '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % - ('+mpi_gpu_rdma' in spec), + ('+cuda_rma' in spec), '-DALUMINUM_ENABLE_MPI_CUDA_RMA:BOOL=%s' % - ('+mpi_gpu_rdma' in spec)]) + ('+cuda_rma' in spec)]) else: args.extend([ '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+ht' in spec)]) diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index 7f444d8aff8627ccc24ecf0b413eaffabde771ca..db3dfdfb6c4ac70264c0ddaf1b0bc01c55efa0d8 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -57,7 +57,7 @@ class Dihydrogen(CMakePackage, CudaPackage): depends_on('catch2', type='test') 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('cudnn', when=('+cuda' or '+legacy')) diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 41d55416489049f8ad08e3c8bf3030dc55ee313a..8d0bc9398dcac124680160c23064909f058bda13 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -86,7 +86,7 @@ class Hydrogen(CMakePackage, CudaPackage): depends_on('netlib-lapack +external-blas', when='blas=essl') 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 depends_on('lapack', when='blas=openblas ~openmp_blas')