Skip to content

Commit

Permalink
Update config_machines.xml to match E3SM/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@xylar
xylar committed Mar 22, 2023
1 parent 3cce2cd commit 47af826
Showing 1 changed file with 147 additions and 21 deletions.
168 changes: 147 additions & 21 deletions mache/cime_machine_config/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@
<command name="unload">cray-parallel-netcdf</command>
<command name="unload">PrgEnv-gnu</command>
<command name="unload">PrgEnv-nvidia</command>
<command name="unload">PrgEnv-cray</command>
<command name="unload">PrgEnv-aocc</command>
<command name="unload">cudatoolkit</command>
<command name="unload">craype-accel-nvidia80</command>
<command name="unload">craype-accel-host</command>
Expand All @@ -220,13 +222,13 @@

<modules>
<command name="load">craype-accel-host</command>
<command name="load">cray-libsci</command>
<command name="load">craype</command>
<command name="load">cray-mpich/8.1.22</command>
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
<command name="load">cmake/3.22.0</command>
<command name="load">cray-libsci/23.02.1.1</command>
<command name="load">craype/2.7.19</command>
<command name="load">cray-mpich/8.1.24</command>
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
<command name="load">cmake/3.24.3</command>
</modules>
</module_system>

Expand All @@ -246,6 +248,15 @@
<env name="FI_CXI_RX_MATCH_MODE">software</env>
<env name="MPICH_COLL_SYNC">MPI_Bcast</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpich">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/gcc-11.2.0</env>
</environment_variables>
<environment_variables compiler="nvidia" mpilib="mpich">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/nvidia-21.11</env>
</environment_variables>
<environment_variables compiler="amdclang" mpilib="mpich">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/aocc-3.2.0</env>
</environment_variables>
<resource_limits>
<resource name="RLIMIT_STACK">-1</resource>
</resource_limits>
Expand Down Expand Up @@ -306,6 +317,8 @@
<command name="unload">cray-parallel-netcdf</command>
<command name="unload">PrgEnv-gnu</command>
<command name="unload">PrgEnv-nvidia</command>
<command name="unload">PrgEnv-cray</command>
<command name="unload">PrgEnv-aocc</command>
<command name="unload">cudatoolkit</command>
<command name="unload">craype-accel-nvidia80</command>
<command name="unload">craype-accel-host</command>
Expand Down Expand Up @@ -343,13 +356,13 @@
</modules>

<modules>
<command name="load">cray-libsci</command>
<command name="load">craype</command>
<command name="load">cray-mpich/8.1.22</command>
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
<command name="load">cmake/3.22.0</command>
<command name="load">cray-libsci/23.02.1.1</command>
<command name="load">craype/2.7.19</command>
<command name="load">cray-mpich/8.1.24</command>
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
<command name="load">cmake/3.24.3</command>
</modules>
</module_system>

Expand All @@ -373,6 +386,12 @@
<environment_variables compiler="nvidiagpu">
<env name="MPICH_GPU_SUPPORT_ENABLED">1</env>
</environment_variables>
<environment_variables compiler="gnu.*" mpilib="mpich">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/gcc-11.2.0</env>
</environment_variables>
<environment_variables compiler="nvidia.*" mpilib="mpich">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/nvidia-21.11</env>
</environment_variables>
<resource_limits>
<resource name="RLIMIT_STACK">-1</resource>
</resource_limits>
Expand Down Expand Up @@ -429,6 +448,8 @@
<command name="unload">cray-parallel-netcdf</command>
<command name="unload">PrgEnv-gnu</command>
<command name="unload">PrgEnv-nvidia</command>
<command name="unload">PrgEnv-cray</command>
<command name="unload">PrgEnv-aocc</command>
<command name="unload">cudatoolkit</command>
<command name="unload">craype-accel-nvidia80</command>
<command name="unload">craype-accel-host</command>
Expand All @@ -454,13 +475,13 @@

<modules>
<command name="load">craype-accel-host</command>
<command name="load">cray-libsci</command>
<command name="load">craype</command>
<command name="load">cray-mpich/8.1.22</command>
<command name="load">cray-hdf5-parallel/1.12.2.1</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.1</command>
<command name="load">cray-parallel-netcdf/1.12.3.1</command>
<command name="load">cmake/3.22.0</command>
<command name="load">cray-libsci/23.02.1.1</command>
<command name="load">craype/2.7.19</command>
<command name="load">cray-mpich/8.1.24</command>
<command name="load">cray-hdf5-parallel/1.12.2.3</command>
<command name="load">cray-netcdf-hdf5parallel/4.9.0.3</command>
<command name="load">cray-parallel-netcdf/1.12.3.3</command>
<command name="load">cmake/3.24.3</command>
</modules>
</module_system>

Expand Down Expand Up @@ -1007,6 +1028,12 @@
<environment_variables compiler="intel">
<env name="FORT_BUFFERED">yes</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mpt">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/haswell/adios2/2.7.0/cray-mpich-7.7.10/intel-19.0.3</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpt">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/haswell/adios2/2.7.0/cray-mpich-7.7.10/gcc-8.3.0</env>
</environment_variables>
</machine>

<!-- KNL nodes of Cori -->
Expand Down Expand Up @@ -1164,6 +1191,21 @@
<environment_variables compiler="intel">
<env name="MPICH_MEMORY_REPORT">1</env>
</environment_variables>
<environment_variables>
<env name="LIBFFI_ROOT">/global/common/sw/cray/sles15/x86_64/libffi/3.2.1/gcc/8.2.0/nprkfvh</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mpt">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/cray-mpich-7.7.10/intel-19.0.3</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpt">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/cray-mpich-7.7.10/gcc-10.3.0</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="impi">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/impi-2020/intel-19.0.3</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="impi">
<env name="ADIOS2_DIR">/global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/impi-2020/gcc-10.3.0</env>
</environment_variables>
</machine>

<!-- Skylake nodes of Stampede2 at TACC -->
Expand Down Expand Up @@ -1751,6 +1793,12 @@
<environment_variables>
<env name="PERL5LIB">/soft/apps/packages/climate/perl5/lib/perl5</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpich">
<env name="ADIOS2_DIR">/soft/apps/packages/climate/adios2/2.7.0/mpich-3.3.2/gcc-8.2.0</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="openmpi">
<env name="ADIOS2_DIR">/soft/apps/packages/climate/adios2/2.7.0/openmpi-2.1.5/gcc-8.2.0</env>
</environment_variables>
</machine>

<machine MACH="anlgce-ub18">
Expand Down Expand Up @@ -1838,6 +1886,9 @@
<environment_variables>
<env name="PERL5LIB">/nfs/gce/projects/climate/software/perl5/lib/perl5</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpich">
<env name="ADIOS2_DIR">/nfs/gce/projects/climate/software/adios2/2.8.3.patch/mpich-3.4.2/gcc-11.1.0</env>
</environment_variables>
</machine>

<machine MACH="anlgce">
Expand Down Expand Up @@ -1925,6 +1976,9 @@
<environment_variables>
<env name="PERL5LIB">/nfs/gce/projects/climate/software/perl5/lib/perl5</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpich">
<env name="ADIOS2_DIR">/nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/adios2/2.8.3.patch/mpich-4.0/gcc-11.1.0</env>
</environment_variables>
</machine>

<machine MACH="sandiatoss3">
Expand Down Expand Up @@ -2202,6 +2256,24 @@
<environment_variables SMP_PRESENT="TRUE" compiler="gnu">
<env name="OMP_PLACES">cores</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/intel-mpi-2019.9.304/intel-20.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/intel-mpi-2019.9.304/gcc-8.2.0</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="openmpi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/openmpi-4.1.1/intel-20.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="openmpi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/openmpi-4.1.1/gcc-8.2.0</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mvapich">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/mvapich2-2.3.6/intel-20.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mvapich">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/mvapich2-2.2/gcc-8.2.0</env>
</environment_variables>
</machine>

