From 8cbee78725c92f8059331ad8e5932c2418a425de Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 11 Oct 2018 05:46:40 -0700 Subject: [PATCH] Changes to intel Makefiles to make use of MKL consistent. --- src/MAKE/OPTIONS/Makefile.intel_cpu | 7 +++---- src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi | 7 +++---- src/MAKE/OPTIONS/Makefile.intel_cpu_mpich | 6 +++--- src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu b/src/MAKE/OPTIONS/Makefile.intel_cpu index efd8ac288d..831b16d854 100644 --- a/src/MAKE/OPTIONS/Makefile.intel_cpu +++ b/src/MAKE/OPTIONS/Makefile.intel_cpu @@ -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 diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi b/src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi index 9d425bf22a..926518f354 100644 --- a/src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi +++ b/src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi @@ -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 diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu_mpich b/src/MAKE/OPTIONS/Makefile.intel_cpu_mpich index 102e66f8bb..61934b69b4 100644 --- a/src/MAKE/OPTIONS/Makefile.intel_cpu_mpich +++ b/src/MAKE/OPTIONS/Makefile.intel_cpu_mpich @@ -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 = diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi b/src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi index a0dea06aac..ee26443f7d 100644 --- a/src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi +++ b/src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi @@ -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 =