Commit 79221be2 authored by groot's avatar groot
Browse files

refine code 


Former-commit-id: 1ae20820e89e60a9ce8294d7e7e5f976fb72e55c
parent d0e07fb0

cpp/src/scheduler/optimizer/HybridPass.cpp

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
// specific language governing permissions and limitations

// under the License.



#include "HybridPass.h"

#include "scheduler/optimizer/HybridPass.h"

#include "scheduler/task/SearchTask.h"



namespace milvus {
@@ -24,12 +24,12 @@ namespace scheduler { 
bool

HybridPass::Run(const TaskPtr& task) {

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

    if (task->Type() != TaskType::SearchTask) return false;

    if (task->Type() != TaskType::SearchTask)

        return false;

    auto search_task = std::static_pointer_cast<XSearchTask>(task);

    // if (search_task->file_->engine_type_ == engine::EngineType::FAISS_IVFSQ8Hybrid)

    return false;

}



}

}

}  // namespace scheduler

}  // namespace milvus

cpp/src/scheduler/optimizer/HybridPass.h

+9 −10
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
// under the License.

#pragma once



#include <string>

#include <vector>

#include <condition_variable>

#include <deque>

#include <list>

#include <memory>

#include <mutex>

#include <queue>

#include <deque>

#include <unordered_map>

#include <string>

#include <thread>

#include <mutex>

#include <condition_variable>

#include <memory>

#include <unordered_map>

#include <vector>



#include "Pass.h"
@@ -43,6 +43,5 @@ class HybridPass : public Pass { 


using HybridPassPtr = std::shared_ptr<HybridPass>;



}

}

}  // namespace scheduler

}  // namespace milvus

cpp/src/scheduler/optimizer/Optimizer.cpp

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
// specific language governing permissions and limitations

// under the License.



#include "Optimizer.h"

#include "scheduler/optimizer/Optimizer.h"



namespace milvus {

namespace scheduler {
@@ -38,6 +38,5 @@ Optimizer::Run(const TaskPtr& task) { 
    return false;

}



}

}

}  // namespace scheduler

}  // namespace milvus

cpp/src/scheduler/optimizer/Optimizer.h

+10 −11
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
// under the License.

#pragma once



#include <string>

#include <vector>

#include <condition_variable>

#include <deque>

#include <list>

#include <memory>

#include <mutex>

#include <queue>

#include <deque>

#include <unordered_map>

#include <string>

#include <thread>

#include <mutex>

#include <condition_variable>

#include <memory>

#include <unordered_map>

#include <vector>



#include "Pass.h"
@@ -46,6 +46,5 @@ class Optimizer { 
    std::vector<PassPtr> pass_list_;

};



}

}

}  // namespace scheduler

}  // namespace milvus

cpp/src/scheduler/optimizer/Pass.h

+11 −10
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
// under the License.

#pragma once



#include <string>

#include <vector>

#include <condition_variable>

#include <deque>

#include <list>

#include <memory>

#include <mutex>

#include <queue>

#include <deque>

#include <unordered_map>

#include <string>

#include <thread>

#include <mutex>

#include <condition_variable>

#include <memory>

#include <unordered_map>

#include <vector>



#include "scheduler/task/Task.h"
@@ -35,12 +35,13 @@ namespace scheduler { 
class Pass {

 public:

    virtual void

    Init() {}

    Init() {

    }



    virtual bool

    Run(const TaskPtr& task) = 0;

};

using PassPtr = std::shared_ptr<Pass>;



}

}
 
}  // namespace scheduler

}  // namespace milvus