diff --git a/cpp/build.sh b/cpp/build.sh index 584f98cbe359b49a11f38f938316ed2580d3ef01..4c05ca9f76a0c7084748637ee5acae41f31b0a06 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -9,8 +9,10 @@ BUILD_COVERAGE="OFF" DB_PATH="/opt/milvus" PROFILING="OFF" BUILD_FAISS_WITH_MKL="OFF" +USE_JFROG_CACHE="OFF" +KNOWHERE_OPTS="" -while getopts "p:d:t:uhlrcgm" arg +while getopts "p:d:t:uhlrcgmj" arg do case $arg in t) @@ -44,6 +46,10 @@ do m) BUILD_FAISS_WITH_MKL="ON" ;; + j) + USE_JFROG_CACHE="ON" + KNOWHERE_OPTS="${KNOWHERE_OPTS} -j" + ;; h) # help echo " @@ -57,9 +63,10 @@ parameter: -c: code coverage(default: OFF) -g: profiling(default: OFF) -m: build faiss with MKL(default: OFF) +-j: use jfrog cache build directory usage: -./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-m] +./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-m] [-j] " exit 0 ;; @@ -78,7 +85,7 @@ fi # Build Knowhere KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere_build" pushd `pwd`/thirdparty/knowhere -./build.sh -t Release -p ${KNOWHERE_BUILD_DIR} +./build.sh -t Release -p ${KNOWHERE_BUILD_DIR} ${KNOWHERE_OPTS} popd cd cmake_build @@ -96,6 +103,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then -DMILVUS_ENABLE_PROFILING=${PROFILING} \ -DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \ -DKNOWHERE_BUILD_DIR=${KNOWHERE_BUILD_DIR} \ + -DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \ $@ ../" echo ${CMAKE_CMD} diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index f7a1bf4a53dccfb18dfdc6798d2a6d1985a14000..9871d18009b2ea17c49ae15f00ce75693362b75b 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -162,7 +162,7 @@ set(THIRDPARTY_DIR "${MILVUS_SOURCE_DIR}/thirdparty") # ---------------------------------------------------------------------- # JFrog if(NOT DEFINED USE_JFROG_CACHE) - set(USE_JFROG_CACHE "ON") + set(USE_JFROG_CACHE "OFF") endif() if(USE_JFROG_CACHE STREQUAL "ON") set(JFROG_ARTFACTORY_CACHE_URL "http://192.168.1.201:80/artifactory/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")