spack environment file updates for LC

GEOS-DEV · Aug 29, 2024 · a62fc20 · a62fc20
1 parent ced4677
commit a62fc20
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml
@@ -13,13 +13,16 @@
 # geosx@develop%[email protected]+cuda cuda_arch=70 ^[email protected]+allow-unsupported-compilers
 # geosx@develop%[email protected]+cuda cuda_arch=70 ^[email protected]+allow-unsupported-compilers
 # geosx@develop%[email protected]+cuda cuda_arch=70 ^[email protected]+allow-unsupported-compilers
+# geosx@develop%[email protected]+cuda cuda_arch=70 ^[email protected]+allow-unsupported-compilers
 #
 # Uberenv command to build geos dependencies:
 # python3 ./scripts/uberenv/uberenv.py --spec="%[email protected]+cuda~uncrustify cuda_arch=70 ^[email protected]+allow-unsupported-compilers"
 #
 # python3 ./scripts/uberenv/uberenv.py --spec="%[email protected]+cuda~uncrustify cuda_arch=70 ^[email protected]+allow-unsupported-compilers"
 #
 # python3 ./scripts/uberenv/uberenv.py --spec="%[email protected]+cuda~uncrustify cuda_arch=70 ^[email protected]+allow-unsupported-compilers"
+#
+# python3 ./scripts/uberenv/uberenv.py --spec="%[email protected]+cuda~uncrustify cuda_arch=70 ^[email protected]+allow-unsupported-compilers"
 
 
 spack:
@@ -87,23 +90,33 @@ spack:
         blas: [essl]
         lapack: [essl]
 
+    # v0.6.2
     blt:
-      require: "@git.5a792c1775e7a7628d84dcde31652a689f1df7b5=develop"
+      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
 
+    # Develop - 7/31/24
     hypre:
-      require: "@git.d475cdfc63ac59ea9a554493a06e4033b8d6fade"
+      require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
+    # v2024.07.0
     chai:
-      require: "@git.6fe3470ad020303530af2f3dbbfe18826bd3319b=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
+    # v2024.07.0
     umpire:
-      require: "@git.4bd9b2ded81d3216b3f62e2aad62d0e34fe2c256=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
+    # v2024.07.0
     raja:
-      require: "@git.e330b2560747d5417cd7bd265fab3fb91d32ecbd=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
+    # v2024.07.0
     camp:
-      require: "@git.ac34c25b722a06b138bc045d38bfa5e8fa3ec9c5=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
+
+    # v0.9.2
+    conduit:
+      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
 
     uncrustify:
       require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
@@ -133,6 +146,8 @@ spack:
       externals:
       - spec: [email protected] +allow-unsupported-compilers
         prefix: /usr/tce/packages/cuda/cuda-11.8.0
+      - spec: [email protected] +allow-unsupported-compilers
+        prefix: /usr/tce/packages/cuda/cuda-12.0.0
 
   # System level packages to not build
     cmake:

diff --git a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml
@@ -13,7 +13,7 @@
 # geosx@develop%[email protected]
 # geosx@develop%[email protected]
 #
-# Uberenv command to build pygeosx dependencies:
+# Uberenv command to build geos dependencies:
 # python3 ./scripts/uberenv/uberenv.py --spec="%[email protected] +docs"
 #
 # python3 ./scripts/uberenv/uberenv.py --spec="%[email protected] +docs"
@@ -68,23 +68,33 @@ spack:
         blas: [intel-oneapi-mkl]
         lapack: [intel-oneapi-mkl]
 
+    # v0.6.2
     blt:
-      require: "@git.5a792c1775e7a7628d84dcde31652a689f1df7b5=develop"
+      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
 
+    # Develop - 7/31/24
     hypre:
-      require: "@git.d475cdfc63ac59ea9a554493a06e4033b8d6fade"
+      require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
+    # v2024.07.0
     chai:
-      require: "@git.6fe3470ad020303530af2f3dbbfe18826bd3319b=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
+    # v2024.07.0
     umpire:
-      require: "@git.4bd9b2ded81d3216b3f62e2aad62d0e34fe2c256=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
+    # v2024.07.0
     raja:
-      require: "@git.e330b2560747d5417cd7bd265fab3fb91d32ecbd=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
+    # v2024.07.0
     camp:
-      require: "@git.ac34c25b722a06b138bc045d38bfa5e8fa3ec9c5=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
+
+    # v0.9.2
+    conduit:
+      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
 
     uncrustify:
       require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
@@ -96,9 +106,9 @@ spack:
     mvapich2:
       buildable: False
       externals:
-        - spec: [email protected]%[email protected]
+        - spec: [email protected]%[email protected] process_managers=slurm
           prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-12.1.1-magic
-        - spec: [email protected]%[email protected]
+        - spec: [email protected]%[email protected] process_managers=slurm
           prefix:  /usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6-magic
 
     intel-oneapi-mkl:

diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py
@@ -9,6 +9,8 @@
 import socket
 import os
 
+import llnl.util.tty as tty
+
 from os import environ as env
 from os.path import join as pjoin
 
@@ -358,7 +360,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None):
                         mpiexec = os.path.join(spec["mpi"].prefix.bin, "mpiexec")
 
                 if not os.path.exists(mpiexec):
-                    msg = "Unable to determine MPIEXEC, %s tests may fail" % self.pkg.name
+                    msg = "Unable to determine MPIEXEC, geos tests may fail"
                     cfg.write("# {0}\n".format(msg))
                     tty.warn(msg)
                 else: