mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!42947 fix cnode ptr is null in EOS mode 

Merge pull request !42947 from laiyongqiang/null_cnode
This commit is contained in:
i-robot 2022-09-27 01:32:20 +00:00 committed by Gitee
parent 110fa779b6 ab545b08d6
commit 57123f816c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_adjust.cc
View File

@ -326,7 +326,7 @@ void KernelAdjust::InsertGetNextLoopStreamSwitch(
}
void KernelAdjust::SetBeforeGetNextStreamID(std::vector<CNodePtr> *exec_order, const std::vector<CNodePtr> &orders,
size_t *order_index, CNodePtr getnext_cnode,
size_t *order_index, CNodePtr *getnext_cnode,
uint32_t getnext_stream_id) const {
MS_EXCEPTION_IF_NULL(exec_order);
MS_EXCEPTION_IF_NULL(order_index);
@ -335,7 +335,7 @@ void KernelAdjust::SetBeforeGetNextStreamID(std::vector<CNodePtr> *exec_order, c
(*exec_order).push_back(node);
AnfAlgo::SetStreamId(getnext_stream_id, (*exec_order)[(*exec_order).size() - 1].get());
if (common::AnfAlgo::GetCNodeName(node) == kGetNextOpName) {
getnext_cnode = node;
*getnext_cnode = node;
break;
}
}
@ -466,7 +466,7 @@ void KernelAdjust::ProcessLoopSink(const std::shared_ptr<session::KernelGraph> &
if (exist_getnext) {
InsertGetNextLoopStreamSwitch(kernel_graph_ptr, &exec_order, &getnext_switch_stream_id, &getnext_stream_id,
switch_loop_input);
SetBeforeGetNextStreamID(&exec_order, orders, &order_index, getnext_cnode, getnext_stream_id);
SetBeforeGetNextStreamID(&exec_order, orders, &order_index, &getnext_cnode, getnext_stream_id);
InsertGetNextLoopFpBpStartSend(kernel_graph_ptr, &exec_order, &fpbp_start_event_id, getnext_stream_id);
if (eos_mode) {
InsertGetNextLoopEosStartSend(kernel_graph_ptr, &exec_order, &eos_start_event_id, getnext_stream_id);

2
mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_adjust.h
View File

@ -113,7 +113,7 @@ class KernelAdjust {
uint32_t *getnext_stream_id,
const std::map<std::string, mindspore::ParameterPtr> &switch_loop_input) const;
void SetBeforeGetNextStreamID(std::vector<CNodePtr> *exec_order, const std::vector<CNodePtr> &orders,
size_t *order_index, CNodePtr getnext_cnode, uint32_t getnext_stream_id) const;
size_t *order_index, CNodePtr *getnext_cnode, uint32_t getnext_stream_id) const;
void InsertGetNextLoopFpBpStartSend(const std::shared_ptr<session::KernelGraph> &kernel_graph_ptr,
std::vector<CNodePtr> *exec_order, uint32_t *fpbp_start_event_id,
uint32_t getnext_stream_id) const;