Skip to content

Commit eb36f6d

Browse files
xylarxylar
authored
Merge pull request #318 from andrewdnolan/update-aurora
Update `aurora` spack templates with latest modules
2 parents a9aa894 + 4dcdabf commit eb36f6d

File tree

3 files changed

+63
-50
lines changed

3 files changed

+63
-50
lines changed

‎mache/cime_machine_config/config_machines.xml‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3492,24 +3492,24 @@
34923492
<COMPILERS>oneapi-ifxgpu,oneapi-ifx</COMPILERS>
34933493
<MPILIBS>mpich,mpich1024</MPILIBS>
34943494
<PROJECT>E3SM_Dec</PROJECT>
3495-
<SAVE_TIMING_DIR>/lus/flare/projects/E3SM_Dec/performance_archive</SAVE_TIMING_DIR>
3495+
<SAVE_TIMING_DIR>/lus/flare/projects/E3SMinput/baselines</SAVE_TIMING_DIR>
34963496
<SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>
34973497
<CIME_OUTPUT_ROOT>/lus/flare/projects/$PROJECT/$USER/scratch</CIME_OUTPUT_ROOT>
3498-
<DIN_LOC_ROOT>/lus/flare/projects/E3SM_Dec/inputdata</DIN_LOC_ROOT>
3499-
<DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/E3SM_Dec/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
3498+
<DIN_LOC_ROOT>/lus/flare/projects/E3SMinput/data</DIN_LOC_ROOT>
3499+
<DIN_LOC_ROOT_CLMFORC>/lus/flare/projects/E3SMinput/data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
35003500
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
3501-
<BASELINE_ROOT>/lus/flare/projects/E3SM_Dec/baselines/$COMPILER</BASELINE_ROOT>
3502-
<CCSM_CPRNC>/lus/flare/projects/E3SM_Dec/tools/cprnc/cprnc</CCSM_CPRNC>
3501+
<BASELINE_ROOT>/lus/flare/projects/E3SMinput/baselines/$COMPILER</BASELINE_ROOT>
3502+
<CCSM_CPRNC>/lus/flare/projects/E3SMinput/tools/cprnc/cprnc</CCSM_CPRNC>
35033503
<GMAKE_J>16</GMAKE_J>
3504-
<TESTS>e3sm_developer</TESTS>
3504+
<TESTS>e3sm_integration</TESTS>
35053505
<NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
35063506
<BATCH_SYSTEM>pbspro</BATCH_SYSTEM>
35073507
<SUPPORTED_BY>e3sm</SUPPORTED_BY>
35083508
<MAX_TASKS_PER_NODE>102</MAX_TASKS_PER_NODE>
35093509
<MAX_TASKS_PER_NODE compiler="oneapi-ifxgpu">96</MAX_TASKS_PER_NODE>
35103510
<MAX_MPITASKS_PER_NODE>102</MAX_MPITASKS_PER_NODE>
35113511
<MAX_MPITASKS_PER_NODE compiler="oneapi-ifxgpu">12</MAX_MPITASKS_PER_NODE>
3512-
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
3512+
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
35133513
<mpirun mpilib="default">
35143514
<executable>mpiexec</executable>
35153515
<!--executable>numactl -m 2-3 mpiexec</executable--><!--for HBM runs-->
@@ -3529,9 +3529,13 @@
35293529
<cmd_path lang="csh">module</cmd_path>
35303530
<cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
35313531
<modules>
3532-
<command name="load">cmake/3.30.5</command>
3533-
<command name="load">oneapi/release/2025.0.5</command>
3534-
</modules>
3532+
<command name="use">/lus/flare/projects/E3SMinput/soft/modulefiles</command>
3533+
<command name="load">cmake/3.31.8</command>
3534+
<command name="load">oneapi/release/2025.2.0</command>
3535+
<command name="load">netcdf/4.9.3c-4.6.2f</command>
3536+
<command name="load">pnetcdf/1.14.0</command>
3537+
<command name="load">adios2/2.10.2</command>
3538+
</modules>
35353539
<modules mpilib="mpich1024">
35363540
<command name="load">mpich-config/collective-tuning/1024</command>
35373541
</modules>
@@ -3540,16 +3544,6 @@
35403544
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
35413545
<MAX_GB_OLD_TEST_DATA>0</MAX_GB_OLD_TEST_DATA>
35423546
<environment_variables>
3543-
<env name="NETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002</env>
3544-
<env name="PNETCDF_PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002</env>
3545-
<env name="LD_LIBRARY_PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/lib:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/lib:$ENV{LD_LIBRARY_PATH}</env>
3546-
<env name="PATH">/lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002/bin:/lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002/bin:$ENV{PATH}</env>
3547-
<env name="PKG_CONFIG_PATH">/lus/flare/projects/E3SM_Dec/soft/protobuf/21.6/oneapi.release.2025.0.5/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}</env>
3548-
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/adios2/2.10.2/oneapi.release.2025.0.5; else echo "$ADIOS2_ROOT"; fi}</env>
3549-
<env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/c-blosc2/2.15.2/oneapi.release.2025.0.5; else echo "$BLOSC2_ROOT"; fi}</env>
3550-
<env name="MGARD_ROOT">$SHELL{if [ -z "$MGARD_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/mgard/1.5.2/oneapi.release.2025.0.5; else echo "$MGARD_ROOT"; fi}</env>
3551-
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/sz/2.1.12.5/oneapi.release.2025.0.5; else echo "$SZ_ROOT"; fi}</env>
3552-
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /lus/flare/projects/E3SM_Dec/soft/zfp/1.0.1/oneapi.release.2025.0.5; else echo "$ZFP_ROOT"; fi}</env>
35533547
<env name="FI_CXI_DEFAULT_CQ_SIZE">131072</env>
35543548
<env name="FI_CXI_CQ_FILL_PERCENT">20</env>
35553549
<env name="RLIMITS"> </env>
@@ -3574,7 +3568,7 @@
35743568
<env name="romio_cb_write">disable</env>
35753569
<env name="GATOR_INITIAL_MB">4000MB</env>
35763570
<env name="GATOR_DISABLE">0</env>
3577-
<env name="GPU_TILE_COMPACT">/lus/flare/projects/E3SM_Dec/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
3571+
<env name="GPU_TILE_COMPACT">/lus/flare/projects/E3SMinput/tools/mpi_wrapper_utils/gpu_tile_compact.sh</env>
35783572
<env name="RANKS_BIND">list:1-8:9-16:17-24:25-32:33-40:41-48:53-60:61-68:69-76:77-84:85-92:93-100 --gpu-bind list:0.0:0.1:1.0:1.1:2.0:2.1:3.0:3.1:4.0:4.1:5.0:5.1 --mem-bind list:0:0:0:0:0:0:1:1:1:1:1:1</env>
35793573
<env name="ZES_ENABLE_SYSMAN">1</env>
35803574
<!-- default is ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE: enable this to run 4 MPI/tile or 48 MPI/node

