test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 19:08:30 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.1' into 'branch-0.3.1'

Browse Source 
MS-261: change BUILD_FAISS_WITH_MKL to default off and fix metrics

See merge request megasearch/milvus!266

Former-commit-id: 5052b90739bb3215f2f8deae1a3f905d49565d8d
This commit is contained in:
peng.xu 2019-07-23 10:43:50 +08:00
commit 1364deb6ac
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/build.sh
View File

@ -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

2
cpp/cmake/ThirdPartyPackages.cmake
View File

@ -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")

1
cpp/src/CMakeLists.txt
View File

@ -155,6 +155,7 @@ endif ()
set(metrics_lib
easyloggingpp
yaml-cpp
prometheus-cpp-push
prometheus-cpp-pull
prometheus-cpp-core