Unverified Commit bea4ddc1 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #317 from youny626/0.6.0 

add Find FAISS in CMake
parents 224ad140 ff7452a2

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#275 - Rename C++ SDK IndexType

- \#284 - Change C++ SDK to shared library

- \#260 - C++ SDK README

- \#314 - add Find FAISS in CMake



## Task

ci/scripts/build.sh

+10 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CORE_BUILD_DIR="${MILVUS_CORE_DIR}/cmake_build" 
BUILD_TYPE="Debug"

BUILD_UNITTEST="OFF"

INSTALL_PREFIX="/opt/milvus"

FAISS_ROOT=""

BUILD_COVERAGE="OFF"

USE_JFROG_CACHE="OFF"

RUN_CPPLINT="OFF"
@@ -22,7 +23,7 @@ GPU_VERSION="OFF" 
WITH_MKL="OFF"

CUDA_COMPILER=/usr/local/cuda/bin/nvcc



while getopts "o:t:b:gulcjmh" arg

while getopts "o:t:b:f:gulcjmh" arg

do

        case $arg in

             o)
@@ -34,6 +35,9 @@ do 
             b)

                CORE_BUILD_DIR=$OPTARG # CORE_BUILD_DIR

                ;;

             f)

                FAISS_ROOT=$OPTARG # FAISS ROOT PATH

                ;;

             g)

                GPU_VERSION="ON";

                ;;
@@ -60,6 +64,7 @@ parameter: 
-o: install prefix(default: /opt/milvus)

-t: build type(default: Debug)

-b: core code build directory

-f: faiss root path

-g: gpu version

-u: building unit test options(default: OFF)

-l: run cpplint, clang-format and clang-tidy(default: OFF)
@@ -69,7 +74,7 @@ parameter: 
-h: help



usage:

./build.sh -o \${INSTALL_PREFIX} -t \${BUILD_TYPE} -b \${CORE_BUILD_DIR} [-u] [-l] [-c] [-j] [-m] [-h]

./build.sh -o \${INSTALL_PREFIX} -t \${BUILD_TYPE} -b \${CORE_BUILD_DIR} -f \${FAISS_ROOT} [-u] [-l] [-c] [-j] [-m] [-h]

                "

                exit 0

                ;;
@@ -94,8 +99,10 @@ CMAKE_CMD="cmake \ 
-DBUILD_UNIT_TEST=${BUILD_UNITTEST} \

-DBUILD_COVERAGE=${BUILD_COVERAGE} \

-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \

-DBUILD_FAISS_WITH_MKL=${WITH_MKL} \

-DFAISS_ROOT=${FAISS_ROOT} \

-DFAISS_WITH_MKL=${WITH_MKL} \

-DArrow_SOURCE=AUTO \

-DFAISS_SOURCE=AUTO \

${MILVUS_CORE_DIR}"

echo ${CMAKE_CMD}

${CMAKE_CMD}

core/build.sh

+12 −12
Original line number Diff line number Diff line
@@ -14,16 +14,10 @@ CUSTOMIZATION="OFF" # default use ori faiss 
CUDA_COMPILER=/usr/local/cuda/bin/nvcc

GPU_VERSION="OFF" #defaults to CPU version

WITH_MKL="OFF"

FAISS_ROOT=""

FAISS_SOURCE="BUNDLED"



CUSTOMIZED_FAISS_URL="${FAISS_URL:-NONE}"

wget -q --method HEAD ${CUSTOMIZED_FAISS_URL}

if [ $? -eq 0 ]; then

  CUSTOMIZATION="ON"

else

  CUSTOMIZATION="OFF"

fi



while getopts "p:d:t:ulrcgjhxzm" arg

while getopts "p:d:t:f:ulrcgjhxzm" arg

do

        case $arg in

             p)
@@ -35,6 +29,10 @@ do 
             t)

                BUILD_TYPE=$OPTARG # BUILD_TYPE

                ;;

             f)

                FAISS_ROOT=$OPTARG

                FAISS_SOURCE="AUTO"

                ;;

             u)

                echo "Build and run unittest cases" ;

                BUILD_UNITTEST="ON";
@@ -73,6 +71,7 @@ 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)

-u: building unit test options(default: OFF)

-l: run cpplint, clang-format and clang-tidy(default: OFF)

-r: remove previous build directory(default: OFF)
@@ -84,7 +83,7 @@ parameter: 
-h: help



usage:

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-h]

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-h]

                "

                exit 0

                ;;
@@ -109,15 +108,16 @@ 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} \

-DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \

-DBUILD_COVERAGE=${BUILD_COVERAGE} \

-DMILVUS_DB_PATH=${DB_PATH} \

-DMILVUS_ENABLE_PROFILING=${PROFILING} \

-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \

-DCUSTOMIZATION=${CUSTOMIZATION} \

-DFAISS_URL=${CUSTOMIZED_FAISS_URL} \

-DMILVUS_GPU_VERSION=${GPU_VERSION} \

-DBUILD_FAISS_WITH_MKL=${WITH_MKL} \

-DFAISS_WITH_MKL=${WITH_MKL} \

../"

echo ${CMAKE_CMD}

${CMAKE_CMD}

core/src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status) 
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)



add_subdirectory(index)

if (BUILD_FAISS_WITH_MKL)

if (FAISS_WITH_MKL)

    add_compile_definitions("WITH_MKL")

endif ()

core/src/index/build.sh

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ BUILD_UNITTEST="OFF" 
INSTALL_PREFIX=$(pwd)/cmake_build

MAKE_CLEAN="OFF"

PROFILING="OFF"

BUILD_FAISS_WITH_MKL="OFF"

FAISS_WITH_MKL="OFF"

USE_JFROG_CACHE="OFF"



while getopts "p:d:t:uhrcgmj" arg
@@ -31,7 +31,7 @@ do 
                PROFILING="ON"

                ;;

             m)

                BUILD_FAISS_WITH_MKL="ON"

                FAISS_WITH_MKL="ON"

                ;;

             j)

                USE_JFROG_CACHE="ON"
@@ -74,7 +74,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then 
    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \

    -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \

    -DMILVUS_ENABLE_PROFILING=${PROFILING} \

    -DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \

    -DFAISS_WITH_MKL=${FAISS_WITH_MKL} \

    -DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \

    ../"

    echo ${CMAKE_CMD}