Unverified Commit 88a2f9fc authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #775 from wmbrownIntel/user-intel-2018u1 

USER-INTEL: Adding compiler flag and small fix to tersoff/intel for 2…
parents 480d7dd6 07ddb5e6

src/MAKE/OPTIONS/Makefile.intel_cpu

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,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 \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS)

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,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 \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS)

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_mpich

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ SHELL = /bin/sh 
# specify flags and libraries needed for your compiler



CC =		mpicxx -cxx=icc

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

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 \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS)

SHFLAGS =	-fPIC

src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ SHELL = /bin/sh 


export OMPI_CXX = icc

CC =		mpicxx

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

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 \

                -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG $(OPTFLAGS)

SHFLAGS =	-fPIC

src/USER-INTEL/pair_tersoff_intel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ void IntelKernelTersoff<flt_t,acc_t,mic, pack_i>::attractive_vector( 
  fvec vrij_hatx = vrijinv * vdijx;

  fvec vrij_haty = vrijinv * vdijy;

  fvec vrij_hatz = vrijinv * vdijz;

  fvec rikinv = invsqrt(rsq2);

  fvec rikinv = v::invsqrt(rsq2);

  fvec rik_hatx = rikinv * dikx;

  fvec rik_haty = rikinv * diky;

  fvec rik_hatz = rikinv * dikz;

CRA Git | Maintained and supported by SUSTech CRA and CCSE