Skip to content

Commit

Permalink
Merge branch ACME-Climate/ndk/machinefiles/intel18-option-nersc (PR #…
Browse files Browse the repository at this point in the history
…1710)

Update modules for Cori after maintenance AND add intel18 option for Cori and Edison
  • Loading branch information
ndkeen authored Aug 14, 2017
2 parents 57d0825 + 1a1c6ce commit c85ca0c
Show file tree
Hide file tree
Showing 2 changed files with 345 additions and 253 deletions.
61 changes: 61 additions & 0 deletions config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,34 @@ for mct, etc.
<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
<HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
</compiler>

<compiler COMPILER="intel18">
<ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL</ADD_CPPDEFS>
<ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
<ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
<ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
<FREEFLAGS> -free </FREEFLAGS>
<FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal -qno-opt-dynamic-align </ADD_FFLAGS>
<ADD_CFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_CFLAGS>
<ADD_CFLAGS DEBUG="TRUE"> -O0 -g </ADD_CFLAGS>
<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>
<ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
<FC_AUTO_R8> -r8 </FC_AUTO_R8>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<MPIFC> mpif90 </MPIFC>
<MPICC> mpicc </MPICC>
<MPICXX> mpicxx </MPICXX>
<CXX_LINKER>FORTRAN</CXX_LINKER>
<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
<HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
</compiler>

<compiler COMPILER="intel" OS="Linux">
Expand Down Expand Up @@ -593,6 +620,40 @@ for mct, etc.
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
</compiler>

<!-- These 3 NERSC machines inherit from intel18 compiler settings above (as well as CNL entry) -->
<compiler COMPILER="intel18" MACH="edison">
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
<ADD_SLIBS> -mkl -lpthread </ADD_SLIBS>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
</compiler>

<compiler COMPILER="intel18" MACH="cori-haswell">
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
<ADD_SLIBS> -mkl -lpthread </ADD_SLIBS>
<!--ADD_SLIBS MPILIB="mpi-serial"> -mkl=sequential -lpthread </ADD_SLIBS-->
<!--ADD_SLIBS MPILIB="mpich"> -mkl -lpthread </ADD_SLIBS-->
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
</compiler>

<compiler COMPILER="intel18" MACH="cori-knl">
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
<ADD_SLIBS> -mkl -lpthread </ADD_SLIBS>
<ADD_CPPDEFS> -DARCH_MIC_KNL </ADD_CPPDEFS>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
</compiler>

<compiler COMPILER="intel" MACH="eos">
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
Expand Down
Loading

0 comments on commit c85ca0c

Please sign in to comment.