Commit 38b90033 authored by xiaojun.lin's avatar xiaojun.lin
Browse files

update 


Former-commit-id: 51ae3d7d749b7b429c12abce28ffc7111fa012ee
parent 2ce91b6c

ci/jenkinsfile/milvus_build.groovy

+6 −1
Original line number Diff line number Diff line
@@ -10,7 +10,12 @@ container('milvus-build-env') { 
                        sh "git config --global user.name \"test\""

                        withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {

                            sh "./build.sh -l"

                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"

                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' \

                            && export JFROG_USER_NAME='${USERNAME}' \

                            && export JFROG_PASSWORD='${PASSWORD}' \

                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \

                            && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"



                            sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194"

                        }

                    }

core/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ include(ThirdPartyPackages) 


config_summary()



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



add_subdirectory(src)



if (BUILD_UNIT_TEST STREQUAL "ON")

core/build.sh

+10 −3
Original line number Diff line number Diff line
@@ -9,10 +9,16 @@ DB_PATH="/opt/milvus" 
PROFILING="OFF"

USE_JFROG_CACHE="OFF"

RUN_CPPLINT="OFF"

CUSTOMIZATION="ON"

CUSTOMIZATION="OFF" # default use ori faiss

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



wget -q --method HEAD

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:ulrcgjhx" arg

do
@@ -49,7 +55,7 @@ do 
                USE_JFROG_CACHE="ON"

                ;;

             x)

                CUSTOMIZATION="OFF"

                CUSTOMIZATION="OFF" # force use ori faiss

                ;;

             h) # help

                echo "
@@ -94,6 +100,7 @@ CMAKE_CMD="cmake \ 
-DMILVUS_ENABLE_PROFILING=${PROFILING} \

-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \

-DCUSTOMIZATION=${CUSTOMIZATION} \

-DFAISS_URL=${CUSTOMIZED_FAISS_URL} \

../"

echo ${CMAKE_CMD}

${CMAKE_CMD}

core/src/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus) 
#this statement must put here, since the CORE_INCLUDE_DIRS is defined in code/CMakeList.txt

add_subdirectory(index)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)

foreach (dir ${CORE_INCLUDE_DIRS})

    include_directories(${dir})

core/src/index/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ include(DefineOptionsCore) 
include(BuildUtilsCore)

include(ThirdPartyPackagesCore)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



add_subdirectory(knowhere)



if (BUILD_COVERAGE STREQUAL "ON")