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

…eature/merge_spack_develop_20230710
climbfuji · Jul 17, 2023 · fb5ff62 · fb5ff62
2 parents c3d03df + c5291b1
commit fb5ff62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/configs/sites/hercules/compilers.yaml b/configs/sites/hercules/compilers.yaml
@@ -1,18 +1,18 @@
 compilers:
 - compiler:
-    spec: intel@2021.7.1
+    spec: intel@2021.9.0
     paths:
-      cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icc
-      cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icpc
-      f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort
-      fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort
+      cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icc
+      cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc
+      f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
+      fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort
     flags:
       cflags: -diag-disable=10441
       cxxflags: -diag-disable=10441
     operating_system: rocky9
     target: x86_64
     modules:
-    - intel-oneapi-compilers/2022.2.1
+    - intel-oneapi-compilers/2023.1.0
     environment: {}
     extra_rpaths: []
 # Spack gets confused if both intel and oneapi are present

diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml
@@ -1,23 +1,18 @@
 packages:
   all:
-    compiler:: [[email protected], [email protected]]
-    #compiler:: [[email protected]]
+    compiler:: [[email protected], [email protected]]
     providers:
-      mpi:: [intel-oneapi-mpi@2021.7.1, [email protected]]
+      mpi:: [intel-oneapi-mpi@2021.9.0, [email protected]]
 
 ### MPI, Python, MKL
   mpi:
     buildable: False
   intel-oneapi-mpi:
     externals:
-    - spec: intel-oneapi-mpi@2021.7.1%intel@2021.7.1
-      prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh
+    - spec: intel-oneapi-mpi@2021.9.0%intel@2021.9.0
+      prefix: /apps/spack-managed/oneapi-2023.1.0/intel-oneapi-mpi-2021.9.0-a66eaipzsnyrdgaqzxmqmqz64qzvhkse 
       modules:
-      - intel-oneapi-mpi/2021.7.1
-    #- spec: [email protected]%[email protected]
-    #  prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh
-    #  modules:
-    #  - intel-oneapi-mpi/2021.7.1
+      - intel-oneapi-mpi/2021.9.0
   openmpi:
     externals:
     - spec: [email protected]%[email protected]~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath