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

Merge pull request #603 from fishpenguin/0.6.0-yk-refactor-scheduler 

Optimizer specify wrong gpu_id
parents fc364d25 018abff2

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#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

- \#599 - Build index log is incorrect

- \#602 - Optimizer specify wrong gpu_id



## Feature

- \#12 - Pure CPU version for Milvus

core/src/db/meta/MySQLMetaImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,8 @@ MySQLMetaImpl::FilesByType(const std::string& table_id, const std::vector<int>& 
                    case (int)TableFileSchema::BACKUP:

                        msg = msg + " backup files:" + std::to_string(backup_count);

                        break;

                    default:break;

                    default:

                        break;

                }

            }

            ENGINE_LOG_DEBUG << msg;

core/src/scheduler/optimizer/FaissFlatPass.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ FaissFlatPass::Run(const TaskPtr& task) { 
        auto best_device_id = count_ % gpus.size();

        SERVER_LOG_DEBUG << "FaissFlatPass: nq > gpu_search_threshold, specify gpu" << best_device_id << " to search!";

        count_++;

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, gpus[best_device_id]);

    }

    auto label = std::make_shared<SpecResLabel>(res_ptr);

    task->label() = label;

core/src/scheduler/optimizer/FaissIVFFlatPass.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ FaissIVFFlatPass::Run(const TaskPtr& task) { 
        SERVER_LOG_DEBUG << "FaissIVFFlatPass: nq > gpu_search_threshold, specify gpu" << best_device_id

                         << " to search!";

        count_++;

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, gpus[best_device_id]);

    }

    auto label = std::make_shared<SpecResLabel>(res_ptr);

    task->label() = label;

core/src/scheduler/optimizer/FaissIVFSQ8HPass.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ FaissIVFSQ8HPass::Run(const TaskPtr& task) { 
        SERVER_LOG_DEBUG << "FaissIVFSQ8HPass: nq > gpu_search_threshold, specify gpu" << best_device_id

                         << " to search!";

        count_++;

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, best_device_id);

        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, gpus[best_device_id]);

    }

    auto label = std::make_shared<SpecResLabel>(res_ptr);

    task->label() = label;