Hydrogen: update dependency on aluminum (#14760)

* Hydrogen now depends on `aluminum +nccl` vs. `aluminum +mpi_cuda`
* Hydrogen: Simplify Mac OS OpenMP-detection logic
* Aluminum: Add Mac OS OpenMP-detection logic
* LBANN: depend on conduit@0.4.0: instead of conduit@master

3 files changed, 19 insertions, 11 deletions

diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py
index 535f4df5f2..5edc4c3792 100644
--- a/var/spack/repos/builtin/packages/aluminum/package.py
+++ b/var/spack/repos/builtin/packages/aluminum/package.py
@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import os
 from spack import *
 
 
@@ -45,4 +46,13 @@ class Aluminum(CMakePackage):
             '-DALUMINUM_ENABLE_CUDA:BOOL=%s' % ('+gpu' in spec),
             '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+mpi_cuda' in spec),
             '-DALUMINUM_ENABLE_NCCL:BOOL=%s' % ('+nccl' in spec)]
+
+        # Add support for OS X to find OpenMP
+        if (self.spec.satisfies('%clang platform=darwin')):
+            clang = self.compiler.cc
+            clang_bin = os.path.dirname(clang)
+            clang_root = os.path.dirname(clang_bin)
+            args.extend([
+                '-DOpenMP_DIR={0}'.format(clang_root)])
+
         return args
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index 1607bc7319..625c336fff 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 import os
-import sys
 from spack import *
 
 
@@ -83,7 +82,7 @@ class Hydrogen(CMakePackage):
     depends_on('netlib-lapack +external-blas', when='blas=essl')
 
     depends_on('aluminum', when='+al ~cuda')
-    depends_on('aluminum +gpu +mpi_cuda', when='+al +cuda')
+    depends_on('aluminum +gpu +nccl', when='+al +cuda')
 
     # Note that this forces us to use OpenBLAS until #1712 is fixed
     depends_on('lapack', when='blas=openblas ~openmp_blas')
@@ -135,13 +134,12 @@ class Hydrogen(CMakePackage):
         ]
 
         # Add support for OS X to find OpenMP
-        if (self.spec.satisfies('%clang')):
-            if (sys.platform == 'darwin'):
-                clang = self.compiler.cc
-                clang_bin = os.path.dirname(clang)
-                clang_root = os.path.dirname(clang_bin)
-                args.extend([
-                    '-DOpenMP_DIR={0}'.format(clang_root)])
+        if (self.spec.satisfies('%clang platform=darwin')):
+            clang = self.compiler.cc
+            clang_bin = os.path.dirname(clang)
+            clang_root = os.path.dirname(clang_bin)
+            args.extend([
+                '-DOpenMP_DIR={0}'.format(clang_root)])
 
         if 'blas=openblas' in spec:
             args.extend([
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index ca7d03703c..cd8b81c3d5 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -100,8 +100,8 @@ class Lbann(CMakePackage):
     depends_on('cnpy')
     depends_on('nccl', when='@0.94:0.98.2 +gpu +nccl')
 
-    depends_on('conduit@master +hdf5', when='@0.94:0.99 +conduit')
-    depends_on('conduit@master +hdf5', when='@:0.90,0.99:')
+    depends_on('conduit@0.4.0: +hdf5', when='@0.94:0.99 +conduit')
+    depends_on('conduit@0.4.0: +hdf5', when='@:0.90,0.99:')
 
     depends_on('python@3: +shared', type=('build', 'run'), when='@:0.90,0.99:')
     extends("python")