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

Merge pull request #410 from scsven/add-fallback-pass 

Add a Fallback pass in optimizer close #409
parents cc12e0b0 9f063aa2

CHANGELOG.md

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

- \#409 - Add a Fallback pass in optimizer



## Task

core/src/scheduler/SchedInst.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "JobMgr.h"

#include "ResourceMgr.h"

#include "Scheduler.h"

#include "optimizer/FallbackPass.h"

#include "optimizer/HybridPass.h"

#include "optimizer/LargeSQ8HPass.h"

#include "optimizer/OnlyCPUPass.h"
@@ -112,6 +113,7 @@ class OptimizerInst { 
                pass_list.push_back(std::make_shared<HybridPass>());

                pass_list.push_back(std::make_shared<OnlyCPUPass>());

                pass_list.push_back(std::make_shared<OnlyGPUPass>(has_cpu));

                pass_list.push_back(std::make_shared<FallbackPass>());

                instance = std::make_shared<Optimizer>(pass_list);

            }

        }

core/src/scheduler/optimizer/FallbackPass.cpp

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// Licensed to the Apache Software Foundation (ASF) under one

// or more contributor license agreements.  See the NOTICE file

// distributed with this work for additional information

// regarding copyright ownership.  The ASF licenses this file

// to you under the Apache License, Version 2.0 (the

// "License"); you may not use this file except in compliance

// with the License.  You may obtain a copy of the License at

//

//   http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing,

// software distributed under the License is distributed on an

// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

// KIND, either express or implied.  See the License for the

// specific language governing permissions and limitations

// under the License.



#include "scheduler/optimizer/FallbackPass.h"

#include "scheduler/SchedInst.h"

#include "scheduler/tasklabel/SpecResLabel.h"



namespace milvus {

namespace scheduler {



void

FallbackPass::Init() {

}



bool

FallbackPass::Run(const TaskPtr& task) {

    auto task_type = task->Type();

    if (task_type != TaskType::SearchTask && task_type != TaskType::BuildIndexTask) {

        return false;

    }

    // NEVER be empty

    auto cpu = ResMgrInst::GetInstance()->GetCpuResources()[0];

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

    task->label() = label;

    return true;

}



}  // namespace scheduler

}  // namespace milvus

core/src/scheduler/optimizer/FallbackPass.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
// Licensed to the Apache Software Foundation (ASF) under one

// or more contributor license agreements.  See the NOTICE file

// distributed with this work for additional information

// regarding copyright ownership.  The ASF licenses this file

// to you under the Apache License, Version 2.0 (the

// "License"); you may not use this file except in compliance

// with the License.  You may obtain a copy of the License at

//

//   http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing,

// software distributed under the License is distributed on an

// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

// KIND, either express or implied.  See the License for the

// specific language governing permissions and limitations

// under the License.

#pragma once



#include <bits/stdc++.h>

#include <memory>



#include "Pass.h"



namespace milvus {

namespace scheduler {



class FallbackPass : public Pass {

 public:

    FallbackPass() = default;



 public:

    void

    Init() override;



    bool

    Run(const TaskPtr& task) override;

};



}  // namespace scheduler

}  // namespace milvus