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

Merge pull request #1157 from wmbrownIntel/user-intel-makefiles

Changes to intel Makefiles to make use of MKL consistent.
parents 00c75ecb 8cbee787
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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
+3 −4
Original line number Diff line number Diff line
@@ -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
+3 −3
Original line number Diff line number Diff line
@@ -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 =       

+3 −3
Original line number Diff line number Diff line
@@ -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 =