Merge remote-tracking branch 'mega/branch-0.3.0' into branch-0.3.0

Former-commit-id: 80b47be9626cd229e4a537cbe74646bc7c6a1e8e

cpp/CHANGELOG.md

@@ -36,7 +36,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-47 - Add query vps metrics
 - MS-37 - Add query, cache usage, disk write speed and file data size metrics
 - MS-30 - Use faiss v1.5.2
-- MS-54 - cmake: Change Thirft third party URL to github.com
+- MS-54 - cmake: Change Thrift third party URL to github.com
 
 ## Task
 

cpp/cmake/ThirdPartyPackages.cmake

@@ -220,7 +220,7 @@ endif()
 if(DEFINED ENV{MEGASEARCH_FAISS_URL})
     set(FAISS_SOURCE_URL "$ENV{MEGASEARCH_FAISS_URL}")
 else()
-    set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz")
+    set(FAISS_SOURCE_URL "https://github.com/JinHai-CN/faiss/archive/${FAISS_VERSION}.tar.gz")
 endif()
 
 if (DEFINED ENV{MEGASEARCH_GTEST_URL})
@@ -705,7 +705,7 @@ macro(build_faiss)
 #            ${MAKE} ${MAKE_BUILD_ARGS}
             BUILD_COMMAND
             ${MAKE}
-            ${MAKE_BUILD_ARGS}
+            ${MAKE_BUILD_ARGS} all
             BUILD_IN_SOURCE
             1
 #            INSTALL_DIR

cpp/src/CMakeLists.txt

@@ -99,6 +99,7 @@ if (GPU_VERSION STREQUAL "ON")
     set(engine_libs
             pthread
             libfaiss.a
+            libgpufaiss.a
             libgomp.a
             libopenblas.a
             libgfortran.a

cpp/thirdparty/versions.txt

@@ -26,7 +26,7 @@
 BOOST_VERSION=1.70.0
 BZIP2_VERSION=1.0.6
 EASYLOGGINGPP_VERSION=v9.96.7
-FAISS_VERSION=v1.5.2
+FAISS_VERSION=master
 GTEST_VERSION=1.8.1
 LAPACK_VERSION=v3.8.0
 LZ4_VERSION=v1.9.1
@@ -49,7 +49,7 @@ DEPENDENCIES=(
   "MEGASEARCH_BOOST_URL boost-${BOOST_VERSION}.tar.gz https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION//./_}.tar.gz"
   "MEGASEARCH_BZIP2_URL bzip2-${BZIP2_VERSION}.tar.gz https://fossies.org/linux/misc/bzip2-${BZIP2_VERSION}.tar.gz"
   "MEGASEARCH_EASYLOGGINGPP_URL easyloggingpp-${EASYLOGGINGPP_VERSION}.tar.gz https://github.com/zuhd-org/easyloggingpp/archive/${EASYLOGGINGPP_VERSION}.tar.gz"
-  "MEGASEARCH_FAISS_URL faiss-${FAISS_VERSION}.tar.gz https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz"
+  "MEGASEARCH_FAISS_URL faiss-${FAISS_VERSION}.tar.gz https://github.com/JinHai-CN/faiss/archive/${FAISS_VERSION}.tar.gz"
   "MEGASEARCH_GTEST_URL gtest-${GTEST_VERSION}.tar.gz https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz"
   "MEGASEARCH_LAPACK_URL lapack-${LAPACK_VERSION}.tar.gz https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz
   "MEGASEARCH_LZ4_URL lz4-${LZ4_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz"