From 2ba575a5dcb353039c2053f148ad3edd4612c28a Mon Sep 17 00:00:00 2001
From: "xj.lin" <xiaojun.lin@zilliz.com>
Date: Sat, 31 Aug 2019 15:18:57 +0800
Subject: [PATCH] MS-442 update build stage

Former-commit-id: 005d5900b75c982206d5663af61c2458c2960450
---
 cpp/build.sh                                        |  7 +++++++
 cpp/cmake/ThirdPartyPackages.cmake                  |  2 +-
 cpp/src/core/cmake/ThirdPartyPackages.cmake         |  5 +++--
 cpp/src/core/thirdparty/faiss_cache_check_lists.txt | 13 +++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 cpp/src/core/thirdparty/faiss_cache_check_lists.txt

diff --git a/cpp/build.sh b/cpp/build.sh
index be236e19..410db4be 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -10,12 +10,14 @@ PROFILING="OFF"
 BUILD_FAISS_WITH_MKL="OFF"
 USE_JFROG_CACHE="OFF"
 KNOWHERE_BUILD_DIR="`pwd`/src/core/cmake_build"
+KNOWHERE_OPTIONS="-t ${BUILD_TYPE}"
 
 while getopts "p:d:t:k:uhrcgmj" arg
 do
         case $arg in
              t)
                 BUILD_TYPE=$OPTARG # BUILD_TYPE
+                KNOWHERE_OPTIONS="-t ${BUILD_TYPE}"
                 ;;
              u)
                 echo "Build and run unittest cases" ;
@@ -47,6 +49,7 @@ do
                 ;;
              j)
                 USE_JFROG_CACHE="ON"
+                KNOWHERE_OPTIONS="${KNOWHERE_OPTIONS} -j"
                 ;;
              h) # help
                 echo "
@@ -80,6 +83,10 @@ if [[ ! -d cmake_build ]]; then
 	MAKE_CLEAN="ON"
 fi
 
+pushd `pwd`/src/core
+./build.sh ${KNOWHERE_OPTIONS}
+popd
+
 cd cmake_build
 git
 CUDA_COMPILER=/usr/local/cuda/bin/nvcc
diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 53d65bd9..35dc12e6 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -309,7 +309,7 @@ else()
     # set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz")
 endif()
 
-set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
+#set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
 
 if(DEFINED ENV{MILVUS_KNOWHERE_URL})
     set(KNOWHERE_SOURCE_URL "$ENV{MILVUS_KNOWHERE_URL}")
diff --git a/cpp/src/core/cmake/ThirdPartyPackages.cmake b/cpp/src/core/cmake/ThirdPartyPackages.cmake
index 981e1bd5..f944feed 100644
--- a/cpp/src/core/cmake/ThirdPartyPackages.cmake
+++ b/cpp/src/core/cmake/ThirdPartyPackages.cmake
@@ -260,7 +260,8 @@ else()
 #    set(FAISS_SOURCE_URL "${CMAKE_SOURCE_DIR}/thirdparty/faiss-1.5.3")
     message(STATUS ${FAISS_SOURCE_URL})
 endif()
-set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
+# set(FAISS_MD5 "a589663865a8558205533c8ac414278c")
+#set(FAISS_MD5 "31167ecbd1903fec600dc4ac00b9be9e")
 
 if(DEFINED ENV{KNOWHERE_ARROW_URL})
     set(ARROW_SOURCE_URL "$ENV{KNOWHERE_ARROW_URL}")
@@ -924,7 +925,7 @@ macro(build_faiss)
     if(USE_JFROG_CACHE STREQUAL "ON")
 #        Check_Last_Modify("${CMAKE_SOURCE_DIR}/thirdparty/faiss_cache_check_lists.txt" "${CMAKE_SOURCE_DIR}" FAISS_LAST_MODIFIED_COMMIT_ID)
         string(MD5 FAISS_COMBINE_MD5 "${FAISS_MD5}${LAPACK_MD5}${OPENBLAS_MD5}")
-        string(MD5 FAISS_COMBINE_MD5 "${FAISS_LAST_MODIFIED_COMMIT_ID}${LAPACK_MD5}${OPENBLAS_MD5}")
+        # string(MD5 FAISS_COMBINE_MD5 "${FAISS_LAST_MODIFIED_COMMIT_ID}${LAPACK_MD5}${OPENBLAS_MD5}")
         set(FAISS_CACHE_PACKAGE_NAME "faiss_${FAISS_COMBINE_MD5}.tar.gz")
         set(FAISS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${FAISS_CACHE_PACKAGE_NAME}")
         set(FAISS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${FAISS_CACHE_PACKAGE_NAME}")
diff --git a/cpp/src/core/thirdparty/faiss_cache_check_lists.txt b/cpp/src/core/thirdparty/faiss_cache_check_lists.txt
new file mode 100644
index 00000000..ce75614c
--- /dev/null
+++ b/cpp/src/core/thirdparty/faiss_cache_check_lists.txt
@@ -0,0 +1,13 @@
+# source
+src/
+include/
+
+# third party
+thirdparty/
+
+# cmake
+cmake/
+CMakeLists.txt
+
+# script
+build.sh
\ No newline at end of file
-- 
GitLab