Split package to support intel classic and oneapi on S4 (#1565)

Author: InnocentSouopgui-NOAA

configs/sites/tier1/s4/packages.yaml

@@ -1,52 +1,4 @@
 packages:
-  all:
-    compiler:: [oneapi@2024.2.1,gcc@10.2.0]
-    #compiler:: [intel@2021.10.0,gcc@10.2.0]
-    providers:
-      mpi:: [intel-oneapi-mpi@2021.13]
-      # mpi:: [intel-oneapi-mpi@2021.10.0]
-      # Remove the next three lines to switch to intel-oneapi-mkl
-      blas:: [openblas]
-      fftw-api:: [fftw]
-      lapack:: [openblas]
-    # spack concretizer gets confused and wants an AVX512 architecture for some packages
-    require:
-      - 'arch=linux-rocky8-skylake'
-
-### MPI, Python, MKL
-  mpi:
-    buildable: False
-  #intel-oneapi-mpi:
-  #  externals:
-  #  - spec: intel-oneapi-mpi@2021.10.0%intel@2021.10.0 +classic-names
-  #    prefix: /opt/intel/oneapi/2024
-  #    modules:
-  #    - intel/2023.2
-  intel-oneapi-mpi:
-    externals:
-    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
-      prefix: /opt/intel/oneapi/2024
-      modules:
-      - intel/2024.2
-  intel-oneapi-mkl:
-    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
-    buildable: False
-    #externals:
-    #- spec: intel-oneapi-mkl@2023.2.0%intel@2021.10.0
-    #  prefix: /opt/intel/oneapi/2024
-    #  modules:
-    #  - intel/2023.2
-  # Remove this section to switch to intel-oneapi-mkl
-  ectrans:
-    require::
-    - '@1.2.0 ~mkl +fftw'
-  gsibec:
-    require::
-    - '@1.2.1 ~mkl'
-  py-numpy:
-    require::
-    - '^openblas'
-
 ### All other external packages listed alphabetically
   autoconf:
     externals:

configs/sites/tier1/s4/packages_intel.yaml

@@ -0,0 +1,46 @@
+packages:
+  all:
+    compiler:: [intel@2021.10.0]
+    providers:
+      mpi:: [intel-oneapi-mpi@2021.10.0]
+      # Remove the next three lines to switch to intel-oneapi-mkl
+      blas:: [openblas]
+      fftw-api:: [fftw]
+      lapack:: [openblas]
+    # spack concretizer gets confused and wants an AVX512 architecture for some packages
+    require:
+      - 'arch=linux-rocky8-skylake'
+
+### MPI, Python, MKL
+  mpi:
+    buildable: False
+  intel-oneapi-mpi:
+    externals:
+    - spec: intel-oneapi-mpi@2021.10.0%intel@2021.10.0 +classic-names
+      prefix: /opt/intel/oneapi/2023.2
+      modules:
+      - intel/2023.2
+  intel-oneapi-mkl:
+    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
+    buildable: False
+    #externals:
+    #- spec: intel-oneapi-mkl@2023.2.0%intel@2021.10.0
+    #  prefix: /opt/intel/oneapi/2023.2
+    #  modules:
+    #  - intel/2023.2
+  # Remove this section to switch to intel-oneapi-mkl
+  ectrans:
+    require::
+    - '@1.2.0 ~mkl +fftw'
+  gsibec:
+    require::
+    - '@1.2.1 ~mkl'
+  py-numpy:
+    require::
+    - '@1.26'
+    - '^openblas'
+  # *DH
+  zlib-ng:
+    require:
+      - '~shared'
+

configs/sites/tier1/s4/packages_oneapi.yaml

@@ -0,0 +1,45 @@
+packages:
+  all:
+    compiler:: [oneapi@2024.2.1]
+    providers:
+      mpi:: [intel-oneapi-mpi@2021.13]
+      # Remove the next three lines to switch to intel-oneapi-mkl
+      blas:: [openblas]
+      fftw-api:: [fftw]
+      lapack:: [openblas]
+    # spack concretizer gets confused and wants an AVX512 architecture for some packages
+    require:
+      - 'arch=linux-rocky8-skylake'
+
+### MPI, Python, MKL
+  mpi:
+    buildable: False
+  intel-oneapi-mpi:
+    externals:
+    - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
+      prefix: /opt/intel/oneapi/2024
+      modules:
+      - intel/2024.2
+  intel-oneapi-mkl:
+    # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
+    buildable: False
+    #externals:
+    #- spec: intel-oneapi-mkl@2023.2.0%intel@2021.10.0
+    #  prefix: /opt/intel/oneapi/2024
+    #  modules:
+    #  - intel/2023.2
+  # Remove this section to switch to intel-oneapi-mkl
+  ectrans:
+    require::
+    - '@1.2.0 ~mkl +fftw'
+  gsibec:
+    require::
+    - '@1.2.1 ~mkl'
+  py-numpy:
+    require::
+    - '@1.26'
+    - '^openblas'
+  # *DH
+  zlib-ng:
+    require:
+      - '~shared'