Update Orion yaml files (#1501)

JCSDA · Feb 7, 2025 · e0b56c9 · e0b56c9
1 parent f87be0e
commit e0b56c9
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 4 deletions.
diff --git a/configs/sites/tier1/orion/compilers.yaml b/configs/sites/tier1/orion/compilers.yaml
@@ -30,3 +30,28 @@ compilers:
     - gcc/12.2.0
     environment: {}
     extra_rpaths: []
+- compiler:
+    spec: oneapi@=2024.2.1
+    paths:
+      cc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icx
+      cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/icpx
+      f77: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
+      fc: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort
+    flags: {}
+    operating_system: rocky9
+    target: x86_64
+    modules:
+    - spack-managed-x86-64_v3
+    - intel-oneapi-compilers/2024.2.1
+    environment:
+      set:
+        # https://github.com/ufs-community/ufs-weather-model/issues/2015#issuecomment-1864438186
+        I_MPI_EXTRA_FILESYSTEM: 'ON'
+        # override system module settings for FC and F77 (they're set to ifx)
+        F77: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
+        FC: '/apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2024.2.1-podbez65l57ms4uba527kg7pomxk5y3m/compiler/2024.2/bin/ifort'
+      prepend_path:
+        PATH: /usr/bin
+        LD_LIBRARY_PATH: /usr/lib:/usr/lib64
+        CPATH: '/usr/include/c++/11:/usr/include/c++/11/x86_64-redhat-linux'
+    extra_rpaths: []
diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml
@@ -32,10 +32,6 @@ packages:
     externals:
     - spec: [email protected]
       prefix: /usr
-  cmake:
-    externals:
-    - spec: [email protected]
-      prefix: /usr
   # Don't use issues with openssl
   #curl:
   #  externals:

diff --git a/configs/sites/tier1/orion/packages_gcc.yaml b/configs/sites/tier1/orion/packages_gcc.yaml
@@ -8,6 +8,7 @@ packages:
   openmpi:
     externals:
     - spec: [email protected]%[email protected] ~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=none romio-filesystem=none schedulers=slurm
+      prefix: /apps/spack-managed/gcc-12.2.0/openmpi-4.1.4-tgam5l5paaiwksys4r7nc5xocwm33iv4
       modules:
       - gcc/12.2.0
       - openmpi/4.1.4
diff --git a/configs/sites/tier1/orion/packages_oneapi.yaml b/configs/sites/tier1/orion/packages_oneapi.yaml
@@ -0,0 +1,52 @@
+packages:
+  all:
+    compiler:: [[email protected]]
+    providers:
+      mpi:: [[email protected]]
+      # Remove the next three lines to switch to intel-oneapi-mkl
+      blas:: [openblas]
+      fftw-api:: [fftw]
+      lapack:: [openblas]
+  mpi:
+    buildable: False
+  intel-oneapi-mpi:
+    buildable: False
+    externals:
+    - spec: [email protected]%[email protected]
+      modules:
+      - spack-managed-x86-64_v3
+      - intel-oneapi-compilers/2024.2.1
+      - [email protected]
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-3pv63eugwmse2xpeglxib4dr2oeb42g2
+
+  intel-oneapi-mkl:
+    buildable: False
+    externals:
+    - spec: [email protected]
+      modules:
+      - spack-managed-x86-64_v3
+      - intel-oneapi-mkl/2024.2.1
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-mkl-2024.2.1-aeiool3i5jj4newwifvkhow5almp67rt
+
+  intel-oneapi-runtime:
+    externals:
+    - spec: [email protected]%[email protected]
+      prefix: /apps/spack-managed-x86_64_v3-v1.0/oneapi-2024.2.1/intel-oneapi-runtime-2024.2.1-hl5zgdjaldynq35dq3yotclfy2vblybx
+      modules:
+      - spack-managed-x86-64_v3
+      - intel-oneapi-compilers/2024.2.1
+      - intel-oneapi-runtime/2024.2.1
+
+  ectrans:
+    require::
+    - '@1.5.0 ~mkl +fftw'
+  gsibec:
+    require::
+    - '@1.2.1 ~mkl'
+  py-numpy:
+    require::
+    - '@1.26'
+    - '^openblas'
+  py-scipy:
+    require:
+      '%gcc'