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 on

See merge request megasearch/milvus!262

Former-commit-id: ea2f2de479e95449daaa8e928d5594d7bfba5eaf
This commit is contained in:
jinhai 2019-07-22 17:03:41 +08:00
commit 7c8b105d0b
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="OFF"
BUILD_FAISS_WITH_MKL="ON"
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 OFF)
set(BUILD_FAISS_WITH_MKL ON)
endif()
if(EXISTS "/proc/cpuinfo")

1
cpp/src/CMakeLists.txt
View File

@ -154,6 +154,7 @@ if (ENABLE_LICENSE STREQUAL "ON")
endif ()
set(metrics_lib
easyloggingpp
prometheus-cpp-push
prometheus-cpp-pull
prometheus-cpp-core