Skip to content

Commit

Permalink
Merge pull request #31 from xylar/update_config_machines
Browse files Browse the repository at this point in the history
Update machines config to match E3SM
  • Loading branch information
xylar authored Mar 18, 2022
2 parents 4449f01 + b80ecb4 commit dd712ad
Show file tree
Hide file tree
Showing 9 changed files with 665 additions and 317 deletions.
868 changes: 608 additions & 260 deletions mache/cime_machine_config/config_machines.xml

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions mache/spack/chrysalis_gnu_openmpi.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spack:
specs:
specs:
- cmake
- gcc
- openmpi
Expand All @@ -16,7 +16,7 @@ spack:
all:
compiler: [[email protected]]
providers:
mpi: [[email protected].1]
mpi: [[email protected].2]
lapack: [[email protected]]
bzip2:
externals:
Expand Down Expand Up @@ -81,10 +81,10 @@ spack:
buildable: false
openmpi:
externals:
- spec: [email protected].1
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/openmpi-4.1.1-73gbwq4
- spec: [email protected].2
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/openmpi-4.1.2-zdskwit
modules:
- openmpi/4.1.1-73gbwq4
- openmpi/4.1.2-zdskwit
buildable: false
intel-mkl:
externals:
Expand All @@ -97,30 +97,30 @@ spack:
hdf5:
externals:
- spec: [email protected]+cxx+fortran+hl+mpi
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/hdf5-1.8.16-dqjdy2d
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/hdf5-1.8.16-oh66njw
modules:
- hdf5/1.8.16-dqjdy2d
- hdf5/1.8.16-oh66njw
buildable: false
netcdf-c:
externals:
- spec: [email protected]+mpi~parallel-netcdf
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/netcdf-c-4.4.1-y6dun2a
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/netcdf-c-4.4.1-54pwnbt
modules:
- netcdf-c/4.4.1-y6dun2a
- netcdf-c/4.4.1-54pwnbt
buildable: false
netcdf-fortran:
externals:
- spec: [email protected]
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/netcdf-fortran-4.4.4-4lnfxki
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/netcdf-fortran-4.4.4-fkyjosv
modules:
- netcdf-fortran/4.4.4-4lnfxki
- netcdf-fortran/4.4.4-fkyjosv
buildable: false
parallel-netcdf:
externals:
- spec: [email protected]+cxx+fortran
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/parallel-netcdf-1.11.0-3x2favk
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/parallel-netcdf-1.11.0-x6vnnuz
modules:
- parallel-netcdf/1.11.0-3x2favk
- parallel-netcdf/1.11.0-x6vnnuz
buildable: false
{% endif %}
config:
Expand Down
26 changes: 13 additions & 13 deletions mache/spack/chrysalis_intel_openmpi.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spack:
specs:
specs:
- cmake
- intel
- openmpi
Expand All @@ -16,7 +16,7 @@ spack:
all:
compiler: [[email protected]]
providers:
mpi: [[email protected].1]
mpi: [[email protected].2]
lapack: [[email protected]]
bzip2:
externals:
Expand Down Expand Up @@ -81,10 +81,10 @@ spack:
buildable: false
openmpi:
externals:
- spec: [email protected].1
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/openmpi-4.1.1-qiqkjbu
- spec: [email protected].2
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/openmpi-4.1.2-k5epdq6
modules:
- openmpi/4.1.1-qiqkjbu
- openmpi-4.1.2-k5epdq6
buildable: false
intel-mkl:
externals:
Expand All @@ -97,30 +97,30 @@ spack:
hdf5:
externals:
- spec: [email protected]+cxx+fortran+hl+mpi
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/hdf5-1.8.16-35xugty
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/hdf5-1.8.16-kyyksst
modules:
- hdf5/1.8.16-35xugty
- hdf5/1.8.16-kyyksst
buildable: false
netcdf-c:
externals:
- spec: [email protected]+mpi~parallel-netcdf
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-c-4.4.1-2vngykq
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-c-4.4.1-rrkbpws
modules:
- netcdf-c/4.4.1-2vngykq
- netcdf-c/4.4.1-rrkbpws
buildable: false
netcdf-fortran:
externals:
- spec: [email protected]
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-2kddbib
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-znpfscr
modules:
- netcdf-fortran/4.4.4-2kddbib
- netcdf-fortran/4.4.4-znpfscr
buildable: false
parallel-netcdf:
externals:
- spec: [email protected]+cxx+fortran
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-go65een
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-c6fn7rw
modules:
- parallel-netcdf/1.11.0-go65een
- parallel-netcdf/1.11.0-c6fn7rw
buildable: false
{% endif %}
config:
Expand Down
8 changes: 4 additions & 4 deletions mache/spack/cori-haswell_gnu_mpt.csh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ module rm craype-mic-knl
module load craype-haswell

module swap cray-mpich cray-mpich/7.7.10
module swap PrgEnv-intel PrgEnv-gnu/6.0.5
module swap PrgEnv-intel PrgEnv-gnu/6.0.10
module rm gcc
module load gcc/8.3.0
module load gcc/10.3.0
module rm cray-libsci
module load cray-libsci/19.06.1
module load cray-libsci/20.09.1
module swap craype craype/2.6.2
module rm pmi
module load pmi/5.0.14
Expand All @@ -49,5 +49,5 @@ module load cray-parallel-netcdf/1.11.1.1
module rm git
module load git
module rm cmake
module load cmake/3.20.2
module load cmake
module load perl5-extras
8 changes: 4 additions & 4 deletions mache/spack/cori-haswell_gnu_mpt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ module rm craype-mic-knl
module load craype-haswell

