mirror of https://github.com/milvus-io/milvus.git
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: change BUILD_FAISS_WITH_MKL to default on See merge request megasearch/milvus!262 Former-commit-id: ea2f2de479e95449daaa8e928d5594d7bfba5eafpull/191/head
commit
7c8b105d0b
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -154,6 +154,7 @@ if (ENABLE_LICENSE STREQUAL "ON")
|
|||
endif ()
|
||||
|
||||
set(metrics_lib
|
||||
easyloggingpp
|
||||
prometheus-cpp-push
|
||||
prometheus-cpp-pull
|
||||
prometheus-cpp-core
|
||||
|
|
Loading…
Reference in New Issue