Update site config and documentation for Narwhal to use new, official…

… oneapi@2024.2 installation
JCSDA · Oct 16, 2024 · c6a067f · c6a067f
1 parent d6641e4
commit c6a067f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 32 deletions.
diff --git a/configs/sites/tier1/narwhal/compilers.yaml b/configs/sites/tier1/narwhal/compilers.yaml
@@ -22,34 +22,26 @@ compilers::
           CRAYPE_LINK_TYPE: 'dynamic'
       extra_rpaths: []
   - compiler:
-      spec: oneapi@2024.2.1
+      spec: oneapi@2024.2.0
       paths:
-        #cc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/icx
-        #cxx: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/icpx
-        #f77: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/ifort
-        #fc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/bin/ifort
         cc: cc
         cxx: CC
         f77: ftn
         fc: ftn
       flags: {}
       operating_system: sles15
       modules:
-      - PrgEnv-intel/8.3.3
-      - tbb/2021.13
-      - compiler-rt/2024.2.1
-      - compiler/2024.2.1
-      - ifort/2024.2.1
+      - PrgEnv-intel/8.4.0
+      - intel/2024.2
       - cray-libsci/23.05.1.4
       - libfabric/1.12.1.2.2.1
       environment:
         prepend_path:
           PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
           CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
           LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib:/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
-          MODULEPATH: '/p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/modulefiles'
         append_path:
-          CPATH: '/p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/opt/compiler/include/intel64'
+          CPATH: '/opt/intel/oneapi_2024.2.0.634/compiler/2024.2/opt/compiler/include/intel64'
         set:
           CRAYPE_LINK_TYPE: 'dynamic'
       extra_rpaths: []

diff --git a/configs/sites/tier1/narwhal/packages_oneapi.yaml b/configs/sites/tier1/narwhal/packages_oneapi.yaml
@@ -7,26 +7,21 @@ packages:
     buildable: False
   cray-mpich:
     externals:
-    - spec: cray-mpich@8.1.21%intel@2021.10.0 ~wrappers
+    - spec: cray-mpich@8.1.21%oneapi@2024.2.0 ~wrappers
       modules:
       - cray-mpich-ucx/8.1.21
       - craype-network-ucx
   intel-oneapi-mkl:
     externals:
-    - spec: intel-oneapi-mkl@2024.2%oneapi@2024.2.1
-      prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1
-      modules:
-      - mkl/2024.2
+    - spec: intel-oneapi-mkl@2024.2%oneapi@2024.2.0
+      prefix: /opt/intel/oneapi_2024.2.0.634
   intel-oneapi-tbb:
     externals:
-    - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1
-      prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1
+    - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.0
+      prefix: /opt/intel/oneapi_2024.2.0.634
       modules:
       - tbb/2021.13
   intel-oneapi-runtime:
     externals:
-    - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
-      prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1
-      modules:
-      - tbb/2021.13
-      - compiler-rt/2024.2.1
+    - spec: intel-oneapi-runtime@2024.2.0%oneapi@2024.2.0
+      prefix: /opt/intel/oneapi_2024.2.0.634
diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst
@@ -166,19 +166,13 @@ The following is required for building new spack environments with Intel on this
 
 The following is required for building new spack environments with Intel oneAPI on this platform.. Don't use ``module purge`` on Narwhal!
 
-.. note:: This particular setup of the oneAPI compilers is outside the Cray-blessed environment and there are problems installing Python packages with spack.
-
 .. code-block:: console
 
    umask 0022
    module unload PrgEnv-cray
-   module load PrgEnv-intel/8.3.3
+   module load PrgEnv-intel/8.4.0
    module unload intel
-   module use /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/modulefiles
-   module load tbb/2021.13
-   module load compiler-rt/2024.2.1
-   module load compiler/2024.2.1
-   module load ifort/2024.2.1
+   module load intel/2024.2
    module unload cray-mpich
    module unload craype-network-ofi
    # Warning. Do not load craype-network-ucx