Skip to content

Commit 6547023

Browse files
ukmo-juan-castilloukmo-juan-castillo
authored
New regtest matrix for the Met Office EX supercomputer (NOAA-EMC#1448)
1 parent e88ae71 commit 6547023

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

‎regtests/bin/matrix_cmake_ukmo_cray‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ EOF
6666
echo '#PBS -l ncpus=16' >> matrix.head
6767
echo '#PBS -l mem=16GB' >> matrix.head
6868
echo '#PBS -q shared' >> matrix.head
69-
echo '#PBS -l walltime=04:00:00' >> matrix.head
69+
echo '#PBS -l walltime=03:00:00' >> matrix.head
7070
echo '#PBS -N ww3_regtest' >> matrix.head
7171
echo '#PBS -j oe' >> matrix.head
7272
echo '#PBS -o matrix.out' >> matrix.head
@@ -78,38 +78,36 @@ EOF
7878
if [[ $cmplr == "ukmo_cray" ]] || [[ $cmplr == "ukmo_cray_debug" ]]; then
7979
# Load targetted versions of Cray Development Tools (bug in Fortran StreamIO
8080
# for older versions) and netCDF/HDF5 modules:
81-
echo "module load cdt/18.12" >> matrix.head
82-
echo "module load cray-netcdf/4.6.1.3" >> matrix.head
83-
echo "module load cray-hdf5/1.10.2.0" >> matrix.head
84-
echo "export METIS_PATH=/home/d02/frey/WW3/ParMETIS" >> matrix.head
81+
echo "module switch PrgEnv-cray PrgEnv-cray/8.4.0" >> matrix.head
82+
echo "module load cpe/23.05" >> matrix.head
83+
echo "module switch cce cce/15.0.0" >> matrix.head
84+
echo "module load cray-hdf5-parallel/1.12.2.1" >> matrix.head
85+
echo "module load cray-netcdf-hdf5parallel/4.9.0.1" >> matrix.head
86+
echo "export METIS_PATH=/data/users/juan.m.castillo/REGTESTS/parmetis-4.0.3_cce" >> matrix.head
87+
echo "export SCOTCH_PATH=/data/users/juan.m.castillo/REGTESTS/scotch_cce" >> matrix.head
8588

8689
elif [[ $cmplr == ukmo_cray_gnu* ]]; then
8790
# ParMETIS library not currently working with Cray compiler.
8891
# Use GNU compiler for programs that use PDLIB.
89-
echo "module switch PrgEnv-cray PrgEnv-gnu/5.2.82" >> matrix.head
90-
echo "module load cray-netcdf" >> matrix.head
91-
echo "export METIS_PATH=/home/d02/frey/WW3/ParMETIS_GNU" >> matrix.head
92-
93-
elif [[ $cmplr == ukmo_cray_intel* ]]; then
94-
echo "module switch PrgEnv-cray PrgEnv-intel" >> matrix.head
95-
echo "module swap intel/15.0.0.090 intel/18.0.5.274" >> matrix.head
96-
echo "module load cdt/18.12" >> matrix.head
97-
echo "module load cray-netcdf/4.6.1.3" >> matrix.head
98-
echo "module load cray-hdf5/1.10.2.0" >> matrix.head
92+
echo "module switch PrgEnv-cray PrgEnv-gnu/8.4.0" >> matrix.head
93+
echo "module load cpe/23.05" >> matrix.head
94+
echo "module load cray-hdf5-parallel/1.12.2.1" >> matrix.head
95+
echo "module load cray-netcdf-hdf5parallel/4.9.0.1" >> matrix.head
96+
echo "export METIS_PATH=/data/users/juan.m.castillo/REGTESTS/parmetis-4.0.3_gnu" >> matrix.head
97+
echo "export SCOTCH_PATH=/data/users/juan.m.castillo/REGTESTS/scotch_gnu" >> matrix.head
9998

10099
else
101100
echo "Unknown compiler for UKMO regression tests: $cmplr"
102101
exit 1
103102
fi
104103

105-
# Need newer cmake version on the XC
106-
echo "module load cmake/3.21.3" >> matrix.head
107-
108-
# SNP Launcher 7.7.4 allows -np switch:
109-
echo "module load cray-snplauncher/7.7.4" >> matrix.head
110104
echo "export NETCDF_CONFIG=\$(which nc-config)" >> matrix.head
111105

112-
# On the Cray XC, we need to stop CMake from searching for
106+
# For CMAKE
107+
echo "export CC=cc" >> matrix.head
108+
echo "export FTN=ftn" >> matrix.head
109+
110+
# On the EX, we need to stop CMake from searching for
113111
# the NetCDF libraries - they are provided by the ftn wrapper.
114112
echo "export CMAKE_OPTIONS=-DEXCLUDE_FIND=\"netcdf\"" >> matrix.head
115113

‎regtests/bin/matrix_ukmo_cray‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
echo '#PBS -l ncpus=16' >> matrix.head
5252
echo '#PBS -l mem=16GB' >> matrix.head
5353
echo '#PBS -q shared' >> matrix.head
54-
echo '#PBS -l walltime=04:00:00' >> matrix.head
54+
echo '#PBS -l walltime=03:00:00' >> matrix.head
5555
echo '#PBS -N ww3_regtest' >> matrix.head
5656
echo '#PBS -j oe' >> matrix.head
5757
echo '#PBS -o matrix.out' >> matrix.head
@@ -63,34 +63,34 @@
6363
if [[ $cmplr == "ukmo_cray" ]] || [[ $cmplr == "ukmo_cray_debug" ]]; then
6464
# Load targetted versions of Cray Development Tools (bug in Fortran StreamIO
6565
# for older versions) and netCDF/HDF5 modules:
66-
echo "module load cdt/18.12" >> matrix.head
67-
echo "module load cray-netcdf/4.6.1.3" >> matrix.head
68-
echo "module load cray-hdf5/1.10.2.0" >> matrix.head
69-
echo "export METIS_PATH=/home/d02/frey/WW3/ParMETIS" >> matrix.head
66+
echo "module switch PrgEnv-cray PrgEnv-cray/8.4.0" >> matrix.head
67+
echo "module load cpe/23.05" >> matrix.head
68+
echo "module switch cce cce/15.0.0" >> matrix.head
69+
echo "module load cray-hdf5-parallel/1.12.2.1" >> matrix.head
70+
echo "module load cray-netcdf-hdf5parallel/4.9.0.1" >> matrix.head
71+
echo "export METIS_PATH=/data/users/juan.m.castillo/REGTESTS/parmetis-4.0.3_cce" >> matrix.head
72+
echo "export SCOTCH_PATH=/data/users/juan.m.castillo/REGTESTS/scotch_cce" >> matrix.head
7073

7174
elif [[ $cmplr == ukmo_cray_gnu* ]]; then
7275
# ParMETIS library not currently working with Cray compiler.
7376
# Use GNU compiler for programs that use PDLIB.
74-
echo "module switch PrgEnv-cray PrgEnv-gnu/5.2.82" >> matrix.head
75-
echo "module load cray-netcdf" >> matrix.head
76-
echo "export METIS_PATH=/home/d02/frey/WW3/ParMETIS_GNU" >> matrix.head
77-
78-
elif [[ $cmplr == ukmo_cray_intel* ]]; then
79-
echo "module switch PrgEnv-cray PrgEnv-intel" >> matrix.head
80-
echo "module swap intel/15.0.0.090 intel/18.0.5.274" >> matrix.head
81-
echo "module load cdt/18.12" >> matrix.head
82-
echo "module load cray-netcdf/4.6.1.3" >> matrix.head
83-
echo "module load cray-hdf5/1.10.2.0" >> matrix.head
77+
echo "module switch PrgEnv-cray PrgEnv-gnu/8.4.0" >> matrix.head
78+
echo "module load cpe/23.05" >> matrix.head
79+
echo "module load cray-hdf5-parallel/1.12.2.1" >> matrix.head
80+
echo "module load cray-netcdf-hdf5parallel/4.9.0.1" >> matrix.head
81+
echo "export METIS_PATH=/data/users/juan.m.castillo/REGTESTS/parmetis-4.0.3_gnu" >> matrix.head
82+
echo "export SCOTCH_PATH=/data/users/juan.m.castillo/REGTESTS/scotch_gnu" >> matrix.head
8483

8584
else
8685
echo "Unknown compiler for UKMO regression tests: $cmplr"
8786
exit 1
8887
fi
8988

90-
# SNP Launcher 7.7.4 allows -np switch:
91-
echo " module load cray-snplauncher/7.7.4" >> matrix.head
89+
echo " export NETCDF_CONFIG=\$(which nc-config)" >> matrix.head
9290

93-
echo " export NETCDF_CONFIG=\$(which nc-config)" >> matrix.head
91+
# For CMAKE
92+
echo "export CC=cc" >> matrix.head
93+
echo "export FTN=ftn" >> matrix.head
9494

9595
# Compiler option. Set cmplOption to
9696
# y if using for the first time or using a different compiler

0 commit comments

Comments
 (0)