From b461716890893f1ecbf697fc1585b17c0be5c292 Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 22 Jul 2019 17:02:03 +0800 Subject: [PATCH] change BUILD_FAISS_WITH_MKL to default on Former-commit-id: 30a3474c9f3559a6cd9ba5e7d4d647c777977bc6 --- cpp/build.sh | 2 +- cpp/cmake/ThirdPartyPackages.cmake | 2 +- cpp/src/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cpp/build.sh b/cpp/build.sh index edfe9305..ef66a0c3 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -8,7 +8,7 @@ MAKE_CLEAN="OFF" BUILD_COVERAGE="OFF" DB_PATH="/opt/milvus" PROFILING="OFF" -BUILD_FAISS_WITH_MKL="OFF" +BUILD_FAISS_WITH_MKL="ON" while getopts "p:d:t:uhlrcgm" arg do diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index fed5dece..837d6bd4 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -700,7 +700,7 @@ endmacro() # FAISS if(NOT DEFINED BUILD_FAISS_WITH_MKL) - set(BUILD_FAISS_WITH_MKL OFF) + set(BUILD_FAISS_WITH_MKL ON) endif() if(EXISTS "/proc/cpuinfo") diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 80603cf6..088a461a 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -153,6 +153,7 @@ if (ENABLE_LICENSE STREQUAL "ON") endif () set(metrics_lib + easyloggingpp prometheus-cpp-push prometheus-cpp-pull prometheus-cpp-core -- GitLab