From c8bd45275a205e40936dbedcdb64ebffcf8409b7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 18 Sep 2020 07:17:39 -0600 Subject: [PATCH 1/4] Remove unnecessary/incorrect configuration options for Cheyenne for the UFS; revert Intel back to Intel-18.0.5 on Cheyenne --- config/ufs/machines/config_compilers.xml | 36 --------------------- config/ufs/machines/config_machines.xml | 41 +++++++++++------------- 2 files changed, 19 insertions(+), 58 deletions(-) diff --git a/config/ufs/machines/config_compilers.xml b/config/ufs/machines/config_compilers.xml index 4c8fad74938..65341a87d6c 100644 --- a/config/ufs/machines/config_compilers.xml +++ b/config/ufs/machines/config_compilers.xml @@ -276,16 +276,6 @@ using a fortran linker. icc icpc ifort - - -mkl=cluster - -mkl=cluster - -mkl=cluster - -mkl=cluster - -mkl=cluster - -mkl=cluster - -mkl=cluster - -mkl - TRUE @@ -491,25 +481,6 @@ using a fortran linker. - - - - -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY - - $ENV{NETCDF} - gpfs - $ENV{PNETCDF} - - - - - -DNO_MPIMOD - - - -ldl - - - -qopt-report -xCORE-AVX2 @@ -517,13 +488,6 @@ using a fortran linker. -qopt-report -xCORE-AVX2 - - -DPIO_ENABLE_LOGGING=ON - - $ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.2.8_cheyenne_Intel17.0.1_noMPI_noOpenMP - $ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.2.8_cheyenne_Intel17.0.1_MPI_openMP - - TRUE diff --git a/config/ufs/machines/config_machines.xml b/config/ufs/machines/config_machines.xml index 1b53603ea06..d3d3a1d9c1d 100644 --- a/config/ufs/machines/config_machines.xml +++ b/config/ufs/machines/config_machines.xml @@ -105,26 +105,24 @@ This allows using a different mpirun command to launch unit tests module module - - ncarenv/1.3 - cmake/3.16.4 + + ncarenv/1.3 + cmake/3.16.4 - intel/19.0.5 - mkl + intel/18.0.5 gnu/8.3.0 - openblas/0.3.6 - mpt/2.19 - netcdf/4.7.3 + mpt/2.19 + netcdf/4.7.3 - mpt/2.19 - netcdf/4.7.3 - pnetcdf/1.12.1 + mpt/2.19 + netcdf/4.7.3 + pnetcdf/1.12.1 impi/2019.6.154 @@ -132,15 +130,15 @@ This allows using a different mpirun command to launch unit tests pnetcdf/1.12.1 - ncarcompilers/0.5.0 + ncarcompilers/0.5.0 - /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-8.3.0/mpt-2.19 - NCEPlibs/1.1.0 + /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-8.3.0/mpt-2.19 + NCEPlibs/1.1.0 - /glade/p/ral/jntp/GMTB/tools/modulefiles/intel-19.0.5/mpt-2.19 - NCEPlibs/1.1.0 + /glade/p/ral/jntp/GMTB/tools/modulefiles/intel-18.0.5/mpt-2.19 + NCEPlibs/1.1.0 /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.0.5 @@ -151,10 +149,10 @@ This allows using a different mpirun command to launch unit tests esmf-8.1.0b24-ncdfio-intelmpi-g - netcdf/4.7.1 + netcdf/4.7.1 - netcdf/4.7.1 + netcdf/4.7.1 @@ -164,10 +162,9 @@ This allows using a different mpirun command to launch unit tests ON SUMMARY 1 - 1024M - 16 - 1 - + 512M + 20 + OFF:depth=4 -1 From aa08b16feaea22f45cae80bf20f371661cb7bb5b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 19 Sep 2020 13:58:44 -0600 Subject: [PATCH 2/4] Revert Intel compiler version from 19.x.y to 18.x.y on gaea and orion --- config/ufs/machines/config_batch.xml | 2 +- config/ufs/machines/config_machines.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/ufs/machines/config_batch.xml b/config/ufs/machines/config_batch.xml index 2e302157961..3c4d57efbe2 100644 --- a/config/ufs/machines/config_batch.xml +++ b/config/ufs/machines/config_batch.xml @@ -191,7 +191,7 @@ - regular + premium regular diff --git a/config/ufs/machines/config_machines.xml b/config/ufs/machines/config_machines.xml index d3d3a1d9c1d..5aaf5da383e 100644 --- a/config/ufs/machines/config_machines.xml +++ b/config/ufs/machines/config_machines.xml @@ -212,12 +212,12 @@ This allows using a different mpirun command to launch unit tests PrgEnv-intel/6.0.5 intel - intel/19.0.5.281 + intel/18.0.6.288 cray-mpich cray-mpich/7.7.11 cray-netcdf cmake/3.17.0 - /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-19.0.5.281/cray-mpich-7.7.11 + /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-18.0.6.288/cray-mpich-7.7.11 NCEPlibs/1.1.0 alps @@ -329,12 +329,12 @@ This allows using a different mpirun command to launch unit tests /apps/lmod/lmod/libexec/lmod python - intel/2020 + intel/2018.4 netcdf/4.7.2 cmake/3.15.4 - impi/2020 + impi/2018.4 From 080bcedc966c88e484bc6629a9b09a1005cbdad7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 21 Sep 2020 13:40:21 -0600 Subject: [PATCH 3/4] More configuration updates for gaea --- config/ufs/machines/config_machines.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/ufs/machines/config_machines.xml b/config/ufs/machines/config_machines.xml index 5aaf5da383e..f511dcdb899 100644 --- a/config/ufs/machines/config_machines.xml +++ b/config/ufs/machines/config_machines.xml @@ -201,12 +201,12 @@ This allows using a different mpirun command to launch unit tests - /opt/cray/pe/modules/3.2.10.5/init/perl.pm - /opt/cray/pe/modules/3.2.10.5/init/python.py - /opt/cray/pe/modules/3.2.10.5/init/csh - /opt/cray/pe/modules/3.2.10.5/init/sh - /opt/cray/pe/modules/4.1.3.1/bin/modulecmd perl - /opt/cray/pe/modules/4.1.3.1/bin/modulecmd python + /opt/cray/pe/modules/default/init/perl.pm + /opt/cray/pe/modules/default/init/python.py + /opt/cray/pe/modules/default/init/csh + /opt/cray/pe/modules/default/init/sh + /opt/cray/pe/modules/default/bin/modulecmd perl + /opt/cray/pe/modules/default/bin/modulecmd python module module From 370072fb079e82801fe7b4e89004a13c43a81c4e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 22 Sep 2020 05:58:50 -0600 Subject: [PATCH 4/4] Reverting unintentional change of default queue in config/ufs/machines/config_batch.xml --- config/ufs/machines/config_batch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ufs/machines/config_batch.xml b/config/ufs/machines/config_batch.xml index 3c4d57efbe2..2e302157961 100644 --- a/config/ufs/machines/config_batch.xml +++ b/config/ufs/machines/config_batch.xml @@ -191,7 +191,7 @@ - premium + regular regular