From 28e84f384d743e3519e86d73ee050e97c90cce24 Mon Sep 17 00:00:00 2001 From: zhiru Date: Tue, 23 Jul 2019 10:41:28 +0800 Subject: [PATCH 1/2] fix metrics Former-commit-id: 2a7f67913dfdb615e09d7316053c59944132a8fe --- cpp/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 088a461a9b..882e098258 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -154,6 +154,7 @@ endif () set(metrics_lib easyloggingpp + yaml-cpp prometheus-cpp-push prometheus-cpp-pull prometheus-cpp-core From 57fd142712ef8fdbed430256c2644bc8cbe32d96 Mon Sep 17 00:00:00 2001 From: zhiru Date: Tue, 23 Jul 2019 10:42:47 +0800 Subject: [PATCH 2/2] change BUILD_FAISS_WITH_MKL to default off Former-commit-id: 8cf737578611bf2f05cc4da3a775328e6463d341 --- cpp/build.sh | 2 +- cpp/cmake/ThirdPartyPackages.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/build.sh b/cpp/build.sh index ef66a0c375..edfe9305be 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="ON" +BUILD_FAISS_WITH_MKL="OFF" while getopts "p:d:t:uhlrcgm" arg do diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 837d6bd470..fed5dece88 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 ON) + set(BUILD_FAISS_WITH_MKL OFF) endif() if(EXISTS "/proc/cpuinfo")