diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2020-08-04 10:52:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 12:52:59 -0500 |
| commit | 54dc871524613c00b2d8209ddbdee0519ce36472 (patch) | |
| tree | 774290f5f5bb363b7ce820604c9369633c281c93 | |
| parent | b3dd90b95ceef1262d98efd8103dde87d7d8b7c8 (diff) | |
| download | spack-54dc871524613c00b2d8209ddbdee0519ce36472.tar.gz spack-54dc871524613c00b2d8209ddbdee0519ce36472.tar.bz2 spack-54dc871524613c00b2d8209ddbdee0519ce36472.tar.xz spack-54dc871524613c00b2d8209ddbdee0519ce36472.zip | |
Renamed the aluminum variant for thhe intra-node RMA functions. (#17861)
| -rw-r--r-- | var/spack/repos/builtin/packages/aluminum/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dihydrogen/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hydrogen/package.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index fbcf0f5be8..ee060b8368 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 @@ class Aluminum(CMakePackage, CudaPackage): 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 7f444d8aff..db3dfdfb6c 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 41d5541648..8d0bc9398d 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') |