Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to build with Intel version 18 (beta) on cori-knl #1696

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cime/config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,41 @@ for mct, etc.
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
</compiler>

<compiler COMPILER="intel18" MACH="cori-knl">
<!-- need base intel settings as well those for cori-knl -->
<ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16 -DCPRINTEL </ADD_CPPDEFS>
<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 </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>
<FC_AUTO_R8> -r8 </FC_AUTO_R8>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<MPIFC> ftn </MPIFC>
<MPICC> cc </MPICC>
<MPICXX> CC </MPICXX>
<CXX_LINKER>FORTRAN</CXX_LINKER>
<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>

<ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal -qno-opt-dynamic-align </ADD_FFLAGS>
<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>
<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>
<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
34 changes: 26 additions & 8 deletions cime/config/acme/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
<DESC>Cori. XC40 Cray system at NERSC. KNL partition. os is CNL, 68 pes/node (for now only use 64), batch system is SLURM</DESC>
<NODENAME_REGEX>cori-knl-haswell-is-default</NODENAME_REGEX>
<TESTS>acme_developer</TESTS>
<COMPILERS>intel,gnu,cray</COMPILERS>
<COMPILERS>intel,intel18,gnu,cray</COMPILERS>
<MPILIBS>mpt,mpi-serial</MPILIBS>
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}/acme_scratch/cori-knl</CIME_OUTPUT_ROOT>
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
Expand Down Expand Up @@ -380,32 +380,46 @@
<command name="load">PrgEnv-intel</command>
<command name="rm">intel</command>
<command name="load">intel/17.0.2.174</command>
<command name="rm">craype</command>
<command name="load">craype/2.5.7</command>
<command name="load">cray-mpich/7.4.4</command>
</modules>

<modules compiler="intel18">
<command name="load">PrgEnv-intel</command>
<command name="rm">intel</command>
<command name="load">intel/2018.beta</command>
<command name="rm">craype</command>
<command name="load">craype/2.5.10</command>
<command name="rm">cray-mpich</command>
<command name="load">cray-mpich/7.5.5</command>
</modules>

<modules compiler="cray">
<command name="rm">PrgEnv-intel</command>
<command name="load">PrgEnv-cray</command>
<command name="rm">cce</command>
<command name="load">cce/8.5.4</command>
<command name="load">cray-libsci/16.09.1</command>
<command name="rm">craype</command>
<command name="load">craype/2.5.7</command>
<command name="load">cray-mpich/7.4.4</command>
</modules>

<modules compiler="gnu">
<command name="rm">PrgEnv-intel</command>
<command name="load">PrgEnv-gnu</command>
<command name="rm">gcc</command>
<command name="load">gcc/6.3.0</command>
</modules>
<modules compiler="!intel">
<command name="load">cray-libsci/16.09.1</command>
</modules>

<modules>
<command name="rm">craype</command>
<command name="load">craype/2.5.7</command>
<command name="load">cray-mpich/7.4.4</command>
</modules>

<modules>
<command name="rm">craype-haswell</command>
<command name="load">craype-mic-knl</command>

<command name="load">cray-mpich/7.4.4</command>
</modules>

<modules mpilib="mpi-serial">
Expand Down Expand Up @@ -438,7 +452,11 @@
<env name="OMP_PROC_BIND">spread</env>
<env name="OMP_PLACES">threads</env>

<env name="MPICH_MEMORY_REPORT" compiler="intel18">1</env>

<env name="FORT_BUFFERED" compiler="intel">yes</env>
<env name="FORT_BUFFERED" compiler="intel18">yes</env>

</environment_variables>
</machine>

Expand Down