From 170d3eb4a2626dd9f75f40b814d7164a91a1366e Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Sat, 29 Jul 2017 18:30:15 +0000 Subject: [PATCH 1/4] Update Theta machine config --- config/acme/machines/config_compilers.xml | 14 +++----- config/acme/machines/config_machines.xml | 39 +++++++++++------------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml index 898d3d9f730..fcada5dbab9 100644 --- a/config/acme/machines/config_compilers.xml +++ b/config/acme/machines/config_compilers.xml @@ -1012,21 +1012,17 @@ for mct, etc. - ftn - cc - CC - -O2 -xMIC-AVX512 - -O2 -xMIC-AVX512 - -O0 -g -xMIC-AVX512 - -O0 -g -xMIC-AVX512 + ifort + icc + icpc + -O2 -debug minimal -qno-opt-dynamic-align -qopenmp -qopenmp -qopenmp -qopenmp --host=Linux -L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib - -mkl -lpthread -lm - -DHAVE_COMM_F2C + -mkl -lpthread diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index aaa5c8f40f9..ea072325fd9 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1291,7 +1291,6 @@ /projects/EarlyPerf_theta/acme/csm/$CASE /projects/EarlyPerf_theta/acme/baselines /projects/EarlyPerf_theta/acme/tools/cprnc - /projects/EarlyPerf_theta/acme CNL cobalt_theta acme @@ -1321,47 +1320,47 @@ module module + craype-mic-knl PrgEnv-intel PrgEnv-cray PrgEnv-gnu intel cce + cray-mpich cray-parallel-netcdf cray-hdf5-parallel - pmi - cray-libsci - cray-mpich - cray-netcdf cray-hdf5 + cray-netcdf cray-netcdf-hdf5parallel + cray-libsci craype + + craype/2.5.11 + - PrgEnv-intel/6.0.3 - intel intel/17.0.2.174 - cray-libsci + PrgEnv-intel/6.0.4 + intel/17.0.4.196 - PrgEnv-cray/6.0.3 - cce cce/8.5.4 + PrgEnv-cray/6.0.4 + cce/8.6.0 - PrgEnv-gnu/6.0.3 - gcc gcc/6.2.0 - - - craype craype/2.5.9 + PrgEnv-gnu/6.0.4 + gcc/6.3.0 - cray-libsci/16.09.1 + cray-libsci/17.06.1 - cray-mpich/7.5.3 + craype-mic-knl + cray-mpich/7.6.0 - cray-netcdf-hdf5parallel/4.4.1.1 - cray-hdf5-parallel/1.10.0.1 - cray-parallel-netcdf/1.8.0 + cray-netcdf-hdf5parallel/4.4.1.1.3 + cray-hdf5-parallel/1.10.0.3 + cray-parallel-netcdf/1.8.1.3 From 538b1f0fa78b1bf3e8ce155314991623a1a43d1b Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Sat, 29 Jul 2017 22:25:58 +0000 Subject: [PATCH 2/4] Resolve paths from $PROJECT --- config/acme/machines/config_machines.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index ea072325fd9..84cf88b23b1 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1284,11 +1284,11 @@ acme_developer intel,gnu,cray mpt - /projects/EarlyPerf_theta/acme/scratch/$USER + /projects/$PROJECT/$USER /projects/EarlyPerf_theta/acme/inputdata /projects/EarlyPerf_theta/acme/inputdata/atm/datm7 $CIME_OUTPUT_ROOT/archive/$CASE - /projects/EarlyPerf_theta/acme/csm/$CASE + $CIME_OUTPUT_ROOT/csm/$CASE /projects/EarlyPerf_theta/acme/baselines /projects/EarlyPerf_theta/acme/tools/cprnc CNL From 50e09da3b0429a676f7735347005f0da463976e6 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Mon, 31 Jul 2017 18:11:34 +0000 Subject: [PATCH 3/4] Update default project on Theta --- config/acme/machines/config_compilers.xml | 1 + config/acme/machines/config_machines.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml index fcada5dbab9..da38592e601 100644 --- a/config/acme/machines/config_compilers.xml +++ b/config/acme/machines/config_compilers.xml @@ -1023,6 +1023,7 @@ for mct, etc. --host=Linux -L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib -mkl -lpthread + -DARCH_MIC_KNL diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index 84cf88b23b1..590e83c46c4 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1285,19 +1285,19 @@ intel,gnu,cray mpt /projects/$PROJECT/$USER - /projects/EarlyPerf_theta/acme/inputdata - /projects/EarlyPerf_theta/acme/inputdata/atm/datm7 + /projects/$PROJECT/acme/inputdata + /projects/$PROJECT/acme/inputdata/atm/datm7 $CIME_OUTPUT_ROOT/archive/$CASE $CIME_OUTPUT_ROOT/csm/$CASE - /projects/EarlyPerf_theta/acme/baselines - /projects/EarlyPerf_theta/acme/tools/cprnc + /projects/$PROJECT/acme/baselines + /projects/$PROJECT/acme/tools/cprnc/cprnc CNL cobalt_theta acme 8 64 64 - Theta_ESP + OceanClimate TRUE -D PIO_BUILD_TIMING:BOOL=ON From af3f14ad05cc2293670c87fe09dfe369a96255eb Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Mon, 31 Jul 2017 20:45:46 +0000 Subject: [PATCH 4/4] Update batch settings --- config/acme/machines/config_batch.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/acme/machines/config_batch.xml b/config/acme/machines/config_batch.xml index f8d5d4df538..03acb0aa580 100644 --- a/config/acme/machines/config_batch.xml +++ b/config/acme/machines/config_batch.xml @@ -253,7 +253,8 @@ - default + default + debug-cache-quad