提交 05119d42 编写于 作者: P peng.xu

Merge branch 'revert-2debf343' into 'branch-0.3.1'

Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"

See merge request megasearch/milvus!265

Former-commit-id: a5e1a4968b9384566e9810a60fca39190424e6eb
...@@ -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")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册