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

This reverts merge request !264

Former-commit-id: 501e92946ab87fb9a21c55545f84ab8da499e1aa
pull/191/head
peng.xu 2019-07-22 20:03:59 +08:00
parent 531978a4b0
commit cdb031e62b
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")