Update compiler/MPI entries in site configs for the UE (#480)

* Add ufs-wm-dev template to develop. * Remove ufs-wm-dev template to get fork dev aligned with main dev. * Update .gitmodules * Update .gitmodules Revert to EMC spack-stack dev * Update Orion, Hera site/packages.yaml compiler/mpi configs. * Update compilers/packages YAMLs to include Intel 18 for Hera. * Update compiler/mpi entry formatting in Cheyene packages.yaml to match that needed for UE. * Update .gitmodules * Update Jet compilers.yaml and packages.yaml. --------- Co-authored-by: Cameron Book <bcameron@cheyenne1.cheyenne.ucar.edu>
JCSDA · Feb 22, 2023 · 2538cc6 · 2538cc6
1 parent b6298e9
commit 2538cc6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 15 deletions.
diff --git a/configs/sites/cheyenne/packages.yaml b/configs/sites/cheyenne/packages.yaml
@@ -1,12 +1,10 @@
 packages:
   all:
-    #compiler:: [intel@2022.0.2]
-    compiler:: [intel@19.1.1.217]
-    #compiler:: [gcc@10.1.0]
+    #compiler:: [intel@2022.0.2, gcc@10.1.0]
+    compiler:: [intel@19.1.1.217, gcc@10.1.0]
     providers:
-      #mpi:: [intel-oneapi-mpi@2021.5.1]
-      mpi:: [intel-mpi@2019.7.217]
-      #mpi:: [openmpi@4.1.1]
+      #mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@4.1.1]
+      mpi:: [intel-mpi@2019.7.217, openmpi@4.1.1]
 
 ### MPI, Python, MKL
   mpi:

diff --git a/configs/sites/hera/compilers.yaml b/configs/sites/hera/compilers.yaml
@@ -17,6 +17,18 @@ compilers:
         LD_LIBRARY_PATH: '/apps/gnu/gcc-9.2.0/lib64'
         CPATH: '/apps/gnu/gcc-9.2.0/include'
     extra_rpaths: []
+- compiler:
+    spec: intel@18.0.5.274
+    paths:
+      cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc
+      cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc
+      f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
+      fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
+    flags: {}
+    operating_system: centos7
+    target: any
+    modules:
+    - intel/18.0.5.274
 - compiler:
     spec: gcc@9.2.0
     paths:

diff --git a/configs/sites/hera/packages.yaml b/configs/sites/hera/packages.yaml
@@ -1,10 +1,10 @@
 packages:
   all:
-    compiler:: [intel@2021.5.0]
-    #compiler:: [gcc@9.2.0]
+    compiler:: [intel@2021.5.0, gcc@9.2.0]
+    #compiler:: [intel@18.0.5.274]
     providers:
-      mpi:: [intel-oneapi-mpi@2021.5.1]
-      #mpi:: [openmpi@3.1.4]
+      mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@3.1.4]
+      #mpi:: [intel-mpi@2018.0.4]
   mpi:
     buildable: False
   intel-mpi:

diff --git a/configs/sites/jet/compilers.yaml b/configs/sites/jet/compilers.yaml
@@ -17,6 +17,18 @@ compilers:
         LD_LIBRARY_PATH: '/apps/gnu/gcc-9.2.0/lib64'
         CPATH: '/apps/gnu/gcc-9.2.0/include'
     extra_rpaths: []
+- compiler:
+    spec: intel@18.0.5.274
+    paths:
+      cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc
+      cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc
+      f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
+      fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort
+    flags: {}
+    operating_system: centos7
+    target: any
+    modules:
+    - intel/18.0.5.274
 - compiler:
     spec: gcc@9.2.0
     paths:

diff --git a/configs/sites/jet/packages.yaml b/configs/sites/jet/packages.yaml
@@ -1,16 +1,24 @@
 packages:
   all:
-    compiler:: [intel@2021.5.0]
+    compiler:: [intel@2021.5.0, gcc@9.2.0]
+    #compiler:: [intel@18.0.5.274]
     providers:
-      mpi:: [intel-oneapi-mpi@2021.5.1]
+      mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@3.1.4]
+      #mpi:: [intel-mpi@2018.4.274]
   mpi:
     buildable: False
+  intel-mpi:
+    externals:
+    - spec: intel-mpi@2018.4.274%intel@18.0.5.274
+      prefix: /apps/intel/compilers_and_libraries_2018.5.274/linux/mpi
+      modules:
+      - impi/2018.4.274
   intel-oneapi-mpi:
     externals:
     - spec: intel-oneapi-mpi@2021.5.1%intel@2021.5.0
+      prefix: /apps/oneapi
       modules:
       - impi/2022.1.2
-      prefix: /apps/oneapi
   openmpi:
     externals:
     - spec: openmpi@3.1.4%gcc@9.2.0~cuda+cxx+cxx_exceptions~java~memchecker+pmi+static~wrapper-rpath schedulers=slurm

diff --git a/configs/sites/orion/packages.yaml b/configs/sites/orion/packages.yaml
@@ -1,8 +1,10 @@
 packages:
   all:
-    compiler:: [intel@2022.0.2, intel@18.0.5, gcc@10.2.0]
+    compiler:: [intel@2022.0.2, gcc@10.2.0]
+    #compiler:: [intel@18.0.5]
     providers:
-      mpi:: [intel-oneapi-mpi@2021.5.1, intel-mpi@2018.5.274, openmpi@4.0.4]
+      mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@4.0.4]
+      #mpi:: [intel-mpi@2018.5.274]
 
 ### MPI, Python, MKL
   mpi: