From 7dc84f7ecbbdac31d9fee33c0875129eb9a6a80f Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 22 Mar 2023 11:12:19 +0100 Subject: [PATCH] Update config_machines.xml to match E3SM/master --- mache/cime_machine_config/config_machines.xml | 174 +++++++++++++++--- 1 file changed, 150 insertions(+), 24 deletions(-) diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml index 1fccd17d..d9c4c908 100644 --- a/mache/cime_machine_config/config_machines.xml +++ b/mache/cime_machine_config/config_machines.xml @@ -195,6 +195,8 @@ cray-parallel-netcdf PrgEnv-gnu PrgEnv-nvidia + PrgEnv-cray + PrgEnv-aocc cudatoolkit craype-accel-nvidia80 craype-accel-host @@ -210,7 +212,7 @@ PrgEnv-nvidia - nvidia/22.5 + nvidia/22.7 @@ -220,13 +222,13 @@ craype-accel-host - cray-libsci - craype - cray-mpich/8.1.22 - cray-hdf5-parallel/1.12.2.1 - cray-netcdf-hdf5parallel/4.9.0.1 - cray-parallel-netcdf/1.12.3.1 - cmake/3.22.0 + cray-libsci/23.02.1.1 + craype/2.7.19 + cray-mpich/8.1.24 + cray-hdf5-parallel/1.12.2.3 + cray-netcdf-hdf5parallel/4.9.0.3 + cray-parallel-netcdf/1.12.3.3 + cmake/3.24.3 @@ -246,6 +248,15 @@ software MPI_Bcast + + /global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/gcc-11.2.0 + + + /global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/nvidia-21.11 + + + /global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/aocc-3.2.0 + -1 @@ -306,6 +317,8 @@ cray-parallel-netcdf PrgEnv-gnu PrgEnv-nvidia + PrgEnv-cray + PrgEnv-aocc cudatoolkit craype-accel-nvidia80 craype-accel-host @@ -321,7 +334,7 @@ PrgEnv-nvidia - nvidia/22.5 + nvidia/22.7 @@ -343,13 +356,13 @@ - cray-libsci - craype - cray-mpich/8.1.22 - cray-hdf5-parallel/1.12.2.1 - cray-netcdf-hdf5parallel/4.9.0.1 - cray-parallel-netcdf/1.12.3.1 - cmake/3.22.0 + cray-libsci/23.02.1.1 + craype/2.7.19 + cray-mpich/8.1.24 + cray-hdf5-parallel/1.12.2.3 + cray-netcdf-hdf5parallel/4.9.0.3 + cray-parallel-netcdf/1.12.3.3 + cmake/3.24.3 @@ -373,6 +386,12 @@ 1 + + /global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/gcc-11.2.0 + + + /global/cfs/cdirs/e3sm/3rdparty/adios2/2.8.3.patch/cray-mpich-8.1.15/nvidia-21.11 + -1 @@ -429,6 +448,8 @@ cray-parallel-netcdf PrgEnv-gnu PrgEnv-nvidia + PrgEnv-cray + PrgEnv-aocc cudatoolkit craype-accel-nvidia80 craype-accel-host @@ -444,7 +465,7 @@ PrgEnv-nvidia - nvidia/22.5 + nvidia/22.7 @@ -454,13 +475,13 @@ craype-accel-host - cray-libsci - craype - cray-mpich/8.1.22 - cray-hdf5-parallel/1.12.2.1 - cray-netcdf-hdf5parallel/4.9.0.1 - cray-parallel-netcdf/1.12.3.1 - cmake/3.22.0 + cray-libsci/23.02.1.1 + craype/2.7.19 + cray-mpich/8.1.24 + cray-hdf5-parallel/1.12.2.3 + cray-netcdf-hdf5parallel/4.9.0.3 + cray-parallel-netcdf/1.12.3.3 + cmake/3.24.3 @@ -1007,6 +1028,12 @@ yes + + /global/cfs/cdirs/e3sm/3rdparty/haswell/adios2/2.7.0/cray-mpich-7.7.10/intel-19.0.3 + + + /global/cfs/cdirs/e3sm/3rdparty/haswell/adios2/2.7.0/cray-mpich-7.7.10/gcc-8.3.0 + @@ -1164,6 +1191,21 @@ 1 + + /global/common/sw/cray/sles15/x86_64/libffi/3.2.1/gcc/8.2.0/nprkfvh + + + /global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/cray-mpich-7.7.10/intel-19.0.3 + + + /global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/cray-mpich-7.7.10/gcc-10.3.0 + + + /global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/impi-2020/intel-19.0.3 + + + /global/cfs/cdirs/e3sm/3rdparty/knl/adios2/2.8.0/impi-2020/gcc-10.3.0 + @@ -1751,6 +1793,12 @@ /soft/apps/packages/climate/perl5/lib/perl5 + + /soft/apps/packages/climate/adios2/2.7.0/mpich-3.3.2/gcc-8.2.0 + + + /soft/apps/packages/climate/adios2/2.7.0/openmpi-2.1.5/gcc-8.2.0 + @@ -1838,6 +1886,9 @@ /nfs/gce/projects/climate/software/perl5/lib/perl5 + + /nfs/gce/projects/climate/software/adios2/2.8.3.patch/mpich-3.4.2/gcc-11.1.0 + @@ -1925,6 +1976,9 @@ /nfs/gce/projects/climate/software/perl5/lib/perl5 + + /nfs/gce/projects/climate/software/linux-ubuntu20.04-x86_64/adios2/2.8.3.patch/mpich-4.0/gcc-11.1.0 + @@ -2202,6 +2256,24 @@ cores + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/intel-mpi-2019.9.304/intel-20.0.4 + + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/intel-mpi-2019.9.304/gcc-8.2.0 + + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/openmpi-4.1.1/intel-20.0.4 + + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/openmpi-4.1.1/gcc-8.2.0 + + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/mvapich2-2.3.6/intel-20.0.4 + + + /lcrc/group/e3sm/3rdparty/anvil/adios2/2.8.3.patch/mvapich2-2.2/gcc-8.2.0 + @@ -2326,6 +2398,18 @@ cores + + /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/intel-20.0.4 + + + /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/openmpi-4.1.3/gcc-9.2.0 + + + /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/intel-mpi-2019.9.304/intel-20.0.4 + + + /lcrc/group/e3sm/3rdparty/chrysalis/adios2/2.8.3.patch/intel-mpi-2019.9.304/gcc-9.2.0 + @@ -2568,6 +2652,9 @@ $SHELL{dirname $(dirname $(which pnetcdf_version))} + + $SHELL{which h5dump | xargs dirname | xargs dirname} + 128M spread @@ -2576,6 +2663,18 @@ shm:tmi + + /lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/intel-mpi-2018.4.274/intel-18.0.4 + + + /lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/intel-mpi-2018.4.274/gcc-8.2.0 + + + /lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/mvapich2-2.3.1/intel-18.0.4 + + + /lcrc/group/e3sm/3rdparty/bebop/adios2/2.8.3.patch/mvapich2-2.3/gcc-8.2.0 + @@ -2781,6 +2880,12 @@ -e OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS} -e OMP_STACKSIZE=128M -e OMP_PROC_BIND=spread -e OMP_PLACES=threads + + /projects/ClimateEnergy_4/3rdparty/adios2/2.7.0/cray-mpich-7.7.14/intel-19.1.0 + + + /projects/ClimateEnergy_4/3rdparty/adios2/2.7.0/cray-mpich-7.7.14/gcc-9.3.0 + @@ -3284,6 +3389,18 @@ 64M cores + + /qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/intelmpi-2019u4/intel-19.0.5 + + + /qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/intelmpi-2019u3/pgi-19.10 + + + /qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/mvapich2-2.3.1/intel-19.0.4 + + + /qfs/people/wuda020/3rdparty/adios2/2.8.3.patch/mvapich2-2.3.1/pgi-19.7 + @@ -4241,6 +4358,15 @@ mlx5_3:1,mlx5_0:1 mlx5_0:1,mlx5_3:1 + + /gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/xl-16.1.1-10 + + + /gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/nvhpc-21.11 + + + /gpfs/alpine/cli115/world-shared/3rdparty/adios2/2.8.3.patch/spectrum-mpi-10.4.0.3/gcc-9.1.0 +