From ef2f383e197c9ecfe977533e30b62a456dfc9d72 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 2 Aug 2024 13:50:22 -0600 Subject: [PATCH 1/2] update nvhpc and gnu on derecho --- machines/Depends.intel-oneapi | 8 +++++--- machines/cmake_macros/cray.cmake | 7 +++---- machines/derecho/config_machines.xml | 30 ++++++++++++++++------------ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/machines/Depends.intel-oneapi b/machines/Depends.intel-oneapi index c453f0e8..beb9eb76 100644 --- a/machines/Depends.intel-oneapi +++ b/machines/Depends.intel-oneapi @@ -6,9 +6,11 @@ derivative_mod.o \ bndry_mod.o \ prim_advance_mod.o -# CLM's SatellitePhenologyMod is compiled incorrectly with intel 15.0.0 at -O2 +# FMS netcdf_io gives ICE in intel-oneapi/2024.0.2 REDUCED_OPT_OBJS=\ -SatellitePhenologyMod.o +netcdf_io.o \ +fms_netcdf_domain_io.o \ +fms_netcdf_unstructured_domain_io.o # shr_wv_sat_mod does not need to have better than ~0.1% precision, and benefits # enormously from a lower precision in the vector functions. @@ -38,7 +40,7 @@ ifeq ($(DEBUG),FALSE) $(PERFOBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -no-prec-div $< $(REDUCED_OPT_OBJS): %.o: %.F90 - $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O1 $< + $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O0 $< $(REDUCED_PRECISION_OBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fimf-precision=low -fp-model fast $< $(SHR_RANDNUM_FORT_OBJS): %.o: %.F90 diff --git a/machines/cmake_macros/cray.cmake b/machines/cmake_macros/cray.cmake index 89c27843..076d5ad7 100644 --- a/machines/cmake_macros/cray.cmake +++ b/machines/cmake_macros/cray.cmake @@ -1,3 +1,5 @@ +set(FIXEDFLAGS " -f fixed") +set(FREEFLAGS " -f free") if (NOT compile_threaded) string(APPEND CFLAGS " -h noomp") endif() @@ -11,14 +13,11 @@ if (NOT DEBUG) string(APPEND CFLAGS " -O2") endif() string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRCRAY") -if (COMP_NAME STREQUAL pop) - string(APPEND CPPDEFS " -DDIR=NOOP") -endif() if (COMP_NAME STREQUAL moby) string(APPEND CPPDEFS " -DDIR=NOOP") endif() set(FC_AUTO_R8 "-s real64") -string(APPEND FFLAGS " -f free -N 255 -h byteswapio -x dir -ef") +string(APPEND FFLAGS " -N 255 -h byteswapio -x dir -ef") if (NOT compile_threaded) string(APPEND FFLAGS " -h noomp") endif() diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml index 12446f37..4a5003fe 100644 --- a/machines/derecho/config_machines.xml +++ b/machines/derecho/config_machines.xml @@ -1,7 +1,7 @@ NCAR AMD EPYC system CNL - intel,gnu,nvhpc,intel-oneapi,intel-classic + intel,gnu,nvhpc,intel-oneapi,cray mpich $ENV{SCRATCH} $ENV{CESMDATAROOT}/inputdata @@ -48,20 +48,17 @@ mkl - intel-oneapi/2023.2.1 - mkl - - - intel-classic/2023.2.1 + intel-oneapi/2024.0.2 mkl - cce/15.0.1 - cray-libsci/23.02.1.1 + cce/17.0.1 + cray-libsci/23.09.1.1 - gcc/12.2.0 + gcc/13.2.0 cray-libsci/23.02.1.1 + openblas/0.3.25 nvhpc/24.3 @@ -71,7 +68,10 @@ ncarcompilers/1.0.0 cmake - + + cray-mpich/8.1.29 + + cray-mpich/8.1.27 @@ -91,18 +91,22 @@ parallelio/2.6.2 - esmf/8.6.0 + esmf/8.6.1 parallelio/2.6.2 - esmf/8.6.0 + esmf/8.6.1 - + parallelio/2.6.2-debug esmf/8.6.0-debug + + parallelio/2.6.2-debug + esmf/8.6.1-debug + From 1a3e5c361bc79bbdffed36c045262dace8bf88ef Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 8 Aug 2024 06:06:29 -0600 Subject: [PATCH 2/2] update derecho port --- machines/derecho/config_machines.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml index 4a5003fe..120a2000 100644 --- a/machines/derecho/config_machines.xml +++ b/machines/derecho/config_machines.xml @@ -44,7 +44,7 @@ craype - intel/2023.2.1 + intel/2024.0.2 mkl @@ -61,19 +61,16 @@ openblas/0.3.25 - nvhpc/24.3 + nvhpc/24.7 ncarcompilers/1.0.0 cmake - + cray-mpich/8.1.29 - - cray-mpich/8.1.27 - cuda/12.2.1