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

Merge pull request #1683 from wmbrownIntel/user-intel-g2s 

USER-INTEL: Explictly disabling G2S opts to improve lj/cut, eam, and …
parents b0b34005 5cf0a5bf

src/MAKE/OPTIONS/Makefile.intel_cpu

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SHELL = /bin/sh 
CC =		mpiicpc 

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

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS) \

                -I$(MKLROOT)/include

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SHELL = /bin/sh 
CC =		mpiicpc 

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

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS) \

                -I$(MKLROOT)/include

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_mpich

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SHELL = /bin/sh 
CC =		mpicxx -cxx=icc

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

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS) \

                -I$(MKLROOT)/include

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ export OMPI_CXX = icc 
CC =		mpicxx

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

                -qopt-zmm-usage=high

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS) \

                -I$(MKLROOT)/include

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.knl

+4 −5
Original line number Diff line number Diff line
@@ -8,15 +8,15 @@ SHELL = /bin/sh 


CC =		mpiicpc

OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -qoverride-limits

CCFLAGS =	-qopenmp -qno-offload -fno-alias -ansi-alias -restrict \

CCFLAGS =	-qopenmp -qno-offload -ansi-alias -restrict \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS) \

                -I$(MKLROOT)/include

SHFLAGS =	-fPIC

DEPFLAGS =	-M



LINK =		mpiicpc

LINKFLAGS =	-qopenmp $(OPTFLAGS)

LIB =           -ltbbmalloc

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

LIB =           -ltbbmalloc -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core

SIZE =		size



ARCHIVE =	ar
@@ -55,8 +55,7 @@ MPI_LIB = 


FFT_INC =       -DFFT_MKL -DFFT_SINGLE

FFT_PATH = 

FFT_LIB =       -L$(MKLROOT)/lib/intel64/ -lmkl_intel_ilp64 \

                -lmkl_sequential -lmkl_core	

FFT_LIB =



# JPEG and/or PNG library

# see discussion in Section 2.2 (step 7) of manual

CRA Git | Maintained and supported by SUSTech CRA and CCSE