Merge branch 'azamat/sunspot/update-oneapi-20230515007' (PR #5881)

Update Sunspot's OneAPI compiler to 2023.05.15.007 . Also, - add netcdf libs to LD_LIBRARY_PATH after recent CMake updates - rearrange modules by loading defaults after module purge - clean up cmake Fixes #5707 [BFB]
E3SM-Project · Oct 16, 2023 · 2236937 · 2236937
2 parents 0fd8844 + db2cac0
commit 2236937
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 88 deletions.
diff --git a/..._config/machines/Depends.oneapi-ifx.cmake → ...nfig/machines/Depends.oneapi-ifxgpu.cmake b/..._config/machines/Depends.oneapi-ifx.cmake → ...nfig/machines/Depends.oneapi-ifxgpu.cmake
@@ -9,6 +9,3 @@ list(APPEND MPAS_ADD_ACC_FLAGS
 foreach(ITEM IN LISTS MPAS_ADD_ACC_FLAGS)
   e3sm_add_flags("${ITEM}" "-fiopenmp -fopenmp-targets=spir64")
 endforeach()
-
-# compile mpas_seaice_core_interface.f90 with ifort, not ifx
-e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort")
diff --git a/cime_config/machines/cmake_macros/oneapi-ifort.cmake b/cime_config/machines/cmake_macros/oneapi-ifort.cmake
diff --git a/cime_config/machines/cmake_macros/oneapi-ifx_chrysalis.cmake b/cime_config/machines/cmake_macros/oneapi-ifx_chrysalis.cmake
diff --git a/cime_config/machines/cmake_macros/oneapi-ifx_jlse.cmake b/cime_config/machines/cmake_macros/oneapi-ifx_jlse.cmake
diff --git a/cime_config/machines/cmake_macros/oneapi-ifx_sunspot.cmake b/cime_config/machines/cmake_macros/oneapi-ifx_sunspot.cmake
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu.cmake
@@ -30,3 +30,8 @@ set(MPICXX "mpicxx")
 set(SCC "icx")
 set(SCXX "icpx")
 set(SFC "ifx")
+set(CXX_LINKER "CXX")
+string(APPEND SLIBS " -fiopenmp -fopenmp-targets=spir64")
+set(USE_SYCL "TRUE")
+string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend \"-device 12.60.7\"")
+string(APPEND CXX_LDFLAGS " -Wl,-\-defsym,main=MAIN_\_ -lifcore -\-intel -fsycl -lsycl -Xsycl-target-backend \"-device 12.60.7\"")
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu_jlse.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu_jlse.cmake
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu_sunspot.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu_sunspot.cmake
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -2748,7 +2748,7 @@
     <DESC>ANL experimental/evaluation cluster, batch system is cobalt</DESC>
     <NODENAME_REGEX>jlse.*</NODENAME_REGEX>
     <OS>LINUX</OS>
-    <COMPILERS>oneapi-ifx,oneapi-ifxgpu,oneapi-ifort,gnu</COMPILERS>
+    <COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS>
     <MPILIBS>mpich,impi,openmpi</MPILIBS>
     <CIME_OUTPUT_ROOT>/gpfs/jlse-fs0/projects/climate/$USER/scratch</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>/gpfs/jlse-fs0/projects/climate/inputdata</DIN_LOC_ROOT>
@@ -2868,7 +2868,7 @@
     <DESC>ANL Sunspot Test and Development System (TDS), batch system is pbspro</DESC>
     <NODENAME_REGEX>uan-.*</NODENAME_REGEX>
     <OS>LINUX</OS>
-    <COMPILERS>oneapi-ifx,oneapi-ifxgpu,oneapi-ifort,gnu</COMPILERS>
+    <COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS>
     <MPILIBS>mpich,impi,openmpi</MPILIBS>
     <CHARGE_ACCOUNT>CSC249ADSE15_CNDA</CHARGE_ACCOUNT>
     <SAVE_TIMING_DIR>/gila/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR>
@@ -2919,33 +2919,25 @@
        <modules>
           <command name="purge"></command>
           <command name="use">/soft/modulefiles</command>
-          <command name="load">spack cmake</command>
-          <command name="use">/soft/restricted/CNDA/updates/modulefiles</command>
+          <command name="load">spack cmake/3.26.3-gcc-11.2.0-vnn7ncx</command>
+          <command name="load">prepend-deps/default</command>
         </modules>
         <modules compiler="!gnu">
-          <command name="load">oneapi/eng-compiler/2022.12.30.003</command>
-          <command name="load">mpich/52.2/icc-all-pmix-gpu</command>
-          <!--command name="load">oneapi/eng-compiler/.2023.05.15.002-rc02</command-->
-          <!--command name="load">oneapi/eng-compiler/.2023.05.15.003-rc08</command-->
-          <!--command name="load">oneapi/eng-compiler/2022.10.15.006</command-->
-          <!--command name="load">mpich/50.2/icc-all-pmix-gpu</command-->
-          <!--command name="load">intel_compute_runtime/release/22.43.24595.30</command-->
+          <command name="unload">gcc</command>
+          <command name="load">oneapi/eng-compiler/2023.05.15.007</command>
         </modules>
         <modules compiler="gnu">
            <command name="unload">spack cmake</command>
            <command name="load">gcc/10.3.0</command>
         </modules>
-        <modules>
-          <command name="load">cray-pals</command>
-          <command name="load">append-deps/default</command>
-          <command name="load">libfabric/1.15.2.0</command>
-        </modules>
      </module_system>
      <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
      <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
      <environment_variables>
         <env name="NETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf</env>
         <env name="PNETCDF_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/pnetcdf</env>
+        <env name="LD_LIBRARY_PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf/lib:$ENV{LD_LIBRARY_PATH}</env>
+        <env name="PATH">/lus/gila/projects/CSC249ADSE15_CNDA/software/oneAPI.2022.12.30.003/netcdf/bin:$ENV{PATH}</env>
      </environment_variables>
      <environment_variables mpilib="mpich" DEBUG="TRUE">
         <env name="HYDRA_TOPO_DEBUG">1</env>