Commit b17d2afa authored by peng.xu's avatar peng.xu
Browse files

Merge branch '0.5.0' into '0.5.0' 

MS-665 rename build_index_gpu to index_build_device, and move it to resource config

See merge request megasearch/milvus!764

Former-commit-id: 887719e3c3fc943e11bde77b99b71d55b970cfa6
parents 599dd5e2 7141dc85

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-653 - When config check fail, Milvus close without message

- MS-654 - Describe index timeout when building index

- MS-658 - Fix SQ8 Hybrid can't search

- MS-665 - IVF_SQ8H search crash when no GPU resource in search_resources

- \#20 - C++ sdk example get grpc error 

- \#23 - Add unittest to improve code coverage

- \#31 - make clang-format failed after run build.sh -l

core/conf/server_config.template

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ db_config: 


  insert_buffer_size: 4             # GB, maximum insert buffer size allowed

                                    # sum of insert_buffer_size and cpu_cache_capacity cannot exceed total memory

  build_index_gpu: 0                # gpu id used for building index



  preload_table:                    # preload data at startup, '*' means load all tables, empty value means no preload

                                    # you can specify preload tables like this: table1,table2,table3
@@ -39,6 +38,6 @@ engine_config: 
                                    # if nq >= use_blas_threshold, use OpenBlas, slower with stable response times



resource_config:

  resource_pool:

    - cpu

  search_resources:                 # define the GPUs used for search computation, valid value: gpux

    - gpu0

  index_build_device: gpu0          # GPU used for building index
 
 No newline at end of file

core/src/db/engine/ExecutionEngineImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ ExecutionEngineImpl::GpuCache(uint64_t gpu_id) { 
Status

ExecutionEngineImpl::Init() {

    server::Config& config = server::Config::GetInstance();

    Status s = config.GetDBConfigBuildIndexGPU(gpu_num_);

    Status s = config.GetResourceConfigIndexBuildDevice(gpu_num_);

    if (!s.ok()) {

        return s;

    }

core/src/scheduler/SchedInst.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ load_simple_config() { 
    std::string mode;

    config.GetResourceConfigMode(mode);

    std::vector<std::string> pool;

    config.GetResourceConfigPool(pool);

    config.GetResourceConfigSearchResources(pool);



    // get resources

    bool use_cpu_to_compute = false;

core/src/scheduler/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ get_gpu_pool() { 


    server::Config& config = server::Config::GetInstance();

    std::vector<std::string> pool;

    Status s = config.GetResourceConfigPool(pool);

    Status s = config.GetResourceConfigSearchResources(pool);

    if (!s.ok()) {

        SERVER_LOG_ERROR << s.message();

    }