Merge branch 'branch-0.5.0' into 'branch-0.5.0'

MS-586 Remove BUILD_FAISS_WITH_MKL option

See merge request megasearch/milvus!605

Former-commit-id: 3114a673f42dd935d853363a804324deff78ddfc

cpp/CHANGELOG.md

@@ -29,6 +29,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-567 - Add NOTICE.md
 - MS-569 - Complete the NOTICE.md
 - MS-575 - Add Clang-format & Clang-tidy & Cpplint
+- MS-586 - Remove BUILD_FAISS_WITH_MKL option
 
 # Milvus 0.4.0 (2019-09-12)
 

cpp/CMakeLists.txt

@@ -43,7 +43,6 @@ endif()
 set(MILVUS_VERSION "${GIT_BRANCH_NAME}")
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MILVUS_VERSION "${MILVUS_VERSION}")
 
-set(CLANG_FORMAT_VERSION "6.0")
 find_package(ClangTools)
 if("$ENV{CMAKE_EXPORT_COMPILE_COMMANDS}" STREQUAL "1" OR CLANG_TIDY_FOUND)
   # Generate a Clang compile_commands.json "compilation database" file for use

cpp/build.sh

@@ -7,10 +7,9 @@ MAKE_CLEAN="OFF"
 BUILD_COVERAGE="OFF"
 DB_PATH="/opt/milvus"
 PROFILING="OFF"
-BUILD_FAISS_WITH_MKL="OFF"
 USE_JFROG_CACHE="OFF"
 
-while getopts "p:d:t:uhrcgmj" arg
+while getopts "p:d:t:uhrcgj" arg
 do
         case $arg in
              t)
@@ -38,9 +37,6 @@ do
              g)
                 PROFILING="ON"
                 ;;
-             m)
-                BUILD_FAISS_WITH_MKL="ON"
-                ;;
              j)
                 USE_JFROG_CACHE="ON"
                 ;;
@@ -55,11 +51,10 @@ parameter:
 -r: remove previous build directory(default: OFF)
 -c: code coverage(default: OFF)
 -g: profiling(default: OFF)
--m: build faiss with MKL(default: OFF)
 -j: use jfrog cache build directory
 
 usage:
-./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-k] [-m] [-j]
+./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-k] [-j]
                 "
                 exit 0
                 ;;
@@ -87,7 +82,6 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
     -DBUILD_COVERAGE=${BUILD_COVERAGE} \
     -DMILVUS_DB_PATH=${DB_PATH} \
     -DMILVUS_ENABLE_PROFILING=${PROFILING} \
-    -DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \
     -DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
     ../"