Skip to content

Commit

Permalink
For cori-knl and Intel compiler, adjust the compiler flags to be more…
Browse files Browse the repository at this point in the history
… restrictive and allow more tests to pass.

For Intel 17, instead of -fp-model source, use -fp-model consistent.
For Intel 18, instead of -fp-model source, use -fp-model consistent -fimf-use-svml.
Fixes #1477
  • Loading branch information
ndkeen committed Nov 11, 2017
1 parent 046c7cb commit 42f4993
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ for mct, etc.
</compiler>

<compiler COMPILER="intel" MACH="cori-knl">
<FFLAGS> -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model consistent </FFLAGS>
<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>
Expand All @@ -633,6 +634,7 @@ for mct, etc.
</compiler>

<compiler COMPILER="intel" MACH="cori-knl" MPILIB="impi">
<FFLAGS> -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model consistent </FFLAGS>
<!-- When using Intel MPI, can't use the Cray compiler wrappers. -->
<MPI_LIB_NAME>impi</MPI_LIB_NAME>
<MPIFC> mpiifort </MPIFC>
Expand Down Expand Up @@ -667,6 +669,7 @@ for mct, etc.

<compiler COMPILER="intel18" MACH="cori-knl">
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<FFLAGS> -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model consistent -fimf-use-svml </FFLAGS>
<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>
Expand All @@ -677,6 +680,7 @@ for mct, etc.

<compiler COMPILER="intel18" MACH="cori-knl" MPILIB="impi">
<!-- When using Intel MPI, can't use the Cray compiler wrappers. -->
<FFLAGS> -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model consistent -fimf-use-svml </FFLAGS>
<MPI_LIB_NAME>impi</MPI_LIB_NAME>
<MPIFC> mpiifort </MPIFC>
<MPICC> mpiicc </MPICC>
Expand Down

0 comments on commit 42f4993

Please sign in to comment.