p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!22844 [MS][Lite]LIte convert from mindir to ms report error of while mindir. 

Merge pull request !22844 from mengyuanli/fix_bug_of_mindir_control_flow
This commit is contained in:
i-robot 2021-09-03 01:14:34 +00:00 committed by Gitee
parent 6e5637e9e1 8032d159f5
commit d66fe5ee34
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mindspore/lite/tools/converter/import/mindir_control_flow_adjust.cc
View File

@ -275,6 +275,21 @@ int MindIRControlFlowAdjust::InsertPartialFusionForRawCall(const std::set<FuncGr
return RET_OK;
}
int MindIRControlFlowAdjust::ResetFuncGraph(const FuncGraphPtr &fg, std::set<FuncGraphPtr> all_func_graphs) {
MS_CHECK_TRUE_MSG(fg != nullptr, RET_NULL_PTR, "fg is nullptr.");
auto manager = fg->manager();
MS_CHECK_TRUE_MSG(manager != nullptr, RET_NULL_PTR, "manager is nullptr.");
manager->Clear();
manager->AddFuncGraph(fg, true);
for (auto &item : all_func_graphs) {
if (item == fg) {
continue;
}
manager->AddFuncGraph(item);
}
return RET_OK;
}
bool MindIRControlFlowAdjust::Run(const FuncGraphPtr &func_graph) {
if (this->fmk_type_ != FmkType::kFmkTypeMs) {
MS_LOG(INFO) << "The framework type of model should be MindIR.";
@ -297,6 +312,12 @@ bool MindIRControlFlowAdjust::Run(const FuncGraphPtr &func_graph) {
MS_LOG(ERROR) << "AddAfterFgForInlinedFg failed.";
return false;
}
ret = ResetFuncGraph(func_graph, all_func_graphs);
if (ret != RET_OK) {
MS_LOG(ERROR) << "ResetFuncGraph failed.";
return false;
}
if (status_ != RET_OK) {
return false;
}

1
mindspore/lite/tools/converter/import/mindir_control_flow_adjust.h
View File

@ -43,6 +43,7 @@ class MindIRControlFlowAdjust {
int AddAfterFgForInlinedFg(const std::set<FuncGraphPtr> &all_func_graphs, const FuncGraphPtr &main_fg);
int InsertPartialFusionForRawCall(const std::set<FuncGraphPtr> &all_func_graphs);
CNodePtr GetMainFgSwitchNode(const FuncGraphPtr &fg);
int ResetFuncGraph(const FuncGraphPtr &fg, std::set<FuncGraphPtr> all_func_graphs);
private:
FmkType fmk_type_ = FmkType::kFmkTypeMs;