From ab45ad89a163fc28269075b88fc91752d7022aa3 Mon Sep 17 00:00:00 2001 From: zhiru Date: Wed, 17 Jul 2019 13:02:40 +0800 Subject: [PATCH] update Former-commit-id: aba27ece245cadb9aff24943c957de29c6af2a00 --- cpp/cmake/ThirdPartyPackages.cmake | 3 ++- cpp/thirdparty/versions.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 1f7c84f7..aba99b3c 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -713,7 +713,8 @@ macro(build_faiss) if(${BUILD_FAISS_WITH_MKL} STREQUAL "true") message(STATUS "Build Faiss with MKL") if(NOT DEFINED MKL_LIB_PATH) - set(MKL_LIB_PATH "/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64") + set(MKL_LIB_PATH "/opt/intel/compilers_and_libraries_${MKL_VERSION}/linux/mkl/lib/intel64") + message(STATUS "MKL_LIB_PATH = ${MKL_LIB_PATH}") endif() set(FAISS_CONFIGURE_ARGS ${FAISS_CONFIGURE_ARGS} "CPPFLAGS=-DMKL_ILP64 -m64 -I${MKL_LIB_PATH}/../../include" diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 31176094..530e9fee 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -3,6 +3,7 @@ BOOST_VERSION=1.70.0 BZIP2_VERSION=1.0.6 EASYLOGGINGPP_VERSION=v9.96.7 FAISS_VERSION=7b07685 +MKL_VERSION=2019.4.243 GTEST_VERSION=1.8.1 JSONCONS_VERSION=0.126.0 LAPACK_VERSION=v3.8.0 -- GitLab