Skip to content

Commit c02c95d

Browse files
xylarxylar
authored
Merge pull request #441 from E3SM-Project/copilot/daily-config-machines-drift
Sync config_machines.xml with E3SM upstream
2 parents 6c92b94 + 6f5d274 commit c02c95d

1 file changed

Lines changed: 28 additions & 8 deletions

File tree

‎mache/cime_machine_config/config_machines.xml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,10 @@
346346
<environment_variables compiler="gnu">
347347
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
348348
</environment_variables>
349-
<environment_variables compiler="nvidia">
349+
<environment_variables compiler="nvidia" DEBUG="TRUE">
350+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
351+
</environment_variables>
352+
<environment_variables compiler="nvidia" DEBUG="FALSE">
350353
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
351354
</environment_variables>
352355
<resource_limits>
@@ -756,12 +759,21 @@
756759
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/aocc-4.1.0; else echo "$SZ_ROOT"; fi}</env>
757760
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/aocc-4.1.0; else echo "$ZFP_ROOT"; fi}</env>
758761
</environment_variables>
759-
<environment_variables compiler="intel">
762+
<environment_variables compiler="intel" DEBUG="TRUE">
763+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel-debug; else echo "$MOAB_ROOT"; fi}</env>
764+
</environment_variables>
765+
<environment_variables compiler="intel" DEBUG="FALSE">
760766
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel; else echo "$MOAB_ROOT"; fi}</env>
761767
</environment_variables>
762768
<environment_variables compiler="gnu">
763769
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
764770
</environment_variables>
771+
<environment_variables compiler="nvidia" DEBUG="TRUE">
772+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
773+
</environment_variables>
774+
<environment_variables compiler="nvidia" DEBUG="FALSE">
775+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
776+
</environment_variables>
765777
<resource_limits>
766778
<resource name="RLIMIT_STACK">-1</resource>
767779
</resource_limits>
@@ -1166,12 +1178,21 @@
11661178
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/aocc-4.1.0; else echo "$SZ_ROOT"; fi}</env>
11671179
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/aocc-4.1.0; else echo "$ZFP_ROOT"; fi}</env>
11681180
</environment_variables>
1169-
<environment_variables compiler="intel">
1181+
<environment_variables compiler="intel" DEBUG="TRUE">
1182+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel-debug; else echo "$MOAB_ROOT"; fi}</env>
1183+
</environment_variables>
1184+
<environment_variables compiler="intel" DEBUG="FALSE">
11701185
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel; else echo "$MOAB_ROOT"; fi}</env>
11711186
</environment_variables>
11721187
<environment_variables compiler="gnu">
11731188
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
11741189
</environment_variables>
1190+
<environment_variables compiler="nvidia" DEBUG="TRUE">
1191+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
1192+
</environment_variables>
1193+
<environment_variables compiler="nvidia" DEBUG="FALSE">
1194+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
1195+
</environment_variables>
11751196
<resource_limits>
11761197
<resource name="RLIMIT_STACK">-1</resource>
11771198
</resource_limits>
@@ -1581,7 +1602,7 @@
15811602
<env name="MPICH_CXX">$SHELL{which hipcc}</env>
15821603
<env name="GPUS_PER_NODE">--gpus-per-node=8</env>
15831604
<env name="NTASKS_PER_GPU">--ntasks-per-gpu=$SHELL{echo "`./xmlquery --value MAX_MPITASKS_PER_NODE`/8"|bc}</env>
1584-
<env name="GPU_BIND_ARGS">--gpu-bind=closest</env>
1605+
<env name="GPU_BIND_ARGS">--gpu-bind=closest --distribution=*:block</env>
15851606
</environment_variables>
15861607

15871608
<environment_variables BUILD_THREADED="TRUE">
@@ -1916,7 +1937,7 @@
19161937
</resource_limits>
19171938
</machine>
19181939

1919-
<machine MACH="ghci-snl-cpu">
1940+
<machine MACH="ghci-snl">
19201941
<DESC>Huge Linux workstation for Sandia climate scientists</DESC>
19211942
<NODENAME_REGEX>^[a-fA-F0-9]{12}$</NODENAME_REGEX>
19221943
<OS>LINUX</OS>
@@ -1927,7 +1948,7 @@
19271948
<DIN_LOC_ROOT>/projects/e3sm/inputdata</DIN_LOC_ROOT>
19281949
<DIN_LOC_ROOT_CLMFORC>/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
19291950
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
1930-
<BASELINE_ROOT>/projects/e3sm/baselines/ghci-snl-cpu/$COMPILER</BASELINE_ROOT>
1951+
<BASELINE_ROOT>/projects/e3sm/baselines/ghci-snl/$COMPILER</BASELINE_ROOT>
19311952
<CCSM_CPRNC>/projects/e3sm/cprnc/cprnc</CCSM_CPRNC>
19321953
<GMAKE_J>32</GMAKE_J>
19331954
<TESTS>e3sm_developer</TESTS>
@@ -4579,7 +4600,7 @@
45794600

45804601
<modules compiler="gnu">
45814602
<command name="load">PrgEnv-gnu/8.5.0</command>
4582-
<command name="load">gcc-native/12.3</command>
4603+
<command name="load">gcc/12.3</command>
45834604
<command name="load">cray-libsci/23.12.5</command>
45844605
</modules>
45854606

@@ -4602,7 +4623,6 @@
46024623
</modules>
46034624

46044625
<modules>
4605-
<command name="load">craype-accel-host</command>
46064626
<command name="load">craype/2.7.30</command>
46074627
<command name="load">cray-mpich/8.1.28</command>
46084628
<command name="load">cray-hdf5-parallel/1.12.2.9</command>

0 commit comments

Comments
 (0)