Unverified Commit d805c7db authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1733 from wmbrownIntel/intel-cpp11-make 

Adding -std=c++11 specifier to Intel Makefiles
parents 3d7881b3 7358a3ce

cmake/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ include(CheckCCompilerFlag) 
include(CheckIncludeFileCXX)



if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")

  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict")

  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict -std=c++11")

endif()



option(DISABLE_CXX11_REQUIREMENT "Disable check that requires C++11 for compiling LAMMPS" OFF)

src/MAKE/OPTIONS/Makefile.intel_coprocessor

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SHELL = /bin/sh 
# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpiicpc 

CC =		mpiicpc -std=c++11

MIC_OPT =       -qoffload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""

CCFLAGS =	-g -O3 -qopenmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64 \

                -xHost -fno-alias -ansi-alias -restrict -DLMP_INTEL_USELRT \
@@ -14,7 +14,7 @@ CCFLAGS = -g -O3 -qopenmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64 \ 
SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpiicpc

LINK =		mpiicpc -std=c++11

LINKFLAGS =	-g -O3 -xHost -qopenmp -qoffload

LIB =           -ltbbmalloc

SIZE =		size

src/MAKE/OPTIONS/Makefile.intel_cpu

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SHELL = /bin/sh 
# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpiicpc 

CC =		mpiicpc -std=c++11

OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits \

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \
@@ -15,7 +15,7 @@ CCFLAGS = -qopenmp -qno-offload -ansi-alias -restrict \ 
SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpiicpc

LINK =		mpiicpc -std=c++11

LINKFLAGS =	-qopenmp $(OPTFLAGS) -L$(MKLROOT)/lib/intel64/

LIB =           -ltbbmalloc -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core

SIZE =		size

src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SHELL = /bin/sh 
# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpiicpc 

CC =		mpiicpc -std=c++11

OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits \

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \
@@ -15,7 +15,7 @@ CCFLAGS = -qopenmp -qno-offload -ansi-alias -restrict \ 
SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpiicpc

LINK =		mpiicpc -std=c++11

LINKFLAGS =	-qopenmp $(OPTFLAGS) -L$(MKLROOT)/lib/intel64/

LIB =           -ltbbmalloc -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core	

SIZE =		size

src/MAKE/OPTIONS/Makefile.intel_cpu_mpich

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SHELL = /bin/sh 
# compiler/linker settings

# specify flags and libraries needed for your compiler



CC =		mpicxx -cxx=icc

CC =		mpicxx -cxx=icc -std=c++11

OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits \

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \
@@ -15,7 +15,7 @@ CCFLAGS = -qopenmp -qno-offload -ansi-alias -restrict \ 
SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpicxx -cxx=icc

LINK =		mpicxx -cxx=icc -std=c++11

LINKFLAGS =	-qopenmp $(OPTFLAGS) -L$(MKLROOT)/lib/intel64/

LIB =           -ltbbmalloc -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core

SIZE =		size

CRA Git | Maintained and supported by SUSTech CRA and CCSE