Skip to content

Commit 651ba75

Browse files
amametjanovamametjanov
committed
Merge branch 'azamat/machines/sunspot20240816' into next (PR #6553)
Update ALCF Sunspot and Aurora machine configs. [BFB]
2 parents 088f75b + 4b5cf35 commit 651ba75

File tree

12 files changed

+103
-63
lines changed

12 files changed

+103
-63
lines changed

‎cime_config/allactive/config_pesall.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,21 @@
14721472
</rootpe>
14731473
</pes>
14741474
</mach>
1475+
<mach name="sunspot|aurora">
1476+
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+SGLC_SWAV_SIAC_SESP_BGC.*" pesize="any">
1477+
<comment>sunspot|aurora: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 2 nodes pure-MPI</comment>
1478+
<ntasks>
1479+
<ntasks_atm>-2</ntasks_atm>
1480+
<ntasks_lnd>-2</ntasks_lnd>
1481+
<ntasks_rof>-2</ntasks_rof>
1482+
<ntasks_ice>-2</ntasks_ice>
1483+
<ntasks_ocn>-2</ntasks_ocn>
1484+
<ntasks_cpl>-2</ntasks_cpl>
1485+
<ntasks_glc>-2</ntasks_glc>
1486+
<ntasks_wav>-2</ntasks_wav>
1487+
</ntasks>
1488+
</pes>
1489+
</mach>
14751490
</grid>
14761491
<grid name="a%ne30np4.pg2_l%r05_oi%IcosXISC30E3r7_r%r05_.+">
14771492
<mach name="chrysalis">
@@ -1744,6 +1759,21 @@
17441759
</nthrds>
17451760
</pes>
17461761
</mach>
1762+
<mach name="sunspot|aurora">
1763+
<pes compset="any" pesize="any">
1764+
<comment>allactive+sunspot|aurora: default, 96 mpi x 1 omp @ root 0</comment>
1765+
<ntasks>
1766+
<ntasks_atm>96</ntasks_atm>
1767+
<ntasks_lnd>96</ntasks_lnd>
1768+
<ntasks_rof>96</ntasks_rof>
1769+
<ntasks_ice>96</ntasks_ice>
1770+
<ntasks_ocn>96</ntasks_ocn>
1771+
<ntasks_glc>96</ntasks_glc>
1772+
<ntasks_wav>96</ntasks_wav>
1773+
<ntasks_cpl>96</ntasks_cpl>
1774+
</ntasks>
1775+
</pes>
1776+
</mach>
17471777
</grid>
17481778
<grid name="a%ne30np4">
17491779
<mach name="pm-gpu|muller-gpu">

‎cime_config/machines/Depends.oneapi-ifxgpu.cmake‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11

2-
set(CPPDEFS "${CPPDEFS} -DMPAS_OPENMP_OFFLOAD")
3-
list(APPEND MPAS_ADD_ACC_FLAGS
4-
${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_mesh_pool.f90
5-
${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_velocity_solver_variational.f90
6-
${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_velocity_solver.f90
7-
)
8-
9-
foreach(ITEM IN LISTS MPAS_ADD_ACC_FLAGS)
10-
e3sm_add_flags("${ITEM}" "-fiopenmp -fopenmp-targets=spir64")
11-
endforeach()
12-
132
# compile mpas_seaice_core_interface.f90 with ifort, not ifx
14-
e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort")
3+
if (NOT MPILIB STREQUAL "openmpi")
4+
e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort")
5+
endif()

‎cime_config/machines/cmake_macros/oneapi-ifx.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ endif()
77
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
88
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
99
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
10-
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created")
10+
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -fpe0")
1111
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g")
1212
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
1313
string(APPEND CMAKE_C_FLAGS " -fp-model precise -std=gnu99")

‎cime_config/machines/cmake_macros/oneapi-ifxgpu.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ endif()
77
string(APPEND CMAKE_C_FLAGS_RELEASE " -O2")
88
string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2")
99
string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O2")
10-
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created")
10+
string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -O0 -g -fpe0")
1111
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g")
1212
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g")
1313
string(APPEND CMAKE_C_FLAGS " -fp-model precise -std=gnu99")

‎cime_config/machines/cmake_macros/oneapi-ifxgpu_aurora.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS " -lmkl_intel_lp64 -lmkl_sequential -lmkl_c
33
if (compile_threaded)
44
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fiopenmp -fopenmp-targets=spir64")
55
endif()
6-
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")
76
string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -mlong-double-64 -Xsycl-target-backend \"-device 12.60.7\"")
7+
string(APPEND CMAKE_CXX_FLAGS " -Xclang -fsycl-allow-virtual-functions")

‎cime_config/machines/cmake_macros/oneapi-ifxgpu_sunspot.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
3+
if (compile_threaded)
4+
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fiopenmp -fopenmp-targets=spir64")
5+
endif()
6+
string(APPEND SYCL_FLAGS " -\-intel -fsycl -fsycl-targets=spir64_gen -mlong-double-64 -Xsycl-target-backend \"-device 12.60.7\"")
7+
string(APPEND CMAKE_CXX_FLAGS " -Xclang -fsycl-allow-virtual-functions")

‎cime_config/machines/config_batch.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@
562562
</batch_system>
563563

564564
<batch_system MACH="aurora" type="pbspro">
565-
<batch_submit>/lus/gecko/projects/CSC249ADSE15_CNDA/tools/qsub/throttle</batch_submit>
565+
<batch_submit>/lus/flare/projects/CSC249ADSE15_CNDA/tools/qsub/throttle</batch_submit>
566566
<queues>
567567
<queue walltimemax="00:59:00" jobmin="1" jobmax="2560" default="true">EarlyAppAccess</queue>
568568
<queue walltimemax="00:59:00" jobmin="1" jobmax="10624">workq-route</queue>

‎cime_config/machines/config_machines.xml‎

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,7 +3367,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
33673367
<NODENAME_REGEX>uan-.*</NODENAME_REGEX>
33683368
<OS>LINUX</OS>
33693369
<COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS>
3370-
<MPILIBS>mpich,impi,openmpi</MPILIBS>
3370+
<MPILIBS>mpich</MPILIBS>
33713371
<CHARGE_ACCOUNT>CSC249ADSE15_CNDA</CHARGE_ACCOUNT>
33723372
<SAVE_TIMING_DIR>/gila/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR>
33733373
<SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
@@ -3387,7 +3387,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
33873387
<MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">104</MAX_TASKS_PER_NODE>
33883388
<MAX_MPITASKS_PER_NODE>104</MAX_MPITASKS_PER_NODE>
33893389
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifx">104</MAX_MPITASKS_PER_NODE>
3390-
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">12</MAX_MPITASKS_PER_NODE>
3390+
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE>
33913391
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
33923392
<mpirun mpilib="default">
33933393
<executable>mpiexec</executable>
@@ -3400,13 +3400,6 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
34003400
<arg name="gpu_maps">$ENV{GPU_TILE_COMPACT}</arg>
34013401
</arguments>
34023402
</mpirun>
3403-
<mpirun mpilib="openmpi">
3404-
<executable>mpirun</executable>
3405-
<arguments>
3406-
<arg name="num_tasks">--tag-output -n {{ total_tasks }}</arg>
3407-
<arg name="tasks_per_node"> --map-by ppr:{{ tasks_per_numa }}:socket:PE=$ENV{OMP_NUM_THREADS} --bind-to hwthread</arg>
3408-
</arguments>
3409-
</mpirun>
34103403
<module_system type="module" allow_error="true">
34113404
<init_path lang="sh">/soft/packaging/lmod/lmod/init/sh</init_path>
34123405
<init_path lang="csh">/soft/packaging/lmod/lmod/init/csh</init_path>
@@ -3415,14 +3408,13 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
34153408
<cmd_path lang="csh">module</cmd_path>
34163409
<cmd_path lang="python">/soft/packaging/lmod/lmod/libexec/lmod python</cmd_path>
34173410
<modules>
3418-
<command name="purge"></command>
3419-
<command name="use">/soft/modulefiles</command>
3420-
<command name="load">spack cmake/3.26.3-gcc-11.2.0-vnn7ncx</command>
3421-
<command name="load">prepend-deps/default</command>
3411+
<command name="load">cmake</command>
34223412
</modules>
34233413
<modules compiler="!gnu">
3424-
<command name="unload">gcc</command>
3425-
<command name="load">oneapi/eng-compiler/2023.05.15.007</command>
3414+
<command name="load">oneapi/eng-compiler/2024.04.15.002</command>
3415+
</modules>
3416+
<modules compiler="oneapi-ifxgpu">
3417+
<command name="load">kokkos/git.7ff87a5-omp-sycl</command>
34263418
</modules>
34273419
<modules compiler="gnu">
34283420
<command name="unload">spack cmake</command>
@@ -3440,12 +3432,6 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
34403432
<environment_variables mpilib="mpich" DEBUG="TRUE">
34413433
<env name="HYDRA_TOPO_DEBUG">1</env>
34423434
</environment_variables>
3443-
<environment_variables mpilib="impi">
3444-
<env name="I_MPI_DEBUG">10</env>
3445-
<env name="I_MPI_PIN_DOMAIN">omp</env>
3446-
<env name="I_MPI_PIN_ORDER">spread</env>
3447-
<env name="I_MPI_PIN_CELL">unit</env>
3448-
</environment_variables>
34493435
<environment_variables compiler="oneapi-ifxgpu">
34503436
<env name="ONEAPI_DEVICE_SELECTOR">level_zero:gpu</env>
34513437
<env name="ONEAPI_MPICH_GPU">NO_GPU</env>
@@ -3458,6 +3444,9 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
34583444
<env name="GPU_TILE_COMPACT">/soft/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
34593445
<env name="FI_CXI_DEFAULT_CQ_SIZE">131072</env>
34603446
<env name="FI_CXI_CQ_FILL_PERCENT">20</env>
3447+
<env name="Kokkos_ROOT">$ENV{KOKKOS_ROOT}</env>
3448+
<env name="ZES_ENABLE_SYSMAN">1</env>
3449+
<env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4</env>
34613450
</environment_variables>
34623451
<environment_variables compiler="oneapi-ifx">
34633452
<env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 -->
@@ -3487,14 +3476,14 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
34873476
<COMPILERS>oneapi-ifx,oneapi-ifxgpu,gnu</COMPILERS>
34883477
<MPILIBS>mpich</MPILIBS>
34893478
<CHARGE_ACCOUNT>CSC249ADSE15_CNDA</CHARGE_ACCOUNT>
3490-
<SAVE_TIMING_DIR>/lus/gecko/projects/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR>
3479+
<SAVE_TIMING_DIR>/lus/flare/projects/CSC249ADSE15_CNDA/performance_archive</SAVE_TIMING_DIR>
34913480
<SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
3492-
<CIME_OUTPUT_ROOT>/lus/gecko/projects/CSC249ADSE15_CNDA/$USER/scratch</CIME_OUTPUT_ROOT>
3493-
<DIN_LOC_ROOT>/lus/gecko/projects/CSC249ADSE15_CNDA/inputdata</DIN_LOC_ROOT>
3494-
<DIN_LOC_ROOT_CLMFORC>/lus/gecko/projects/CSC249ADSE15_CNDA/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
3481+
<CIME_OUTPUT_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/$USER/scratch</CIME_OUTPUT_ROOT>
3482+
<DIN_LOC_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/inputdata</DIN_LOC_ROOT>
3483+
<DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/CSC249ADSE15_CNDA/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
34953484
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
3496-
<BASELINE_ROOT>/lus/gecko/projects/CSC249ADSE15_CNDA/baselines/$COMPILER</BASELINE_ROOT>
3497-
<CCSM_CPRNC>/lus/gecko/projects/CSC249ADSE15_CNDA/tools/cprnc/cprnc</CCSM_CPRNC>
3485+
<BASELINE_ROOT>/lus/flare/projects/CSC249ADSE15_CNDA/baselines/$COMPILER</BASELINE_ROOT>
3486+
<CCSM_CPRNC>/lus/flare/projects/CSC249ADSE15_CNDA/tools/cprnc/cprnc</CCSM_CPRNC>
34983487
<GMAKE_J>16</GMAKE_J>
34993488
<TESTS>e3sm_developer</TESTS>
35003489
<NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -3503,54 +3492,48 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
35033492
<MAX_TASKS_PER_NODE>208</MAX_TASKS_PER_NODE>
35043493
<MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">104</MAX_TASKS_PER_NODE>
35053494
<MAX_MPITASKS_PER_NODE>104</MAX_MPITASKS_PER_NODE>
3506-
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">12</MAX_MPITASKS_PER_NODE>
3495+
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">48</MAX_MPITASKS_PER_NODE>
35073496
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
35083497
<mpirun mpilib="default">
35093498
<executable>mpiexec</executable>
35103499
<!--executable>numactl -m 2-3 mpiexec</executable--><!--for HBM runs-->
35113500
<arguments>
35123501
<arg name="total_num_tasks">-np {{ total_tasks }} --label</arg>
35133502
<arg name="ranks_per_node">-ppn {{ tasks_per_node }}</arg>
3514-
<arg name="ranks_bind">--cpu-bind $ENV{RANKS_BIND} -envall</arg>
3503+
<arg name="ranks_bind">-envall</arg>
35153504
<arg name="threads_per_rank">-d $ENV{OMP_NUM_THREADS}</arg>
35163505
<arg name="gpu_maps">$ENV{GPU_TILE_COMPACT}</arg>
35173506
</arguments>
35183507
</mpirun>
35193508
<module_system type="module" allow_error="true">
3520-
<init_path lang="sh">/lus/gecko/projects/CSC249ADSE15_CNDA/modules/lmod.sh</init_path>
3509+
<init_path lang="sh">/lus/flare/projects/CSC249ADSE15_CNDA/modules/lmod.sh</init_path>
35213510
<init_path lang="csh">/soft/sunspot_migrate/soft/packaging/lmod/lmod/init/csh</init_path>
35223511
<init_path lang="python">/soft/sunspot_migrate/soft/packaging/lmod/lmod/init/env_modules_python.py</init_path>
35233512
<cmd_path lang="sh">module</cmd_path>
35243513
<cmd_path lang="csh">module</cmd_path>
35253514
<cmd_path lang="python">/soft/sunspot_migrate/soft/packaging/lmod/lmod/libexec/lmod python</cmd_path>
35263515
<modules>
3527-
<command name="purge"></command>
3528-
<command name="use">/soft/modulefiles</command>
3529-
<command name="use">/soft/restricted/CNDA/updates/modulefiles</command>
3530-
<command name="load">spack-pe-gcc cmake</command>
3516+
<command name="load">cmake</command>
35313517
</modules>
35323518
<modules compiler="!gnu">
3533-
<command name="load">oneapi/eng-compiler/2023.05.15.007</command>
3519+
<command name="load">oneapi/eng-compiler/2024.04.15.002</command>
3520+
</modules>
3521+
<modules compiler="oneapi-ifxgpu">
3522+
<command name="load">kokkos/git.7ff87a5-omp-sycl</command>
35343523
</modules>
35353524
<modules compiler="gnu">
35363525
<command name="unload">spack-pe-gcc cmake</command>
35373526
<command name="load">gcc/10.3.0</command>
35383527
</modules>
3539-
<modules>
3540-
<command name="load">cray-pals</command>
3541-
<command name="load">libfabric/1.15.2.0</command>
3542-
<command name="load">cray-libpals/1.3.2</command>
3543-
</modules>
35443528
</module_system>
35453529
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
35463530
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
35473531
<environment_variables>
3548-
<env name="NETCDF_C_PATH">/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2023.05.15.007</env>
3549-
<env name="NETCDF_FORTRAN_PATH">/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2023.05.15.007</env>
3550-
<env name="PNETCDF_PATH">/lus/gecko/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2023.05.15.007</env>
3551-
<env name="LD_LIBRARY_PATH">/lus/gecko/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2023.05.15.007/lib:/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2023.05.15.007/lib:/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2023.05.15.007/lib:$ENV{LD_LIBRARY_PATH}</env>
3552-
<env name="PATH">/lus/gecko/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2023.05.15.007/bin:/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2023.05.15.007/bin:/lus/gecko/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2023.05.15.007/bin:$ENV{PATH}</env>
3553-
<env name="RANKS_BIND">list:0-7,104-111:8-15,112-119:16-23,120-127:24-31,128-135:32-39,136-143:40-47,144-151:52-59,156-163:60-67,164-171:68-75,172-179:76-83,180-187:84-91,188-195:92-99,196-203</env>
3532+
<env name="NETCDF_C_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002</env>
3533+
<env name="NETCDF_FORTRAN_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002</env>
3534+
<env name="PNETCDF_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002</env>
3535+
<env name="LD_LIBRARY_PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002/lib:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002/lib:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002/lib:$ENV{LD_LIBRARY_PATH}</env>
3536+
<env name="PATH">/lus/flare/projects/CSC249ADSE15_CNDA/software/pnetcdf/1.12.3/oneapi.eng.2024.04.15.002/bin:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-fortran/4.6.1/oneapi.eng.2024.04.15.002/bin:/lus/flare/projects/CSC249ADSE15_CNDA/software/netcdf-c/4.9.2/oneapi.eng.2024.04.15.002/bin:$ENV{PATH}</env>
35543537
</environment_variables>
35553538
<environment_variables DEBUG="TRUE">
35563539
<env name="HYDRA_TOPO_DEBUG">1</env>
@@ -3567,6 +3550,9 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
35673550
<env name="GPU_TILE_COMPACT">/soft/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
35683551
<env name="FI_CXI_DEFAULT_CQ_SIZE">131072</env>
35693552
<env name="FI_CXI_CQ_FILL_PERCENT">20</env>
3553+
<env name="Kokkos_ROOT">$ENV{KOKKOS_ROOT}</env>
3554+
<env name="ZES_ENABLE_SYSMAN">1</env>
3555+
<env name="ZEX_NUMBER_OF_CCS">0:4,1:4,2:4,3:4:4:4,5:4,6:4,7:4</env>
35703556
</environment_variables>
35713557
<environment_variables compiler="oneapi-ifx">
35723558
<env name="LIBOMPTARGET_DEBUG">0</env><!--default 0, max 5 -->

‎components/eamxx/cmake/machine-files/aurora.cmake‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
2+
common_setup()
3+
4+
include (${EKAT_MACH_FILES_PATH}/kokkos/serial.cmake)
5+
include (${EKAT_MACH_FILES_PATH}/mpi/other.cmake)
6+
7+
set(EKAT_MPIRUN_EXE "mpiexec" CACHE STRING "" FORCE)
8+
set(EKAT_MPI_NP_FLAG "-np" CACHE STRING "" FORCE)
9+
set(EKAT_MPI_EXTRA_ARGS "--label --cpu-bind depth -envall" CACHE STRING "")
10+
set(EKAT_MPI_THREAD_FLAG "-d" CACHE STRING "")
11+
12+
set(NETCDF_C_PATH "$ENV{NETCDF_C_PATH}")
13+
set(NETCDF_FORTRAN_PATH "$ENV{NETCDF_FORTRAN_PATH}")
14+
set(PNETCDF_PATH "$ENV{PNETCDF_PATH}")

‎components/eamxx/cmake/machine-files/sunspot.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
2+
common_setup()
3+
4+
include (${EKAT_MACH_FILES_PATH}/kokkos/serial.cmake)
5+
include (${EKAT_MACH_FILES_PATH}/mpi/other.cmake)
6+
7+
set(EKAT_MPIRUN_EXE "mpiexec" CACHE STRING "" FORCE)
8+
set(EKAT_MPI_NP_FLAG "-np" CACHE STRING "" FORCE)
9+
set(EKAT_MPI_EXTRA_ARGS "--label --cpu-bind depth -envall" CACHE STRING "")
10+
set(EKAT_MPI_THREAD_FLAG "-d" CACHE STRING "")

0 commit comments

Comments
 (0)