Commit 0b3f7e15 authored by groot's avatar groot
Browse files

Merge remote-tracking branch 'source/0.6.0' into ongoing

parents 66b69818 6f58f755

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#533 - NSG build failed with MetricType Inner Product

- \#543 - client raise exception in shards when search results is empty

- \#545 - Avoid dead circle of build index thread when error occurs

- \#547 - NSG build failed using GPU-edition if set gpu_enable false

- \#552 - Server down during building index_type: IVF_PQ using GPU-edition

- \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error

- \#596 - Frequently insert operation cost too much disk space
@@ -73,6 +74,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#449 - Add ShowPartitions example for C++ SDK

- \#470 - Small raw files should not be build index

- \#584 - Intergrate internal FAISS

- \#611 - Remove MILVUS_CPU_VERSION



## Task

core/CMakeLists.txt

+0 −3
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ if (CUSTOMIZATION) 
    add_compile_definitions(CUSTOMIZATION)

endif ()



set(MILVUS_CPU_VERSION false)

if (MILVUS_GPU_VERSION)

    message(STATUS "Building Milvus GPU version")

    add_compile_definitions("MILVUS_GPU_VERSION")
@@ -155,8 +154,6 @@ if (MILVUS_GPU_VERSION) 
    set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -Xcompiler -fPIC -std=c++11 -D_FORCE_INLINES --expt-extended-lambda")

else ()

    message(STATUS "Building Milvus CPU version")

    set(MILVUS_CPU_VERSION true)

    add_compile_definitions("MILVUS_CPU_VERSION")

endif ()



if (MILVUS_WITH_PROMETHEUS)

core/src/db/DBImpl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1044,10 +1044,10 @@ DBImpl::BuildTableIndexRecursively(const std::string& table_id, const TableIndex 
    if (!failed_files.empty()) {

        std::string msg = "Failed to build index for " + std::to_string(failed_files.size()) +

                          ((failed_files.size() == 1) ? " file" : " files");

#ifdef MILVUS_CPU_VERSION

        msg += ", please double check index parameters.";

#else

#ifdef MILVUS_GPU_VERSION

        msg += ", file size is too large or gpu memory is not enough.";

#else

        msg += ", please double check index parameters.";

#endif

        return Status(DB_ERROR, msg);

    }

core/src/db/engine/ExecutionEngineImpl.cpp

+12 −9
Original line number Diff line number Diff line
@@ -93,18 +93,18 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) { 
            break;

        }

        case EngineType::FAISS_IVFFLAT: {

#ifdef MILVUS_CPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_CPU);

#else

#ifdef MILVUS_GPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_MIX);

#else

            index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_CPU);

#endif

            break;

        }

        case EngineType::FAISS_IVFSQ8: {

#ifdef MILVUS_CPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_CPU);

#else

#ifdef MILVUS_GPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_MIX);

#else

            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_CPU);

#endif

            break;

        }
@@ -119,10 +119,10 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) { 
        }

#endif

        case EngineType::FAISS_PQ: {

#ifdef MILVUS_CPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);

#else

#ifdef MILVUS_GPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_MIX);

#else

            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);

#endif

            break;

        }
@@ -618,6 +618,9 @@ ExecutionEngineImpl::Init() { 
    server::Config& config = server::Config::GetInstance();

    std::vector<int64_t> gpu_ids;

    Status s = config.GetGpuResourceConfigBuildIndexResources(gpu_ids);

    if (!s.ok()) {

        gpu_num_ = knowhere::INVALID_VALUE;

    }

    for (auto id : gpu_ids) {

        if (gpu_num_ == id) {

            return Status::OK();

core/src/grpc/README.md

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
We manually change two APIs in "milvus.pb.h":

    add_vector_data()

    add_row_id_array()

    add_ids()

    add_distances()

If proto files need be generated again, remember to re-change above APIs.
 
 No newline at end of file