提交 af68a2f4 编写于 作者: Z ZhifengZhang-CN

fix mkl library path error

上级 89f094f7
...@@ -32,8 +32,8 @@ sudo apt-get install -y -q --no-install-recommends \ ...@@ -32,8 +32,8 @@ sudo apt-get install -y -q --no-install-recommends \
libboost-filesystem-dev \ libboost-filesystem-dev \
libboost-system-dev \ libboost-system-dev \
libboost-regex-dev \ libboost-regex-dev \
intel-mkl-gnu-2019.4-243 \ intel-mkl-gnu-2019.5-281 \
intel-mkl-core-2019.4-243 \ intel-mkl-core-2019.5-281 \
libmysqlclient-dev \ libmysqlclient-dev \
clang-format-6.0 \ clang-format-6.0 \
clang-tidy-6.0 \ clang-tidy-6.0 \
...@@ -42,4 +42,4 @@ sudo apt-get install -y -q --no-install-recommends \ ...@@ -42,4 +42,4 @@ sudo apt-get install -y -q --no-install-recommends \
sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \ sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \
/usr/lib/x86_64-linux-gnu/libmysqlclient_r.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
...@@ -714,9 +714,8 @@ macro(build_faiss) ...@@ -714,9 +714,8 @@ macro(build_faiss)
if (BUILD_FAISS_WITH_MKL) 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" 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/") PATH_SUFFIXES "intel/compilers_and_libraries_${MKL_VERSION}/linux/mkl/lib/intel64/")
if (${MKL_LIB_PATH} STREQUAL "MKL_LIB_PATH-NOTFOUND") if (${MKL_LIB_PATH} STREQUAL "MKL_LIB_PATH-NOTFOUND")
message(FATAL_ERROR "Could not find MKL libraries") message(FATAL_ERROR "Could not find MKL libraries")
......
...@@ -3,4 +3,5 @@ BOOST_VERSION=1.70.0 ...@@ -3,4 +3,5 @@ BOOST_VERSION=1.70.0
GTEST_VERSION=1.8.1 GTEST_VERSION=1.8.1
LAPACK_VERSION=v3.8.0 LAPACK_VERSION=v3.8.0
OPENBLAS_VERSION=v0.3.6 OPENBLAS_VERSION=v0.3.6
FAISS_VERSION=branch-0.3.0 FAISS_VERSION=branch-0.3.0
\ No newline at end of file MKL_VERSION=2019.5.281
...@@ -9,6 +9,5 @@ LIBUNWIND_VERSION=1.3.1 ...@@ -9,6 +9,5 @@ LIBUNWIND_VERSION=1.3.1
GPERFTOOLS_VERSION=2.7 GPERFTOOLS_VERSION=2.7
GRPC_VERSION=master GRPC_VERSION=master
ZLIB_VERSION=v1.2.11 ZLIB_VERSION=v1.2.11
MKL_VERSION=2019.5.281
# vim: set filetype=sh: # vim: set filetype=sh:
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册