Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/machines/cmake_macros/nvidiagpu.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
set(SCC "nvcc")
set(SCC "nvc")
set(SCXX "nvc++")
set(SFC "nvfortran")
string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRNVIDIA")
Expand Down
3 changes: 0 additions & 3 deletions cime_config/machines/cmake_macros/polaris_gnu.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ endif()
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
set(SCC "cc")
set(SCXX "CC")
set(SFC "ftn")
3 changes: 0 additions & 3 deletions cime_config/machines/cmake_macros/polaris_gnugpu.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ set(E3SM_LINK_WITH_FORTRAN "TRUE")
set(MPICC "cc")
set(MPICXX "CC")
set(MPIFC "ftn")
set(SCC "cc")
set(SCXX "CC")
set(SFC "ftn")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L$ENV{CUDA_HOME}/lib64/ -lstdc++ ")
3 changes: 0 additions & 3 deletions cime_config/machines/cmake_macros/polaris_nvidia.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ string(APPEND CONFIG_ARGS " --host=cray")
if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
endif()
set(SCC "cc")
set(SCXX "CC")
set(SFC "ftn")
3 changes: 0 additions & 3 deletions cime_config/machines/cmake_macros/polaris_nvidiagpu.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@ string(APPEND CPPDEFS " -DTHRUST_IGNORE_CUB_VERSION_CHECK")
string(APPEND CMAKE_CUDA_FLAGS " -ccbin CC -O2 -arch sm_80 --use_fast_math")
set(CMAKE_CUDA_ARCHITECTURES "80")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -acc=gpu -gpu=cc80 -Minfo=accel")
set(SCC "cc")
set(SCXX "CC")
set(SFC "ftn")
string(APPEND CMAKE_Fortran_FLAGS " -acc=gpu -gpu=cc80 -Minfo=accel")
13 changes: 7 additions & 6 deletions cime_config/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3484,23 +3484,24 @@
<command name="load">craype-accel-host</command>
</modules>
<modules compiler="gnu.*">
<command name="load">PrgEnv-gnu/8.6.0</command>
<command name="load">gcc-native/13.2</command>
<command name="load">PrgEnv-gnu/8.7.0</command>
<command name="load">gcc-native/14</command>
<command name="load">hdf5/1.14.6</command>
<command name="load">netcdf/4.9.3c-4.6.2f</command>
</modules>
<modules compiler="nvidia.*">
<command name="load">PrgEnv-nvidia/8.6.0</command>
<command name="load">PrgEnv-nvidia/8.7.0</command>
<command name="load">hdf5-nvidia/1.14.6</command>
<command name="load">netcdf-nvidia/4.9.3c-4.6.2f</command>
</modules>
<modules compiler=".*gpu">
<command name="load">cuda/12.9</command>
<command name="load">cuda/13.0</command>
<command name="load">craype-accel-nvidia80</command>
</modules>
<modules>
<command name="load">cray-libsci/25.03.0</command>
<command name="load">cray-parallel-netcdf/1.12.3.13</command>
<command name="load">cray-libsci/26.03.0</command>
<command name="load">cray-parallel-netcdf/1.12.3.21</command>
<command name="rm">darshan</command>
</modules>
</module_system>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand Down