jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to intel Makefiles to make use of MKL consistent.

This commit is contained in:
Michael Brown 2018-10-11 05:46:40 -07:00
parent 7faa48b4c3
commit 8cbee78725
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/MAKE/OPTIONS/Makefile.intel_cpu
View File

@ -15,8 +15,8 @@ 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

7
src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi
View File

@ -15,8 +15,8 @@ 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

6
src/MAKE/OPTIONS/Makefile.intel_cpu_mpich
View File

@ -15,8 +15,8 @@ SHFLAGS = -fPIC
DEPFLAGS = -M
LINK = mpicxx -cxx=icc
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
@ -53,7 +53,7 @@ MPI_LIB = -lmpich -lmpl -lpthread
# PATH = path for FFT library
# LIB = name of FFT library
FFT_INC =
FFT_INC = -DFFT_MKL -DFFT_SINGLE
FFT_PATH =
FFT_LIB =

6
src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi
View File

@ -16,8 +16,8 @@ SHFLAGS = -fPIC
DEPFLAGS = -M
LINK = mpicxx
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
@ -54,7 +54,7 @@ MPI_LIB =
# PATH = path for FFT library
# LIB = name of FFT library
FFT_INC =
FFT_INC = -DFFT_MKL -DFFT_SINGLE
FFT_PATH =
FFT_LIB =