Merge branch 'develop' into multichain

JCSDA · Dec 9, 2024 · 17c17ed · 17c17ed
2 parents d52aec5 + 97aa0d4
commit 17c17ed
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -123,7 +123,7 @@ packages:
   hdf-eos2:
     require: '@2.20v1.00'
   ip:
-    require: '@5.0.0 precision=4,d,8'
+    require: '@5.1.0 precision=4,d,8'
   ip2:
     require: '@1.1.2'
   jasper:

diff --git a/configs/common/packages_aocc.yaml b/configs/common/packages_aocc.yaml
@@ -13,3 +13,7 @@ packages:
   py-numpy:
     require:
     - '^openblas'
+  # ip@5 doesn't build with aocc@4 compilers
+  ip:
+    require:
+    - '%gcc'
diff --git a/configs/sites/tier2/blackpearl/packages_aocc.yaml b/configs/sites/tier2/blackpearl/packages_aocc.yaml
@@ -1,5 +1,5 @@
 packages:
   all:
-    compiler:: [[email protected]]
+    compiler:: [[email protected],[email protected]]
     providers:
-      mpi:: [[email protected].3]
+      mpi:: [[email protected].5]
diff --git a/spack-ext/repos/spack-stack/packages/neptune-env/package.py b/spack-ext/repos/spack-stack/packages/neptune-env/package.py
@@ -31,11 +31,7 @@ class NeptuneEnv(BundlePackage):
     depends_on("libyaml", type="run")
     depends_on("p4est", type="run")
     depends_on("w3emc", type="run")
-    depends_on("sp", type="run", when="%aocc")
-    depends_on("ip@5:", type="run", when="%apple-clang")
-    depends_on("ip@5:", type="run", when="%gcc")
-    depends_on("ip@5:", type="run", when="%intel")
-    depends_on("ip@5:", type="run", when="%oneapi")
+    depends_on("ip", type="run")
     depends_on("esmf", type="run")
     depends_on("nco", type="run")
     depends_on("mct", type="run")