From c176f1d8ddb913814c1edce74b8f5ba3c0fef736 Mon Sep 17 00:00:00 2001
From: Paolo Giannozzi
Date: Tue, 3 Mar 2020 10:45:48 +0000
Subject: [PATCH] Fixes for compilation with OpenMP
---
install/configure | 8 +++-----
install/m4/x_ac_qe_blas.m4 | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/install/configure b/install/configure
index e2d17535a..8b2f58a13 100755
--- a/install/configure
+++ b/install/configure
@@ -4945,7 +4945,7 @@ else
case "$f90" in
ifort* )
mkl_lib="mkl_intel_lp64"
- mkl_omp="mkl_ifort_thread"
+ mkl_omp="mkl_intel_thread"
if test "$arch" == "mac686"; then
add_mkl_flag="-openmp"
add_mkl_lib="-lpthread"
@@ -4958,10 +4958,8 @@ else
;;
pgf* )
mkl_lib="mkl_intel_lp64"
- mkl_omp="mkl_pgi_thread"
+ mkl_omp="mkl_intel_thread"
add_mkl_flag="-pgf90libs"
- add_mkl_lib="-ldl"
- add_mkl_omp="-ldl -lpthread -lm"
;;
esac
try_libdirs="$libdirs $MKLROOT/lib/intel64 $ld_library_path"
@@ -5046,7 +5044,7 @@ for ac_lib in '' $mkl_lib; do
ac_res="none required"
else
ac_res=-l$ac_lib
- LIBS="-l$ac_lib -lmkl_sequential -lmkl_core $add_mkl_omp $ac_func_search_save_LIBS"
+ LIBS="-l$ac_lib -l$mkl_omp -lmkl_core $add_mkl_omp $ac_func_search_save_LIBS"
fi
if ac_fn_f77_try_link "$LINENO"; then :
ac_cv_search_dgemm=$ac_res
diff --git a/install/m4/x_ac_qe_blas.m4 b/install/m4/x_ac_qe_blas.m4
index f9eab3ec6..8db7d7115 100644
--- a/install/m4/x_ac_qe_blas.m4
+++ b/install/m4/x_ac_qe_blas.m4
@@ -38,7 +38,7 @@ else
case "$f90" in
ifort* )
mkl_lib="mkl_intel_lp64"
- mkl_omp="mkl_ifort_thread"
+ mkl_omp="mkl_intel_thread"
if test "$arch" == "mac686"; then
add_mkl_flag="-openmp"
add_mkl_lib="-lpthread"
@@ -51,10 +51,8 @@ else
;;
pgf* )
mkl_lib="mkl_intel_lp64"
- mkl_omp="mkl_pgi_thread"
+ mkl_omp="mkl_intel_thread"
add_mkl_flag="-pgf90libs"
- add_mkl_lib="-ldl"
- add_mkl_omp="-ldl -lpthread -lm"
;;
esac
try_libdirs="$libdirs $MKLROOT/lib/intel64 $ld_library_path"
@@ -87,7 +85,7 @@ else
blas_libs="$try_loption $LIBS -l$mkl_omp -lmkl_core"
ldflags="$add_mkl_flag $ldflags",
echo "MKL not found",
- -lmkl_sequential -lmkl_core $add_mkl_omp)
+ -l$mkl_omp -lmkl_core $add_mkl_omp)
fi
if test "$ac_cv_search_dgemm" != "no"
then break ; fi