module swap cray-mpich cray-mpich/7.7.10
module swap PrgEnv-intel PrgEnv-gnu/6.0.5
module swap PrgEnv-intel PrgEnv-gnu/6.0.10
module rm gcc
module load gcc/8.3.0
module load gcc/10.3.0
module rm cray-libsci
module load cray-libsci/19.06.1
module load cray-libsci/20.09.1
module swap craype craype/2.6.2
module rm pmi
module load pmi/5.0.14
Expand All @@ -49,5 +49,5 @@ module load cray-parallel-netcdf/1.11.1.1
module rm git
module load git
module rm cmake
module load cmake/3.20.2
module load cmake
module load perl5-extras
24 changes: 12 additions & 12 deletions mache/spack/cori-haswell_gnu_mpt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ spack:
concretization: together
packages:
all:
compiler: [gcc@8.3.0]
compiler: [gcc@10.3.0]
providers:
mpi: [[email protected]]
lapack: [cray-libsci@19.06.1]
lapack: [cray-libsci@20.09.1]
target:
- haswell
bzip2:
Expand Down Expand Up @@ -49,18 +49,18 @@ spack:
buildable: false
cmake:
externals:
- spec: cmake@3.14.4
prefix: /global/common/sw/cray/cnl7/haswell/cmake/3.14.4/gcc/8.2.0/2hef55n
- spec: cmake@3.22.1
prefix: /global/common/software/nersc/cori-2022q1/spack/cray-cnl7-haswell/cmake-3.22.1-zdiyyvt
modules:
- cmake/3.14.4
- cmake/3.22.1
buildable: false
gcc:
externals:
- spec: gcc@8.3.0
prefix: /opt/gcc/8.3.0/
- spec: gcc@10.3.0
prefix: /opt/gcc/10.3.0/
modules:
- PrgEnv-gnu/6.0.5
- gcc/8.3.0
- PrgEnv-gnu/6.0.10
- gcc/10.3.0
buildable: false
mpich:
externals:
Expand All @@ -70,9 +70,9 @@ spack:
buildable: false
cray-libsci:
externals:
- spec: cray-libsci@19.06.1
- spec: cray-libsci@20.09.1
modules:
- cray-libsci/19.06.1
- cray-libsci/20.09.1
buildable: false
{% if e3sm_hdf5_netcdf %}
hdf5:
Expand Down Expand Up @@ -108,7 +108,7 @@ spack:
install_missing_compilers: false
compilers:
- compiler:
spec: gcc@8.3.0
spec: gcc@10.3.0
paths:
cc: cc
cxx: CC
Expand Down
4 changes: 2 additions & 2 deletions mache/spack/cori-haswell_intel_mpt.csh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module rm craype-mic-knl
module load craype-haswell

module swap cray-mpich cray-mpich/7.7.10
module load PrgEnv-intel/6.0.5
module load PrgEnv-intel/6.0.10
module rm intel
module load intel/19.0.3.199
module swap craype craype/2.6.2
Expand All @@ -47,5 +47,5 @@ module load cray-parallel-netcdf/1.11.1.1
module rm git
module load git
module rm cmake
module load cmake/3.20.2
module load cmake
module load perl5-extras
4 changes: 2 additions & 2 deletions mache/spack/cori-haswell_intel_mpt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module rm craype-mic-knl
module load craype-haswell

module swap cray-mpich cray-mpich/7.7.10
module load PrgEnv-intel/6.0.5
module load PrgEnv-intel/6.0.10
module rm intel
module load intel/19.0.3.199
module swap craype craype/2.6.2
Expand All @@ -47,5 +47,5 @@ module load cray-parallel-netcdf/1.11.1.1
module rm git
module load git
module rm cmake
module load cmake/3.20.2
module load cmake
module load perl5-extras
14 changes: 7 additions & 7 deletions mache/spack/cori-haswell_intel_mpt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spack:
compiler: [[email protected]]
providers:
mpi: [[email protected]]
lapack: [cray-libsci@19.06.1]
lapack: [cray-libsci@20.09.1]
target:
- haswell
bzip2:
Expand Down Expand Up @@ -49,17 +49,17 @@ spack:
buildable: false
cmake:
externals:
- spec: cmake@3.14.4
prefix: /global/common/sw/cray/cnl7/haswell/cmake/3.14.4/gcc/8.2.0/2hef55n
- spec: cmake@3.22.1
prefix: /global/common/software/nersc/cori-2022q1/spack/cray-cnl7-haswell/cmake-3.22.1-zdiyyvt
modules:
- cmake/3.14.4
- cmake/3.22.1
buildable: false
intel:
externals:
- spec: [email protected]
prefix: /opt/intel/compilers_and_libraries_2019.3.199/
modules:
- PrgEnv-intel/6.0.5
- PrgEnv-intel/6.0.10
- intel/19.0.3.199
buildable: false
mpich:
Expand All @@ -70,9 +70,9 @@ spack:
buildable: false
cray-libsci:
externals:
- spec: cray-libsci@19.06.1
- spec: cray-libsci@20.09.1
modules:
- cray-libsci/19.06.1
- cray-libsci/20.09.1
buildable: false
{% if e3sm_hdf5_netcdf %}
hdf5:
Expand Down

0 comments on commit dd712ad

Please sign in to comment.