From 0efdbb84e660bf2e02abf63e3d5294f461311544 Mon Sep 17 00:00:00 2001 From: Jan Thorbecke <janth@xs4all.nl> Date: Tue, 2 Apr 2019 13:56:20 +0200 Subject: [PATCH] adjusments --- FFTlib/rc1fft.c | 2 +- Make_include_template | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/FFTlib/rc1fft.c b/FFTlib/rc1fft.c index f37fb3d..2b0ae14 100644 --- a/FFTlib/rc1fft.c +++ b/FFTlib/rc1fft.c @@ -158,7 +158,7 @@ void dfti_status_print(MKL_LONG status) char* error_message; error_message = DftiErrorMessage(status); - printf("error_message = %s \n", error_message); + printf("error_message = %s \n", error_message); return; } #endif diff --git a/Make_include_template b/Make_include_template index 5c3fc50..ad3a451 100644 --- a/Make_include_template +++ b/Make_include_template @@ -88,6 +88,8 @@ MKLLIB=${MKLROOT}/lib #for GNU compilers #you might need to add intel64 to : ${MKLROOT}/lib/intel64 BLAS = -L${MKLROOT}/lib/ -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl +#for GNU on OSX +#BLAS = -L${MKLROOT}/lib/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl #on linux you want to use groups and MKL is in lib/intel64 #MKLLIB=${MKLROOT}/lib/intel64 #BLAS = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl @@ -106,11 +108,13 @@ MKLLIB=${MKLROOT}/lib OPTC += -DMKL -I$(MKLROOT)/include #for GNU compilers FFT = -Wl,-rpath ${MKLLIB} -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl +#for GNU on OSX +#FFT = -L${MKLROOT}/lib/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl #on linux you want to use groups and MKL is in lib/intel64 #MKLLIB=${MKLROOT}/lib/intel64 #FFT = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl #for Intel compilers -#FFT = -Wl,-rpath ${MKLLIB} -Wl,--start-group -L${MKLLIB} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -Wl,--end-group -lpthread -lm -ldl +#FFT = -Wl,-rpath ${MKLLIB} -L${MKLLIB} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl #LIBARIES LIBS= -L$L -lgenfft $(FFT) $(BLAS) -- GitLab