diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2021-08-11 00:12:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 09:12:59 +0200 |
| commit | 128d788363a3c9b9acc91fb019d6e51ab6ffd7c5 (patch) | |
| tree | e770f42d404138d19b089f36d30d2570eb6bb9a3 | |
| parent | 26ed2776e7cfe0c782d9ccefc3bb20ff4f5d4832 (diff) | |
| download | spack-128d788363a3c9b9acc91fb019d6e51ab6ffd7c5.tar.gz spack-128d788363a3c9b9acc91fb019d6e51ab6ffd7c5.tar.bz2 spack-128d788363a3c9b9acc91fb019d6e51ab6ffd7c5.tar.xz spack-128d788363a3c9b9acc91fb019d6e51ab6ffd7c5.zip | |
Changed the LBANN software stack to not explicitly set the Host (#25351)
Transfer protocol in the Aluminum library. If required the Host
Transfer variant +ht should be explicity set.
| -rw-r--r-- | var/spack/repos/builtin/packages/dihydrogen/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hydrogen/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index 1e596cd9fa..338389fee6 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -68,8 +68,8 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): depends_on('aluminum@0.7.0:', when='@:0.0,0.2.1: +al') # Add Aluminum variants - depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda') - depends_on('aluminum +rocm +rccl +ht', when='+al +rocm') + depends_on('aluminum +cuda +nccl +cuda_rma', when='+al +cuda') + depends_on('aluminum +rocm +rccl', when='+al +rocm') for arch in CudaPackage.cuda_arch_values: depends_on('aluminum cuda_arch=%s' % arch, when='+al +cuda cuda_arch=%s' % arch) diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index a00895fcee..597624f67e 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -100,8 +100,8 @@ class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): depends_on('aluminum@0.7.0:', when='@:1.0,1.5.2: +al') # Add Aluminum variants - depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda') - depends_on('aluminum +rocm +rccl +ht', when='+al +rocm') + depends_on('aluminum +cuda +nccl +cuda_rma', when='+al +cuda') + depends_on('aluminum +rocm +rccl', when='+al +rocm') for arch in CudaPackage.cuda_arch_values: depends_on('aluminum cuda_arch=%s' % arch, when='+al +cuda cuda_arch=%s' % arch) diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index e1a965c616..e8c37790e7 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -135,8 +135,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('aluminum@0.5.0:', when='@:0.90,0.102: +al') # Add Aluminum variants - depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda') - depends_on('aluminum +rocm +rccl +ht', when='+al +rocm') + depends_on('aluminum +cuda +nccl +cuda_rma', when='+al +cuda') + depends_on('aluminum +rocm +rccl', when='+al +rocm') depends_on('dihydrogen@0.2.0:', when='@:0.90,0.102:') depends_on('dihydrogen +openmp', when='+dihydrogen') |