add aurora machine

E3SM-Project · Dec 11, 2023 · 7fdab8f · 7fdab8f
1 parent 8e8f093
commit 7fdab8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu.cmake
@@ -10,8 +10,8 @@ string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
 string(APPEND CMAKE_Fortran_FLAGS_DEBUG   " -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created")
 string(APPEND CMAKE_C_FLAGS_DEBUG   " -O0 -g")
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
-string(APPEND CMAKE_C_FLAGS   " -traceback -fp-model precise -std=gnu99")
-string(APPEND CMAKE_CXX_FLAGS " -traceback -fp-model precise")
+string(APPEND CMAKE_C_FLAGS   " -fp-model precise -std=gnu99")
+string(APPEND CMAKE_CXX_FLAGS " -fp-model precise")
 string(APPEND CMAKE_Fortran_FLAGS   " -traceback -convert big_endian -assume byterecl -assume realloc_lhs -fp-model precise")
 string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL -DHAVE_SLASHPROC -DHIDE_MPI")
 string(APPEND CMAKE_Fortran_FORMAT_FIXED_FLAG " -fixed -132")
@@ -23,6 +23,4 @@ set(MPICXX "mpicxx")
 set(SCC "icx")
 set(SCXX "icpx")
 set(SFC "ifx")
-string(APPEND CMAKE_EXE_LINKER_FLAGS " -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\"")
diff --git a/cime_config/machines/cmake_macros/oneapi-ifxgpu_aurora.cmake b/cime_config/machines/cmake_macros/oneapi-ifxgpu_aurora.cmake
@@ -1,10 +1,11 @@
 
 set(CXX_LINKER "CXX")
 string(APPEND SLIBS " -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
-string(APPEND SLIBS " -fiopenmp -fopenmp-targets=spir64")
+if (compile_threaded)
+  string(APPEND SLIBS " -fiopenmp -fopenmp-targets=spir64")
+endif()
 set(USE_SYCL "TRUE")
 string(APPEND KOKKOS_OPTIONS " -DCMAKE_CXX_STANDARD=17 -DKokkos_ENABLE_SERIAL=On -DKokkos_ARCH_INTEL_PVC=On -DKokkos_ENABLE_SYCL=On -DKokkos_ENABLE_EXPLICIT_INSTANTIATION=Off")
 string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -mlong-double-64 -Xsycl-target-backend \"-device 12.60.7\"")
-#string(APPEND SYCL_FLAGS " -\-intel -fsycl")
 string(APPEND CXX_LDFLAGS " -Wl,-\-defsym,main=MAIN_\_ -lifcore -\-intel -fsycl -lsycl -mlong-double-64 -Xsycl-target-backend \"-device 12.60.7\"")
-string(APPEND SLIBS " -L$ENV{HDF5_PATH}/lib -lhdf5_hl -lhdf5 -L$ENV{PNETCDF_PATH}/lib -lpnetcdf -L$ENV{NETCDF_PATH}/lib -lnetcdf -lnetcdff")
+string(APPEND SLIBS " -L$ENV{HDF5_PATH}/lib -lhdf5_hl -lhdf5 -L$ENV{PNETCDF_PATH}/lib -lpnetcdf -L$ENV{NETCDF_PATH}/lib -lnetcdf -lnetcdff -Wl,-\-defsym,main=MAIN_\_ -lifcore")
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -3073,7 +3073,8 @@
     </resource_limits>
   </machine>
 
-  <machine MACH="aurora">    <DESC>ANL Aurora ECP machine, Aurora consists of multiple racks, each with many nodes, for a total of over 10,000 nodes, batch system is pbspro</DESC>
+  <machine MACH="aurora">    
+    <DESC>ANL Aurora ECP machine, Aurora consists of multiple racks, each with many nodes, for a total of over 10,000 nodes, batch system is pbspro</DESC>
     <NODENAME_REGEX>aurora-uan-.*</NODENAME_REGEX>    <OS>LINUX</OS>
     <COMPILERS>oneapi-ifx,oneapi-ifxgpu,oneapi-ifort,gnu</COMPILERS>
     <MPILIBS>mpich,impi,openmpi</MPILIBS>
@@ -3131,13 +3132,6 @@
         </modules>
         <modules compiler="!gnu">
           <command name="load">oneapi/eng-compiler/2023.05.15.007</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="load">intel_compute_runtime/release/agama-devel-682.22</command>
         </modules>
         <modules compiler="gnu">
            <command name="unload">spack-pe-gcc cmake</command>