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

Merge pull request #405 from scsven/dev 

Add virtual method Init() in Pass abstract class close #404
parents 4feb1752 7ad5c514

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#322 - Add option to enable / disable prometheus

- \#358 - Add more information in build.sh and install.md

- \#255 - Add ivfsq8 test report detailed version

- \#404 - Add virtual method Init() in Pass abstract class



## Task

core/src/scheduler/SchedInst.cpp

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ load_simple_config() { 
void

StartSchedulerService() {

    load_simple_config();

    OptimizerInst::GetInstance()->Init();

    ResMgrInst::GetInstance()->Start();

    SchedInst::GetInstance()->Start();

    JobMgrInst::GetInstance()->Start();

core/src/scheduler/optimizer/HybridPass.cpp

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
namespace milvus {

namespace scheduler {



void

HybridPass::Init() {

}



bool

HybridPass::Run(const TaskPtr& task) {

    // TODO: future, Index::IVFSQ8H, if nq < threshold set cpu, else set gpu

core/src/scheduler/optimizer/HybridPass.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ class HybridPass : public Pass { 
    HybridPass() = default;



 public:

    void

    Init() override;



    bool

    Run(const TaskPtr& task) override;

};

core/src/scheduler/optimizer/LargeSQ8HPass.cpp

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
namespace milvus {

namespace scheduler {



LargeSQ8HPass::LargeSQ8HPass() {

void

LargeSQ8HPass::Init() {

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

    Status s = config.GetEngineConfigGpuSearchThreshold(threshold_);

    if (!s.ok()) {