‎mache/machines/aurora.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ mpi = mpich
1515
# system libraries will be deployed
1616
base_path = /lus/flare/projects/E3SMinput/soft/e3sm-unified
1717

18-
# whether to use system modules for hdf5, netcdf-c, netcdf-fortran and pnetcdf
18+
# whether to use E3SM modules for hdf5, netcdf-c, netcdf-fortran and pnetcdf
1919
# (spack modules are used otherwise)
20-
use_system_hdf5_netcdf = True
20+
use_e3sm_hdf5_netcdf = True
2121

2222

2323
# config options related to data needed by diagnostics software such as

‎mache/spack/templates/aurora_oneapi-ifx_mpich.yaml‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- set compiler = "oneapi@2025.0.5" %}
1+
{%- set compiler = "oneapi@2025.2.0" %}
22
{%- set mpi = "[email protected]" %}
33

44
spack:
@@ -17,7 +17,7 @@ spack:
1717
unify: true
1818
packages:
1919
all:
20-
compiler: [{{ compiler }}]
20+
compiler: [{{ compiler }}, [email protected]]
2121
providers:
2222
mpi: [{{ mpi }}]
2323
bison:
@@ -32,8 +32,8 @@ spack:
3232
buildable: false
3333
cmake:
3434
externals:
35-
- spec: cmake@3.30.5
36-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/cmake-3.30.5-igar7ts
35+
- spec: cmake@3.31.8
36+
prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/cmake-3.31.8-mvhtj5u
3737
buildable: false
3838
curl:
3939
externals:
@@ -53,17 +53,12 @@ spack:
5353
gmake:
5454
externals:
5555
- spec: [email protected]
56-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/gmake-4.4.1-wza7sk4
57-
buildable: false
58-
libiconv:
59-
externals:
60-
- spec: [email protected]
61-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/libiconv-1.17-jjpb4sl
56+
prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gmake-4.4.1-wza7sk4
6257
buildable: false
6358
libxml2:
6459
externals:
6560
- spec: [email protected]
66-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/libxml2-2.13.5-jxhkqdj
61+
prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/libxml2-2.13.5-dhzcbk4
6762
buildable: false
6863
openssl:
6964
externals:
@@ -89,51 +84,75 @@ spack:
8984
externals:
9085
- spec: {{ compiler }}
9186
modules:
92-
- oneapi/release/2025.0.5
87+
- oneapi/release/2025.2.0
88+
extra_attributes:
89+
compilers:
90+
c: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icx
91+
cxx: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icpx
92+
fortran: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/ifx
93+
buildable: false
94+
gcc:
95+
externals:
96+
- spec: [email protected]
97+
modules:
98+
- gcc/13.3.0
9399
buildable: false
94100
gcc-runtime:
95101
externals:
96-
- spec: [email protected]
97-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/gcc-13.3.0/gcc-runtime-13.3.0-ghotoln
102+
- spec: [email protected]%[email protected]
103+
prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-runtime-13.3.0-ghotoln
98104
buildable: false
99105
mpich:
100106
externals:
101107
- spec: {{ mpi }}%{{ compiler }}
102-
prefix: /opt/aurora/24.347.0/spack/unified/0.9.2/install/linux-sles15-x86_64/oneapi-2025.0.5/mpich-develop-git.6037a7a-sxnhr7p
108+
prefix: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/oneapi-2025.2.0/mpich-develop-git.6037a7a-cym6jg6
103109
buildable: false
104110
{%- if e3sm_hdf5_netcdf %}
105111
hdf5:
106112
externals:
107-
- spec: [email protected].5+cxx+fortran+hl+mpi
108-
prefix: /lus/flare/projects/E3SM_Dec/soft/hdf5/1.14.5/oneapi.eng.2024.07.30.002/
113+
- spec: [email protected].6+cxx+fortran+hl+mpi
114+
prefix: /lus/flare/projects/E3SMinput/soft/hdf5/1.14.6/oneapi.2025.2.0
109115
buildable: false
110116
netcdf-c:
111117
externals:
112-
- spec: [email protected].2+mpi~parallel-netcdf
113-
prefix: /lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002
118+
- spec: [email protected].3+mpi~parallel-netcdf
119+
prefix: /lus/flare/projects/E3SMinput/soft/netcdf/4.9.3c-4.6.2f/oneapi.2025.2.0
114120
buildable: false
115121
netcdf-fortran:
116122
externals:
117-
- spec: [email protected].1
118-
prefix: /lus/flare/projects/E3SM_Dec/soft/netcdf/4.9.2c-4.6.1f/oneapi.eng.2024.07.30.002
123+
- spec: [email protected].2
124+
prefix: /lus/flare/projects/E3SMinput/soft/netcdf/4.9.3c-4.6.2f/oneapi.2025.2.0
119125
buildable: false
120126
parallel-netcdf:
121127
externals:
122-
- spec: parallel-netcdf@1.11.0+cxx+fortran
123-
prefix: /lus/flare/projects/E3SM_Dec/soft/pnetcdf/1.14.0/oneapi.eng.2024.07.30.002
128+
- spec: parallel-netcdf@1.14.0+cxx+fortran
129+
prefix: /lus/flare/projects/E3SMinput/soft/pnetcdf/1.14.0/oneapi.2025.2.0
124130
buildable: false
125131
{%- endif %}
126132
compilers:
127133
- compiler:
128134
spec: {{ compiler }}
129135
paths:
130-
cc: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/icx
131-
cxx: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/icpx
132-
f77: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/ifx
133-
fc: /opt/aurora/24.347.0/oneapi/compiler/latest/bin/ifx
136+
cc: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icx
137+
cxx: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/icpx
138+
f77: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/ifx
139+
fc: /opt/aurora/25.190.0/oneapi/compiler/latest/bin/ifx
134140
flags: {}
135141
operating_system: sles15
136142
target: x86_64
137143
modules: []
138144
environment: {}
139145
extra_rpaths: []
146+
- compiler:
147+
spec: [email protected]
148+
paths:
149+
cc: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-13.3.0-4enwbrb/bin/gcc
150+
cxx: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-13.3.0-4enwbrb/bin/g++
151+
f77: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-13.3.0-4enwbrb/bin/gfortran
152+
fc: /opt/aurora/25.190.0/spack/unified/0.10.1/install/linux-sles15-x86_64/gcc-13.3.0/gcc-13.3.0-4enwbrb/bin/gfortran
153+
operating_system: sles15
154+
target: x86_64
155+
modules: [gcc/13.3.0]
156+
flags: {}
157+
environment: {}
158+
extra_rpaths: []

0 commit comments

Comments
 (0)