From 3e06fbd5dcd372e96e55c3e87b144427df53ebaf Mon Sep 17 00:00:00 2001 From: zhaozhixuan Date: Tue, 13 Apr 2021 21:50:45 +0800 Subject: [PATCH 1/3] Don't call rt_call_bcak when single_op multi_task. --- ge/graph/passes/reshape_recovery_pass.cc | 8 +++++++- ge/hybrid/node_executor/aicore/aicore_node_executor.cc | 2 +- ge/hybrid/node_executor/aicore/aicore_node_executor.h | 2 ++ ge/hybrid/node_executor/aicore/aicore_task_builder.cc | 1 + tests/ut/ge/graph/passes/reshape_recovery_pass_unittest.cc | 6 +++--- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ge/graph/passes/reshape_recovery_pass.cc b/ge/graph/passes/reshape_recovery_pass.cc index 7a9d085b..e78fc1b7 100644 --- a/ge/graph/passes/reshape_recovery_pass.cc +++ b/ge/graph/passes/reshape_recovery_pass.cc @@ -60,7 +60,7 @@ Status InsertReshapeIfNeed(const NodePtr &node) { node->GetName().c_str(), src_anchor->GetIdx(), dst_node->GetName().c_str(), dst_anchor->GetIdx()); GE_CHECK_NOTNULL(dst_node); GE_CHECK_NOTNULL(dst_node->GetOpDesc()); - auto dst_tensor = dst_node->GetOpDesc()->GetInputDescPtr(dst_anchor->GetIdx()); + auto dst_tensor = dst_node->GetOpDesc()->MutableInputDesc(dst_anchor->GetIdx()); GE_CHECK_NOTNULL(dst_tensor); bool is_dynamic = false; const auto &src_tensor_dims = src_tensor->GetShape().GetDims(); @@ -71,6 +71,12 @@ Status InsertReshapeIfNeed(const NodePtr &node) { dst_node->GetName().c_str()); is_dynamic = true; } + if (dst_node->GetType() == NETOUTPUT && is_dynamic) { + // NetOutput shape must be continuous when dynamic shape. + // Otherwise, there may be an arror waiting for the shape refresh to time out during execution. + dst_tensor->SetShape(src_tensor->GetShape()); + continue; + } bool is_need_insert_reshape = src_tensor_dims != dst_tensor_dims && !is_dynamic; if (is_need_insert_reshape) { diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc index 29ae831c..2ce7fea2 100755 --- a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc +++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc @@ -216,7 +216,7 @@ Status AiCoreNodeTask::ExecuteAsync(TaskContext &context, std::function RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeLaunchKernel] End"); } - if (done_callback != nullptr) { + if (done_callback != nullptr && !is_single_op_) { RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] Start"); GE_CHK_STATUS_RET_NOLOG(context.RegisterCallback(done_callback)); RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] End"); diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.h b/ge/hybrid/node_executor/aicore/aicore_node_executor.h index c352764d..74a28245 100755 --- a/ge/hybrid/node_executor/aicore/aicore_node_executor.h +++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.h @@ -61,10 +61,12 @@ class AiCoreNodeTask : public NodeTask { const vector &GetWorkspaceSizes() const; void SetWorkspaceSizes(const vector &workspace_sizes); + void SetSingleOp(bool is_single_op) {is_single_op_ = is_single_op;} private: Status CheckOverflow(TaskContext &context); std::vector> tasks_; std::vector workspace_sizes_; + bool is_single_op_ = false; }; class AiCoreNodeExecutor : public NodeExecutor { diff --git a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc index 114451b3..c615b7c3 100755 --- a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc +++ b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc @@ -88,6 +88,7 @@ Status AiCoreTaskBuilder::BuildTask(std::unique_ptr &node_task, node_task.reset(new(std::nothrow)AiCoreNodeTask(std::move(op_tasks))); GE_CHECK_NOTNULL(node_task); + node_task->SetSingleOp(is_single_op); return SUCCESS; } diff --git a/tests/ut/ge/graph/passes/reshape_recovery_pass_unittest.cc b/tests/ut/ge/graph/passes/reshape_recovery_pass_unittest.cc index af60021c..9d7a3a4e 100644 --- a/tests/ut/ge/graph/passes/reshape_recovery_pass_unittest.cc +++ b/tests/ut/ge/graph/passes/reshape_recovery_pass_unittest.cc @@ -42,8 +42,8 @@ ut::GraphBuilder Graph1Builder() { auto var1 = builder.AddNode("var1", "Variable", 0, 1, FORMAT_ND, DT_FLOAT, {-1}); auto const1 = builder.AddNode("const1", "Const", 0, 1, FORMAT_ND, DT_FLOAT, {1, 1, 224, 224}); auto transdata2 = builder.AddNode("transdata2", "Transdata", 1, 1, FORMAT_ND, DT_FLOAT, {224, 224}); - auto transdata1 = builder.AddNode("transdata1", "Transdata", 1, 1, FORMAT_ND, DT_FLOAT, {224, 224}); - auto netoutput1 = builder.AddNode("netoutput1", "Netoutput", 2, 0); + auto transdata1 = builder.AddNode("transdata1", "Transdata", 1, 1, FORMAT_ND, DT_FLOAT, {-1, 224}); + auto netoutput1 = builder.AddNode("netoutput1", "NetOutput", 2, 0); builder.AddDataEdge(var1, 0, transdata1, 0); builder.AddDataEdge(const1, 0, transdata2, 0); @@ -61,7 +61,7 @@ TEST_F(UtestReshapeRecoveryPass, reshape_recovery_with_dynamic_shape) { EXPECT_EQ(graph->GetDirectNodesSize(),5); Status ret = reshape_recovery_pass.Run(graph); EXPECT_EQ(ret, SUCCESS); - EXPECT_EQ(graph->GetDirectNodesSize(),8); + EXPECT_EQ(graph->GetDirectNodesSize(),7); auto reshape1 = graph->FindNode("Reshape_ReshapeRecoveryPass_0"); EXPECT_NE(reshape1, nullptr); From ab7e841ada86dc226e9e208ba731b3ffeb9bd805 Mon Sep 17 00:00:00 2001 From: zhaozhixuan Date: Wed, 14 Apr 2021 09:04:57 +0800 Subject: [PATCH 2/3] Make NetOutput shape continuous. --- ge/hybrid/node_executor/aicore/aicore_node_executor.cc | 2 +- ge/hybrid/node_executor/aicore/aicore_node_executor.h | 2 -- ge/hybrid/node_executor/aicore/aicore_task_builder.cc | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc index 2ce7fea2..29ae831c 100755 --- a/ge/hybrid/node_executor/aicore/aicore_node_executor.cc +++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.cc @@ -216,7 +216,7 @@ Status AiCoreNodeTask::ExecuteAsync(TaskContext &context, std::function RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeLaunchKernel] End"); } - if (done_callback != nullptr && !is_single_op_) { + if (done_callback != nullptr) { RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] Start"); GE_CHK_STATUS_RET_NOLOG(context.RegisterCallback(done_callback)); RECORD_EXECUTION_EVENT(context.GetExecutionContext(), context.GetNodeName(), "[AiCoreNodeRegisterCallback] End"); diff --git a/ge/hybrid/node_executor/aicore/aicore_node_executor.h b/ge/hybrid/node_executor/aicore/aicore_node_executor.h index 74a28245..c352764d 100755 --- a/ge/hybrid/node_executor/aicore/aicore_node_executor.h +++ b/ge/hybrid/node_executor/aicore/aicore_node_executor.h @@ -61,12 +61,10 @@ class AiCoreNodeTask : public NodeTask { const vector &GetWorkspaceSizes() const; void SetWorkspaceSizes(const vector &workspace_sizes); - void SetSingleOp(bool is_single_op) {is_single_op_ = is_single_op;} private: Status CheckOverflow(TaskContext &context); std::vector> tasks_; std::vector workspace_sizes_; - bool is_single_op_ = false; }; class AiCoreNodeExecutor : public NodeExecutor { diff --git a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc index c615b7c3..114451b3 100755 --- a/ge/hybrid/node_executor/aicore/aicore_task_builder.cc +++ b/ge/hybrid/node_executor/aicore/aicore_task_builder.cc @@ -88,7 +88,6 @@ Status AiCoreTaskBuilder::BuildTask(std::unique_ptr &node_task, node_task.reset(new(std::nothrow)AiCoreNodeTask(std::move(op_tasks))); GE_CHECK_NOTNULL(node_task); - node_task->SetSingleOp(is_single_op); return SUCCESS; } From ce5a7825b61d0ec071e3059c504ab77c7c935564 Mon Sep 17 00:00:00 2001 From: zhaozhixuan Date: Wed, 14 Apr 2021 09:10:42 +0800 Subject: [PATCH 3/3] Make NetOutput shape continuous. --- ge/graph/passes/reshape_recovery_pass.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/graph/passes/reshape_recovery_pass.cc b/ge/graph/passes/reshape_recovery_pass.cc index e78fc1b7..ba12ba15 100644 --- a/ge/graph/passes/reshape_recovery_pass.cc +++ b/ge/graph/passes/reshape_recovery_pass.cc @@ -73,7 +73,7 @@ Status InsertReshapeIfNeed(const NodePtr &node) { } if (dst_node->GetType() == NETOUTPUT && is_dynamic) { // NetOutput shape must be continuous when dynamic shape. - // Otherwise, there may be an arror waiting for the shape refresh to time out during execution. + // Otherwise, there may be an error waiting for the shape refresh to time out during execution. dst_tensor->SetShape(src_tensor->GetShape()); continue; }