提交 ec29a1d4 编写于 作者: J jinhai

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: 18363add0c3aa8b1afe334903722663d1f37273b
...@@ -8,7 +8,7 @@ MAKE_CLEAN="OFF" ...@@ -8,7 +8,7 @@ MAKE_CLEAN="OFF"
BUILD_COVERAGE="OFF" BUILD_COVERAGE="OFF"
DB_PATH="/opt/milvus" DB_PATH="/opt/milvus"
PROFILING="OFF" PROFILING="OFF"
BUILD_FAISS_WITH_MKL="OFF" BUILD_FAISS_WITH_MKL="ON"
while getopts "p:d:t:uhlrcgm" arg while getopts "p:d:t:uhlrcgm" arg
do do
......
...@@ -700,7 +700,7 @@ endmacro() ...@@ -700,7 +700,7 @@ endmacro()
# FAISS # FAISS
if(NOT DEFINED BUILD_FAISS_WITH_MKL) if(NOT DEFINED BUILD_FAISS_WITH_MKL)
set(BUILD_FAISS_WITH_MKL OFF) set(BUILD_FAISS_WITH_MKL ON)
endif() endif()
if(EXISTS "/proc/cpuinfo") if(EXISTS "/proc/cpuinfo")
......
...@@ -154,6 +154,7 @@ if (ENABLE_LICENSE STREQUAL "ON") ...@@ -154,6 +154,7 @@ if (ENABLE_LICENSE STREQUAL "ON")
endif () endif ()
set(metrics_lib set(metrics_lib
easyloggingpp
prometheus-cpp-push prometheus-cpp-push
prometheus-cpp-pull prometheus-cpp-pull
prometheus-cpp-core prometheus-cpp-core
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册