Merge branch 'develop' of https://github.com/jcsda/spack-stack into b…

…ugfix/discover_scu16_ldflags
JCSDA · Mar 5, 2024 · 6514285 · 6514285
2 parents 1132bd5 + f09d1b7
commit 6514285
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/ubuntu-rnd-x86_64.yaml b/.github/workflows/ubuntu-rnd-x86_64.yaml
@@ -188,7 +188,7 @@ jobs:
           ls -l /home/ubuntu/spack-stack/CI/unified-env/${TODAY}/modulefiles/Core
 
           module use /home/ubuntu/spack-stack/CI/unified-env/${TODAY}/modulefiles/Core
-          module load stack-intel/2022.1.0
+          module load stack-intel/2021.6.0
           module load stack-intel-oneapi-mpi/2021.6.0
           module load stack-python/3.10.13
           module available

diff --git a/configs/sites/nautilus/packages.yaml b/configs/sites/nautilus/packages.yaml
@@ -4,8 +4,7 @@ packages:
     providers:
       # For now need to enable one or the other;
       # see https://github.com/JCSDA/spack-stack/issues/659
-      mpi:: [openmpi@4.1.5rc2]
-      #mpi:: [openmpi@4.1.4]
+      mpi:: [openmpi@4.1.6]
       blas:: [intel-oneapi-mkl]
       fftw-api:: [intel-oneapi-mkl]
       lapack:: [intel-oneapi-mkl]
@@ -25,10 +24,10 @@ packages:
   #    prefix: /p/app/compilers/intel/oneapi
   openmpi:
     externals:
-    - spec: openmpi@4.1.5rc2%intel@2021.5.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath fabrics=ucx schedulers=slurm
-      prefix: /p/app/penguin/openmpi/4.1.5rc2/intel
+    - spec: openmpi@4.1.6%intel@2021.5.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath fabrics=ucx schedulers=slurm
+      prefix: /p/app/penguin/openmpi/4.1.6/intel-classic-2022.0.2
       modules:
-      - penguin/openmpi/4.1.5rc2/intel
+      - penguin/openmpi/4.1.6/intel-classic-2022.0.2
       - slurm
     - spec: openmpi@4.1.4%aocc@4.0.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath fabrics=ucx schedulers=slurm
       prefix: /p/app/penguin/openmpi/4.1.4/aoc

diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
@@ -312,7 +312,7 @@ With Intel, the following is required for building new spack environments and fo
 
    module load slurm
    module load intel/compiler/2022.0.2
-   module load penguin/openmpi/4.1.5rc2/intel
+   module load penguin/openmpi/4.1.6/intel-classic-2022.0.2
 
    module use /p/app/projects/NEPTUNE/spack-stack/modulefiles
    module load ecflow/5.8.4
@@ -321,9 +321,9 @@ For ``spack-stack-1.6.0`` with Intel, proceed with loading the following modules
 
 .. code-block:: console
 
-   module use /p/app/projects/NEPTUNE/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
+   module use /p/app/projects/NEPTUNE/spack-stack/spack-stack-1.6.0/envs/ue-openmpi416/install/modulefiles/Core
    module load stack-intel/2021.5.0
-   module load stack-openmpi/4.1.5rc2
+   module load stack-openmpi/4.1.6
    module load stack-python/3.10.13
 
 With AMD clang/flang (aocc), the following is required for building new spack environments and for using spack to build and run software.