From cdb031e62bd9781b3c051f52e46bda8d27706487 Mon Sep 17 00:00:00 2001
From: "peng.xu" <peng.xu@zilliz.com>
Date: Mon, 22 Jul 2019 20:03:59 +0800
Subject: [PATCH] Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"

This reverts merge request !264

Former-commit-id: 501e92946ab87fb9a21c55545f84ab8da499e1aa
---
 cpp/build.sh                       | 2 +-
 cpp/cmake/ThirdPartyPackages.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/build.sh b/cpp/build.sh
index edfe9305..ef66a0c3 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -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
diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index fed5dece..837d6bd4 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -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")
-- 
GitLab