Merge branch ACME-Climate/ndk/cime/edison-gnu62 (PR #1533)

Update GNU compiler to 6.2 on edison (along with mpich). Also add "intel17" compiler
E3SM-Project · May 22, 2017 · 0aad219 · 0aad219
2 parents e48b3c4 + ced0d78
commit 0aad219
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 11 deletions.
diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml
@@ -561,6 +561,45 @@ for mct, etc.
   <ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_09232015/Albany/build/install</ALBANY_PATH>
 </compiler>
 
+<compiler COMPILER="intel17" MACH="edison">
+  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL</ADD_CPPDEFS>
+  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+
+  <FFLAGS>  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source </FFLAGS>
+  <CFLAGS> -O2 -fp-model precise -std=gnu99 </CFLAGS>
+  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
+  <FREEFLAGS> -free </FREEFLAGS>
+  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
+
+  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -qno-opt-dynamic-align </ADD_FFLAGS>
+  <ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal -qno-opt-dynamic-align </ADD_FFLAGS>
+
+  <ADD_CFLAGS DEBUG="TRUE"> -O0 -g </ADD_CFLAGS>
+  <ADD_CFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_CFLAGS>
+  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
+
+  <ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
+  <ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
+  <ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
+  <ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
+
+  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
+  <ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS>
+  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
+  <ADD_CPPDEFS> -DHAVE_SLASHPROC </ADD_CPPDEFS>
+  <MPIFC> ftn </MPIFC>
+  <MPICC> cc </MPICC>
+  <MPICXX> CC </MPICXX>
+  <SFC> ifort </SFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
+</compiler>
+
 <compiler COMPILER="intel" MACH="cori-haswell">
   <ADD_FFLAGS DEBUG="FALSE"> -O2 -qno-opt-dynamic-align </ADD_FFLAGS>
   <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>

diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
@@ -60,7 +60,7 @@
   <DESC>NERSC XC30, os is CNL, 24 pes/node, batch system is SLURM</DESC>
   <NODENAME_REGEX>edison</NODENAME_REGEX>
   <TESTS>acme_developer</TESTS>
-  <COMPILERS>intel,gnu,cray</COMPILERS>
+  <COMPILERS>intel,intel17,gnu,cray</COMPILERS>
   <MPILIBS>mpt,mpi-serial</MPILIBS>
   <CIME_OUTPUT_ROOT>$ENV{CSCRATCH}/acme_scratch/edison</CIME_OUTPUT_ROOT>
   <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
@@ -126,20 +126,27 @@
       <command name="load">PrgEnv-intel</command>
       <command name="rm">intel</command>
       <command name="load">intel/15.0.1.133</command>
-      <!--command name="load">intel/16.0.2.181</command-->
-      <!--command name="load">intel/17.0.0.098</command-->
       <command name="rm">cray-libsci</command>
+      <command name="load">cray-mpich/7.2.5</command> 
+    </modules>
+    <modules compiler="intel17">
+      <command name="load">PrgEnv-intel</command>
+      <command name="rm">intel</command>
+      <command name="load">intel/17.0.1.132</command>
+      <command name="rm">cray-libsci</command>
+      <command name="load">cray-mpich/7.5.1</command> 
     </modules>
     <modules compiler="cray">
       <command name="load">PrgEnv-cray</command>
-      <command name="switch">cce cce/8.4.3</command>
+      <command name="switch">cce cce/8.5.1</command>
+      <command name="switch">cray-libsci/16.07.1</command>
+      <command name="load">cray-mpich/7.5.1</command> 
     </modules>
     <modules compiler="gnu">
       <command name="load">PrgEnv-gnu</command>
-      <command name="switch">gcc gcc/5.1.0</command>
-    </modules>
-    <modules compiler="!intel">
+      <command name="switch">gcc gcc/6.2.0</command>
       <command name="switch">cray-libsci/16.07.1</command>
+      <command name="load">cray-mpich/7.5.1</command> 
     </modules>
 
     <modules>
@@ -148,10 +155,6 @@
       <command name="load">craype-ivybridge</command>
       <command name="rm">pmi</command>
       <command name="load">pmi/5.0.10-1.0000.11050.0.0.ari</command>
-
-      <!--command name="load">cray-mpich/7.3.1</command  acme original  -->
-      <!--command name="load">cray-mpich/7.4.1</command  edison default -->
-      <command name="load">cray-mpich/7.2.5</command>
     </modules>
 
     <modules mpilib="mpi-serial">
@@ -164,6 +167,7 @@
       <command name="load">cray-parallel-netcdf/1.6.1</command>
     </modules>
     <modules>
+      <command name="load">git/2.4.6</command>
       <command name="load">papi/5.4.3.2</command>
       <command name="load">perl/5.20.0</command>
       <command name="load">cmake/3.3.2</command>
@@ -177,6 +181,7 @@
     <env name="MPICH_CPUMASK_DISPLAY">1</env>
     <env name="OMP_STACKSIZE">64M</env>
     <env name="FORT_BUFFERED" compiler="intel">yes</env>
+    <env name="FORT_BUFFERED" compiler="intel17">yes</env>
   </environment_variables>
 
 </machine>