Commit 67766682 authored by groot's avatar groot
Browse files

Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 


Former-commit-id: fbfd4aaeb2ad458b5337fffd77daaf5ffca165df
parents d1f16caa e65468a4

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"

        }

core/CHANGELOG.md

+2 −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. 
- MS-637 - out of memory when load too many tasks

- MS-640 - Cache object size calculate incorrect

- MS-641 - Segment fault(signal 11) in PickToLoad

- MS-639 - SQ8H index created failed and server hang



## Improvement

- MS-552 - Add and change the easylogging library
@@ -36,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

core/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()

core/src/db/engine/ExecutionEngine.h

+3 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class ExecutionEngine { 
    Load(bool to_cache = true) = 0;



    virtual Status

    CopyToGpu(uint64_t device_id) = 0;

    CopyToGpu(uint64_t device_id, bool hybrid) = 0;



    virtual Status

    CopyToIndexFileToGpu(uint64_t device_id) = 0;
@@ -80,7 +80,8 @@ class ExecutionEngine { 
    Merge(const std::string& location) = 0;



    virtual Status

    Search(int64_t n, const float* data, int64_t k, int64_t nprobe, float* distances, int64_t* labels) const = 0;

    Search(int64_t n, const float* data, int64_t k, int64_t nprobe, float* distances, int64_t* labels,

           bool hybrid) const = 0;



    virtual std::shared_ptr<ExecutionEngine>

    BuildIndex(const std::string& location, EngineType engine_type) = 0;