diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml index 593acc1b..acd10f74 100644 --- a/mache/cime_machine_config/config_machines.xml +++ b/mache/cime_machine_config/config_machines.xml @@ -267,6 +267,7 @@ FALSE /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch software + kdreg2 MPI_Bcast $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} @@ -437,6 +438,7 @@ threads FALSE /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch + kdreg2 MPI_Bcast $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} @@ -583,6 +585,7 @@ FALSE /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch software + kdreg2 MPI_Bcast $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} @@ -754,6 +757,7 @@ threads FALSE /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch + kdreg2 MPI_Bcast $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} @@ -900,6 +904,7 @@ FALSE /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch software + kdreg2 MPI_Bcast $ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX} $ENV{CRAY_PARALLEL_NETCDF_PREFIX} @@ -1067,6 +1072,7 @@ /usr/share/lmod/lmod/libexec/lmod python + Core/24.07 PrgEnv-cray PrgEnv-cray/8.3.3 cce cce/15.0.1 @@ -1079,6 +1085,7 @@ + Core/24.07 PrgEnv-cray PrgEnv-amd/8.3.3 amd amd/5.4.0 @@ -1087,6 +1094,7 @@ + Core/24.07 PrgEnv-cray PrgEnv-gnu/8.3.3 gcc gcc/12.2.0 @@ -1095,12 +1103,12 @@ rocm/5.4.0 - cray-python/3.9.13.1 + cray-python/3.11.5 cray-libsci - subversion/1.14.1 - git/2.36.1 - cmake/3.21.3 - zlib/1.2.11 + cmake/3.27.9 + subversion + git + zlib cray-hdf5-parallel/1.12.2.1 cray-netcdf-hdf5parallel/4.9.0.1 cray-parallel-netcdf/1.12.3.1 @@ -2404,17 +2412,15 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss openmpi/4.1.6-2mm63n2 hdf5/1.10.7-4cghwvq - netcdf-c/4.4.1-a4hji6e - netcdf-cxx/4.2-ldoxr43 - netcdf-fortran/4.4.4-husened + netcdf-c/4.7.4-4qjdadt + netcdf-fortran/4.5.3-qozrykr parallel-netcdf/1.11.0-icrpxty intel-mpi/2019.9.304-tkzvizk - hdf5/1.8.16-se4xyo7 - netcdf-c/4.4.1-qvxyzq2 - netcdf-cxx/4.2-binixgj - netcdf-fortran/4.4.4-rdxohvp + hdf5/1.10.7-wczt56s + netcdf-c/4.7.4-ba6agmb + netcdf-fortran/4.5.3-5lvy5p4 parallel-netcdf/1.11.0-b74wv4m @@ -2424,17 +2430,19 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss openmpi/4.1.6-ggebj5o hdf5/1.10.7-ol6xuae - netcdf-c/4.4.1-2njo6xx - netcdf-cxx/4.2-7pdzqua - netcdf-fortran/4.4.4-52c6oqi + netcdf-c/4.7.4-pfocec2 + netcdf-fortran/4.5.3-va3hoor parallel-netcdf/1.11.0-d7h4ysd + gcc/11.2.0-bgddrif + intel-oneapi-mkl/2022.1.0-w4kgsn4 + gcc/9.2.0-ugetvbp + intel-mkl/2020.4.304-n3b5fye intel-mpi/2019.9.304-jdih7h5 hdf5/1.8.16-dtbpce3 - netcdf-c/4.4.1-zcoa44z - netcdf-cxx/4.2-ayxg4c7 - netcdf-fortran/4.4.4-2lfr2lr + netcdf-c/4.7.4-seagl7g + netcdf-fortran/4.5.3-ova6t37 parallel-netcdf/1.11.0-ifdodru diff --git a/mache/spack/chrysalis_gnu_openmpi.yaml b/mache/spack/chrysalis_gnu_openmpi.yaml index e4172ec6..262097f2 100644 --- a/mache/spack/chrysalis_gnu_openmpi.yaml +++ b/mache/spack/chrysalis_gnu_openmpi.yaml @@ -109,28 +109,24 @@ spack: hdf5: externals: - spec: hdf5@1.10.7+cxx+fortran+hl+mpi - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-11.2.0/hdf5-1.10.7-ol6xuae modules: - hdf5/1.10.7-ol6xuae buildable: false netcdf-c: externals: - - spec: netcdf-c@4.4.1+mpi~parallel-netcdf - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-11.2.0/netcdf-c-4.4.1-2njo6xx + - spec: netcdf-c@4.7.4+mpi~parallel-netcdf modules: - - netcdf-c/4.4.1-2njo6xx + - netcdf-c/4.7.4-pfocec2 buildable: false netcdf-fortran: externals: - - spec: netcdf-fortran@4.4.4 - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-11.2.0/netcdf-fortran-4.4.4-52c6oqi + - spec: netcdf-fortran@4.5.3 modules: - - netcdf-fortran/4.4.4-52c6oqi + - netcdf-fortran/4.5.3-va3hoor buildable: false parallel-netcdf: externals: - spec: parallel-netcdf@1.11.0+cxx+fortran - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-11.2.0/parallel-netcdf-1.11.0-d7h4ysd modules: - parallel-netcdf/1.11.0-d7h4ysd buildable: false diff --git a/mache/spack/chrysalis_intel_impi.yaml b/mache/spack/chrysalis_intel_impi.yaml index d154426d..82605671 100644 --- a/mache/spack/chrysalis_intel_impi.yaml +++ b/mache/spack/chrysalis_intel_impi.yaml @@ -108,29 +108,25 @@ spack: {% if e3sm_hdf5_netcdf %} hdf5: externals: - - spec: hdf5@1.8.16+cxx+fortran+hl+mpi~shared - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/hdf5-1.8.16-se4xyo7 + - spec: hdf5@1.10.7+cxx+fortran+hl+mpi~shared modules: - - hdf5/1.8.16-se4xyo7 + - hdf5/1.10.7-wczt56s buildable: false netcdf-c: externals: - - spec: netcdf-c@4.4.1+mpi~parallel-netcdf - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-c-4.4.1-qvxyzq2 + - spec: netcdf-c@4.7.4+mpi~parallel-netcdf modules: - - netcdf-c/4.4.1-qvxyzq2 + - netcdf-c/4.7.4-ba6agmb buildable: false netcdf-fortran: externals: - - spec: netcdf-fortran@4.4.4 - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-rdxohvp + - spec: netcdf-fortran@4.5.3 modules: - - netcdf-fortran/4.4.4-rdxohvp + - netcdf-fortran/4.5.3-5lvy5p4 buildable: false parallel-netcdf: externals: - spec: parallel-netcdf@1.11.0+cxx+fortran - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-b74wv4m modules: - parallel-netcdf/1.11.0-b74wv4m buildable: false diff --git a/mache/spack/chrysalis_intel_openmpi.yaml b/mache/spack/chrysalis_intel_openmpi.yaml index f59e94fc..aee3dc49 100644 --- a/mache/spack/chrysalis_intel_openmpi.yaml +++ b/mache/spack/chrysalis_intel_openmpi.yaml @@ -109,28 +109,24 @@ spack: hdf5: externals: - spec: hdf5@1.10.7+cxx+fortran+hl+mpi - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/hdf5-1.10.7-4cghwvq modules: - hdf5/1.10.7-4cghwvq buildable: false netcdf-c: externals: - - spec: netcdf-c@4.4.1+mpi~parallel-netcdf - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-c-4.4.1-a4hji6e + - spec: netcdf-c@4.7.4+mpi~parallel-netcdf modules: - - netcdf-c/4.4.1-a4hji6e + - netcdf-c/4.7.4-4qjdadt buildable: false netcdf-fortran: externals: - - spec: netcdf-fortran@4.4.4 - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-husened + - spec: netcdf-fortran@4.5.3 modules: - - netcdf-fortran/4.4.4-husened + - netcdf-fortran/4.5.3-qozrykr buildable: false parallel-netcdf: externals: - spec: parallel-netcdf@1.11.0+cxx+fortran - prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-icrpxty modules: - parallel-netcdf/1.11.0-icrpxty buildable: false