Unverified Commit 7b949861 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #614 from cydrain/caiyd_remove_cpu_version_macro 

#611 remove MILVUS_CPU_VERSION
parents 8e4c5833 a023511f

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,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
@@ -1033,10 +1033,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

+9 −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;

        }

core/src/main.cpp

+3 −3
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ print_banner() { 
              << "OpenBLAS"

#endif

              << " library." << std::endl;

#ifdef MILVUS_CPU_VERSION

    std::cout << "You are using Milvus CPU edition" << std::endl;

#else

#ifdef MILVUS_GPU_VERSION

    std::cout << "You are using Milvus GPU edition" << std::endl;

#else

    std::cout << "You are using Milvus CPU edition" << std::endl;

#endif

    std::cout << std::endl;

}