From af68a2f4d3b7e98ed45353b057d208704a16f1bf Mon Sep 17 00:00:00 2001
From: ZhifengZhang-CN <zhifeng.zhang@zilliz.com>
Date: Mon, 11 Nov 2019 21:58:22 +0800
Subject: [PATCH] fix mkl library path error

---
 ci/travis/install_dependency.sh                   | 6 +++---
 core/src/index/cmake/ThirdPartyPackagesCore.cmake | 3 +--
 core/src/index/thirdparty/versions.txt            | 3 ++-
 core/thirdparty/versions.txt                      | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ci/travis/install_dependency.sh b/ci/travis/install_dependency.sh
index a2424727..6120fccd 100755
--- a/ci/travis/install_dependency.sh
+++ b/ci/travis/install_dependency.sh
@@ -32,8 +32,8 @@ sudo apt-get install -y -q --no-install-recommends \
   libboost-filesystem-dev \
   libboost-system-dev \
   libboost-regex-dev \
-  intel-mkl-gnu-2019.4-243 \
-  intel-mkl-core-2019.4-243  \
+  intel-mkl-gnu-2019.5-281 \
+  intel-mkl-core-2019.5-281 \
   libmysqlclient-dev \
   clang-format-6.0 \
   clang-tidy-6.0 \
@@ -42,4 +42,4 @@ sudo apt-get install -y -q --no-install-recommends \
 sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \
   /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so
 
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64
diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
index 8840db76..3173a37d 100644
--- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake
+++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
@@ -714,9 +714,8 @@ macro(build_faiss)
 
     if (BUILD_FAISS_WITH_MKL)
 
-        find_path(MKL_LIB_PATH
+        find_library(MKL_LIB_PATH
                 NAMES "libmkl_intel_ilp64.a" "libmkl_gnu_thread.a" "libmkl_core.a"
-                PATHS /opt
                 PATH_SUFFIXES "intel/compilers_and_libraries_${MKL_VERSION}/linux/mkl/lib/intel64/")
         if (${MKL_LIB_PATH} STREQUAL "MKL_LIB_PATH-NOTFOUND")
             message(FATAL_ERROR "Could not find MKL libraries")
diff --git a/core/src/index/thirdparty/versions.txt b/core/src/index/thirdparty/versions.txt
index a2b16414..f328ec43 100644
--- a/core/src/index/thirdparty/versions.txt
+++ b/core/src/index/thirdparty/versions.txt
@@ -3,4 +3,5 @@ BOOST_VERSION=1.70.0
 GTEST_VERSION=1.8.1
 LAPACK_VERSION=v3.8.0
 OPENBLAS_VERSION=v0.3.6
-FAISS_VERSION=branch-0.3.0
\ No newline at end of file
+FAISS_VERSION=branch-0.3.0
+MKL_VERSION=2019.5.281
diff --git a/core/thirdparty/versions.txt b/core/thirdparty/versions.txt
index 68023d40..4faaf119 100644
--- a/core/thirdparty/versions.txt
+++ b/core/thirdparty/versions.txt
@@ -9,6 +9,5 @@ LIBUNWIND_VERSION=1.3.1
 GPERFTOOLS_VERSION=2.7
 GRPC_VERSION=master
 ZLIB_VERSION=v1.2.11
-MKL_VERSION=2019.5.281
 
 # vim: set filetype=sh:
-- 
GitLab