Commit 597456b4 authored by 余昆's avatar 余昆
Browse files

fix conflicts 


Former-commit-id: 9e513a70425a88870cb8f1249c7f0643cb76bb7b
parents a711db52 074bdbc5

ci/jenkinsfile/dev_test.groovy

+1 −2
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ timeout(time: 30, unit: 'MINUTES') { 
    try {

        dir ("${PROJECT_NAME}_test") {

            checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])

            sh 'python3 -m pip install -r requirements.txt'

            sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

            sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"

        }



        // mysql database backend test

        load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"

ci/jenkinsfile/dev_test_all.groovy

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ timeout(time: 60, unit: 'MINUTES') { 
    try {

        dir ("${PROJECT_NAME}_test") {

            checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])

            sh 'python3 -m pip install -r requirements.txt'

            sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

            sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"

        }

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-619 - Add optimizer class in scheduler

- MS-614 - Preload table at startup

- MS-626 - Refactor DataObj to support cache any type data

- MS-648 - Improve unittest



## New Feature

- MS-627 - Integrate new index: IVFSQHybrid

cpp/cmake/ThirdPartyPackages.cmake

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ if(USE_JFROG_CACHE STREQUAL "ON") 
    if(NOT DEFINED JFROG_ARTFACTORY_URL)

        message(FATAL_ERROR "JFROG_ARTFACTORY_URL is not set")

    endif()

    set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")

    set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")

    if(DEFINED ENV{JFROG_USER_NAME})

        set(JFROG_USER_NAME "$ENV{JFROG_USER_NAME}")

    endif()

cpp/src/core/cmake/ThirdPartyPackagesCore.cmake

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ if(NOT DEFINED USE_JFROG_CACHE) 
    set(USE_JFROG_CACHE "OFF")

endif()

if(USE_JFROG_CACHE STREQUAL "ON")

    set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}")

    set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}")

    set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache")

endif()
@@ -234,7 +234,7 @@ if(CUSTOMIZATION) 
    # set(FAISS_MD5 "57da9c4f599cc8fa4260488b1c96e1cc") # commit-id 6dbdf75987c34a2c853bd172ea0d384feea8358c branch-0.2.0

    # set(FAISS_MD5 "21deb1c708490ca40ecb899122c01403") # commit-id 643e48f479637fd947e7b93fa4ca72b38ecc9a39 branch-0.2.0

    # set(FAISS_MD5 "072db398351cca6e88f52d743bbb9fa0") # commit-id 3a2344d04744166af41ef1a74449d68a315bfe17 branch-0.2.1

    set(FAISS_MD5 "94988b7bdac4eb82a9575c702a3f2df3") # commit-id 1407526b31cad26f98ceca8dddaface8f18c4c19 branch-0.2.1

    set(FAISS_MD5 "c89ea8e655f5cdf58f42486f13614714") # commit-id 9c28a1cbb88f41fa03b03d7204106201ad33276b branch-0.2.1



    execute_process(COMMAND wget -q --method HEAD ${FAISS_SOURCE_URL} RESULT_VARIABLE return_code)

    message(STATUS "Check the remote cache file ${FAISS_SOURCE_URL}. return code = ${return_code}")