<machine MACH="chrysalis">
Expand Down Expand Up @@ -2326,6 +2398,18 @@
<environment_variables SMP_PRESENT="TRUE" compiler="gnu">
<env name="OMP_PLACES">cores</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="openmpi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/intel-20.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="openmpi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/gcc-9.2.0</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/intel-mpi-2019.9.304/intel-20.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/intel-mpi-2019.9.304/gcc-9.2.0</env>
</environment_variables>
</machine>

<machine MACH="blues">
Expand Down Expand Up @@ -2568,6 +2652,9 @@
<environment_variables mpilib="!mpi-serial">
<env name="PNETCDF_PATH">$SHELL{dirname $(dirname $(which pnetcdf_version))}</env>
</environment_variables>
<environment_variables compiler="gnu">
<env name="HDF5_PATH">$SHELL{which h5dump | xargs dirname | xargs dirname}</env>
</environment_variables>
<environment_variables SMP_PRESENT="TRUE">
<env name="OMP_STACKSIZE">128M</env>
<env name="OMP_PROC_BIND">spread</env>
Expand All @@ -2576,6 +2663,18 @@
<environment_variables mpilib="impi">
<env name="I_MPI_FABRICS">shm:tmi</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/intel-mpi-2018.4.274/intel-18.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="impi">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/intel-mpi-2018.4.274/gcc-8.2.0</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mvapich">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/mvapich2-2.3.1/intel-18.0.4</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mvapich">
<env name="ADIOS2_DIR">/lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/mvapich2-2.3/gcc-8.2.0</env>
</environment_variables>
</machine>

<machine MACH="syrah">
Expand Down Expand Up @@ -2781,6 +2880,12 @@
<environment_variables SMP_PRESENT="TRUE" compiler="!intel">
<env name="SMP_VARS">-e OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS} -e OMP_STACKSIZE=128M -e OMP_PROC_BIND=spread -e OMP_PLACES=threads</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mpt">
<env name="ADIOS2_DIR">/projects/ClimateEnergy_4/3rdparty/adios2/2.7.0/cray-mpich-7.7.14/intel-19.1.0</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpt">
<env name="ADIOS2_DIR">/projects/ClimateEnergy_4/3rdparty/adios2/2.7.0/cray-mpich-7.7.14/gcc-9.3.0</env>
</environment_variables>
</machine>

<machine MACH="jlse">
Expand Down Expand Up @@ -3284,6 +3389,18 @@
<env name="OMP_STACKSIZE">64M</env>
<env name="OMP_PLACES">cores</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="impi">
<env name="ADIOS2_DIR">/qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/intelmpi-2019u4/intel-19.0.5</env>
</environment_variables>
<environment_variables compiler="pgi" mpilib="impi">
<env name="ADIOS2_DIR">/qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/intelmpi-2019u3/pgi-19.10</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="mvapich2">
<env name="ADIOS2_DIR">/qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/mvapich2-2.3.1/intel-19.0.4</env>
</environment_variables>
<environment_variables compiler="pgi" mpilib="mvapich2">
<env name="ADIOS2_DIR">/qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/mvapich2-2.3.1/pgi-19.7</env>
</environment_variables>
</machine>

<machine MACH="tahoma">
Expand Down Expand Up @@ -4241,6 +4358,15 @@
<env name="PAMI_IBV_DEVICE_NAME_1">mlx5_3:1,mlx5_0:1</env>
<env name="PAMI_IBV_DEVICE_NAME">mlx5_0:1,mlx5_3:1</env>
</environment_variables>
<environment_variables compiler="ibm.*" mpilib="spectrum-mpi">
<env name="ADIOS2_DIR">/gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/xl-16.1.1-10</env>
</environment_variables>
<environment_variables compiler="pgi.*" mpilib="spectrum-mpi">
<env name="ADIOS2_DIR">/gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/nvhpc-21.11</env>
</environment_variables>
<environment_variables compiler="gnu.*" mpilib="spectrum-mpi">
<env name="ADIOS2_DIR">/gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/gcc-9.1.0</env>
</environment_variables>
</machine>

<machine MACH="ascent">
Expand Down

0 comments on commit 47af826

Please sign in to comment.