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
This commit is contained in:
peng.xu 2019-07-22 20:23:11 +08:00
commit 05119d42a7
2 changed files with 2 additions and 2 deletions

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

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