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

!2518 [Control sink]Fix bug of get call real outputs 

Merge pull request !2518 from chenfei_mindspore/stop-in-tuple-get-item-of-update-call-real-input
This commit is contained in:
mindspore-ci-bot 2020-06-24 09:20:40 +08:00 committed by Gitee
parent ea4800050b df7fe72928
commit ecff9f4eba
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mindspore/ccsrc/session/kernel_graph.cc
View File

@ -43,7 +43,8 @@ void PushNoVisitedNode(const AnfNodePtr &node, std::queue<AnfNodePtr> *que,
} }
std::vector<AnfNodePtr> GetCallRealOutputs(const AnfNodePtr &call_node) { std::vector<AnfNodePtr> GetCallRealOutputs(const AnfNodePtr &call_node) {
auto item_with_index = AnfAlgo::VisitKernelWithReturnType(call_node, 0); auto item_with_index =
AnfAlgo::VisitKernelWithReturnType(call_node, 0, false, {prim::kPrimTupleGetItem, prim::kPrimMakeTuple});
AnfNodePtr node = item_with_index.first; AnfNodePtr node = item_with_index.first;
MS_EXCEPTION_IF_NULL(node); MS_EXCEPTION_IF_NULL(node);
if (AnfAlgo::CheckPrimitiveType(node, prim::kPrimMakeTuple)) { if (AnfAlgo::CheckPrimitiveType(node, prim::kPrimMakeTuple)) {
@ -773,9 +774,7 @@ void KernelGraph::UpdateCallRealInput() {
std::vector<AnfNodePtr> new_real_inputs; std::vector<AnfNodePtr> new_real_inputs;
for (auto &real_input : real_inputs) { for (auto &real_input : real_inputs) {
// if real input is a call node ,find the child graph output act as the new real input // if real input is a call node ,find the child graph output act as the new real input
auto item_with_index = AnfAlgo::VisitKernelWithReturnType(real_input, 0); auto tmp_real_input = GetCallRealOutputs(real_input);
MS_EXCEPTION_IF_NULL(item_with_index.first);
auto tmp_real_input = GetCallRealOutputs(item_with_index.first);
std::copy(tmp_real_input.begin(), tmp_real_input.end(), std::back_inserter(new_real_inputs)); std::copy(tmp_real_input.begin(), tmp_real_input.end(), std::back_inserter(new_real_inputs));
} }
real_inputs_map.emplace_back(parameter, new_real_inputs); real_inputs_map.emplace_back(parameter, new_real_inputs);