Commit 37a88fb7 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #179 from JinHai-CN/0.5.1 

0.5.1

Former-commit-id: 210bf0bbcf862d868612aadff42575aaa7d4b2c6
parents c796af17 f0194ae3

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ if(NOT GIT_BRANCH_NAME STREQUAL "") 
    string(REGEX REPLACE "\n" "" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})

endif()



set(MILVUS_VERSION "${GIT_BRANCH_NAME}")

set(MILVUS_VERSION "0.5.1")

string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MILVUS_VERSION "${MILVUS_VERSION}")



find_package(ClangTools)

core/src/index/cmake/ThirdPartyPackagesCore.cmake

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ if(CUSTOMIZATION) 
        # set(FAISS_MD5 "c89ea8e655f5cdf58f42486f13614714") # commit-id 9c28a1cbb88f41fa03b03d7204106201ad33276b branch-0.2.1

        # set(FAISS_MD5 "87fdd86351ffcaf3f80dc26ade63c44b") # commit-id 841a156e67e8e22cd8088e1b58c00afbf2efc30b branch-0.2.1

        # set(FAISS_MD5 "f3b2ce3364c3fa7febd3aa7fdd0fe380") # commit-id 694e03458e6b69ce8a62502f71f69a614af5af8f branch-0.3.0

         set(FAISS_MD5 "bb30722c22390ce5f6759ccb216c1b2a") # commit-id d324db297475286afe107847c7fb7a0f9dc7e90e branch-0.3.0

        # set(FAISS_MD5 "bb30722c22390ce5f6759ccb216c1b2a") # commit-id d324db297475286afe107847c7fb7a0f9dc7e90e branch-0.3.0

        set(FAISS_MD5 "2293cdb209c3718e3b19f3edae8b32b3") # commit-id a13c1205dc52977a9ad3b33a14efa958604a8bff branch-0.3.0

    endif()

else()

    set(FAISS_SOURCE_URL "https://github.com/milvus-io/faiss/archive/1.6.0.tar.gz")

core/src/scheduler/job/BuildIndexJob.cpp

+4 −1
Original line number Diff line number Diff line
@@ -50,7 +50,10 @@ void 
BuildIndexJob::BuildIndexDone(size_t to_index_id) {

    std::unique_lock<std::mutex> lock(mutex_);

    to_index_files_.erase(to_index_id);

    if (to_index_files_.empty()) {

        cv_.notify_all();

    }



    SERVER_LOG_DEBUG << "BuildIndexJob " << id() << " finish index file: " << to_index_id;

}

core/src/scheduler/job/SearchJob.cpp

+4 −1
Original line number Diff line number Diff line
@@ -49,7 +49,10 @@ void 
SearchJob::SearchDone(size_t index_id) {

    std::unique_lock<std::mutex> lock(mutex_);

    index_files_.erase(index_id);

    if (index_files_.empty()) {

        cv_.notify_all();

    }



    SERVER_LOG_DEBUG << "SearchJob " << id() << " finish index file: " << index_id;

}

core/src/wrapper/ConfAdapter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ IVFSQConfAdapter::Match(const TempMetaConf& metaconf) { 
    conf->nlist = MatchNlist(metaconf.size, metaconf.nlist);

    conf->d = metaconf.dim;

    conf->metric_type = metaconf.metric_type;

    conf->gpu_id = conf->gpu_id;

    conf->gpu_id = metaconf.gpu_id;

    conf->nbits = 8;

    MatchBase(conf);

    return conf;