diff --git a/core/build.sh b/core/build.sh index 0bccf03308..fa19ab5313 100755 --- a/core/build.sh +++ b/core/build.sh @@ -12,8 +12,6 @@ RUN_CPPLINT="OFF" CUDA_COMPILER=/usr/local/cuda/bin/nvcc GPU_VERSION="OFF" #defaults to CPU version WITH_MKL="OFF" -FAISS_ROOT="" #FAISS root path -FAISS_SOURCE="BUNDLED" WITH_PROMETHEUS="ON" FIU_ENABLE="OFF" BUILD_OPENBLAS="ON" @@ -29,10 +27,6 @@ while getopts "p:d:t:f:ulrcghzmei" arg; do t) BUILD_TYPE=$OPTARG # BUILD_TYPE ;; - f) - FAISS_ROOT=$OPTARG - FAISS_SOURCE="AUTO" - ;; u) echo "Build and run unittest cases" BUILD_UNITTEST="ON" @@ -71,9 +65,6 @@ parameter: -p: install prefix(default: $(pwd)/milvus) -d: db data path(default: /tmp/milvus) -t: build type(default: Debug) --f: FAISS root path(default: empty). The path should be an absolute path - containing the pre-installed lib/ and include/ directory of FAISS. If they can't be found, - we will build the original FAISS from source instead. -u: building unit test options(default: OFF) -l: run cpplint, clang-format and clang-tidy(default: OFF) -r: remove previous build directory(default: OFF) @@ -86,7 +77,7 @@ parameter: -h: help usage: -./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-g] [-m] [-e] [-h] +./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} [-u] [-l] [-r] [-c] [-z] [-g] [-m] [-e] [-h] " exit 0 ;; @@ -111,8 +102,6 @@ CMAKE_CMD="cmake \ -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ --DFAISS_ROOT=${FAISS_ROOT} \ --DFAISS_SOURCE=${FAISS_SOURCE} \ -DOpenBLAS_SOURCE=AUTO \ -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \ -DBUILD_COVERAGE=${BUILD_COVERAGE} \ diff --git a/core/src/index/cmake/FindFAISS.cmake b/core/src/index/cmake/FindFAISS.cmake deleted file mode 100644 index 3aa5f4e6e4..0000000000 --- a/core/src/index/cmake/FindFAISS.cmake +++ /dev/null @@ -1,44 +0,0 @@ -set(FAISS_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}faiss${CMAKE_STATIC_LIBRARY_SUFFIX}) - -# First, find via if specified FAISS_ROOT -if (FAISS_ROOT) - find_library(FAISS_STATIC_LIB - NAMES ${FAISS_STATIC_LIB_NAME} - PATHS ${FAISS_ROOT} - PATH_SUFFIXES "lib" - NO_DEFAULT_PATH - ) - find_path(FAISS_INCLUDE_DIR - NAMES "faiss/Index.h" - PATHS ${FAISS_ROOT} - NO_DEFAULT_PATH - PATH_SUFFIXES "include" - ) -endif () - -find_package_handle_standard_args(FAISS REQUIRED_VARS FAISS_STATIC_LIB FAISS_INCLUDE_DIR) - -if (FAISS_FOUND) - if (NOT TARGET faiss) - add_library(faiss STATIC IMPORTED) - - set_target_properties( - faiss - PROPERTIES - IMPORTED_LOCATION "${FAISS_STATIC_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${FAISS_INCLUDE_DIR}" - ) - - if (FAISS_WITH_MKL) - set_target_properties( - faiss - PROPERTIES - INTERFACE_LINK_LIBRARIES "${MKL_LIBS}") - else () - set_target_properties( - faiss - PROPERTIES - INTERFACE_LINK_LIBRARIES ${OpenBLAS_LIBRARIES}) - endif () - endif () -endif ()