Merge branch 'branch-0.3.1' into 'branch-0.3.1'

MS-261: change BUILD_FAISS_WITH_MKL to default off and fix metrics

See merge request megasearch/milvus!266

Former-commit-id: dc8c2827fb7d716b9fd6cf57268aed505257b988

cpp/build.sh

@@ -8,7 +8,7 @@ MAKE_CLEAN="OFF"
 BUILD_COVERAGE="OFF"
 DB_PATH="/opt/milvus"
 PROFILING="OFF"
-BUILD_FAISS_WITH_MKL="ON"
+BUILD_FAISS_WITH_MKL="OFF"
 
 while getopts "p:d:t:uhlrcgm" arg
 do

cpp/cmake/ThirdPartyPackages.cmake

@@ -700,7 +700,7 @@ endmacro()
 # FAISS
 
 if(NOT DEFINED BUILD_FAISS_WITH_MKL)
-    set(BUILD_FAISS_WITH_MKL ON)
+    set(BUILD_FAISS_WITH_MKL OFF)
 endif()
 
 if(EXISTS "/proc/cpuinfo")

cpp/src/CMakeLists.txt

@@ -155,6 +155,7 @@ endif ()
 
 set(metrics_lib
         easyloggingpp
+        yaml-cpp
         prometheus-cpp-push
         prometheus-cpp-pull
         prometheus-cpp-core