From 3f2e8be1dc81b550872353bff005e379e700450b Mon Sep 17 00:00:00 2001 From: yangwei Date: Tue, 6 Apr 2021 16:11:52 +0800 Subject: [PATCH] fix streamswitch --- ge/graph/load/model_manager/davinci_model.cc | 10 +++-- .../task_info/stream_switch_task_info.cc | 2 +- ge/graph/passes/memcpy_addr_async_pass.cc | 40 ++++++++++++++++++- ge/graph/passes/memcpy_addr_async_pass.h | 2 + tests/ut/ge/CMakeLists.txt | 2 - 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/ge/graph/load/model_manager/davinci_model.cc b/ge/graph/load/model_manager/davinci_model.cc index 75396234..9bc09508 100755 --- a/ge/graph/load/model_manager/davinci_model.cc +++ b/ge/graph/load/model_manager/davinci_model.cc @@ -883,6 +883,8 @@ Status DavinciModel::InitNodes(const ComputeGraphPtr &compute_graph) { continue; } + // for dynamic shape with control flow + SetLabelForDynamic(node); auto it = op_desc_handle.find(op_desc->GetType()); if (it != op_desc_handle.end()) { if ((this->*it->second)(op_desc) != SUCCESS) { @@ -891,8 +893,7 @@ Status DavinciModel::InitNodes(const ComputeGraphPtr &compute_graph) { } continue; } - // for dynamic shape with control flow - SetLabelForDynamic(node); + if (IsNoTaskAndDumpNeeded(op_desc)) { GELOGD("node[%s] without task, and save op_desc and addr for dump", op_desc->GetName().c_str()); const RuntimeParam &rts_param = GetRuntimeParam(); @@ -936,11 +937,12 @@ Status DavinciModel::InitNodes(const ComputeGraphPtr &compute_graph) { } void DavinciModel::SetLabelForDynamic(const NodePtr &node) { - if (known_node_ && node->GetOpDesc()->GetType() == LABELSWITCHBYINDEX) { + if (known_node_ && (node->GetType() == LABELSWITCHBYINDEX || node->GetType() == STREAMSWITCH)) { for (auto &in_data_anchor : node->GetAllInDataAnchors()) { auto peer_out_data_anchor = in_data_anchor->GetPeerOutAnchor(); if (peer_out_data_anchor != nullptr) { - string tensor_name = node->GetName(); + // name+index as the label of switch input + string tensor_name = node->GetName() + std::to_string(in_data_anchor->GetIdx()); auto peer_node = peer_out_data_anchor->GetOwnerNode(); (void)AttrUtils::SetStr(peer_node->GetOpDesc(), ATTR_DYNAMIC_SHAPE_FIXED_ADDR, tensor_name); (void)AttrUtils::SetInt(peer_node->GetOpDesc(), ATTR_DYNAMIC_SHAPE_FIXED_ADDR_INDEX, 0); diff --git a/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc b/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc index f790ce8a..44f8011d 100644 --- a/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc +++ b/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc @@ -148,7 +148,7 @@ Status StreamSwitchTaskInfo::CalculateArgs(const domi::TaskDef &task_def, Davinc return FAILED; } for (uint32_t i = 0; i < STREAM_SWITCH_INPUT_NUM; ++i) { - string input_tensor_name = op_desc->GetInputNameByIndex(i); + string input_tensor_name = op_desc->GetName() + std::to_string(i); int64_t fixed_addr_offset = davinci_model->GetFixedAddrsSize(input_tensor_name); fixed_addr_offset_.emplace_back(fixed_addr_offset); auto tensor_desc = op_desc->GetInputDesc(i); diff --git a/ge/graph/passes/memcpy_addr_async_pass.cc b/ge/graph/passes/memcpy_addr_async_pass.cc index b930f7cb..561ab8e3 100755 --- a/ge/graph/passes/memcpy_addr_async_pass.cc +++ b/ge/graph/passes/memcpy_addr_async_pass.cc @@ -25,6 +25,14 @@ namespace ge { Status MemcpyAddrAsyncPass::Run(ComputeGraphPtr graph) { GE_CHECK_NOTNULL(graph); + for (const auto &node : graph->GetAllNodes()) { + if (node->GetType() == STREAMSWITCH) { + auto sub_graph = node->GetOwnerComputeGraph(); + if (sub_graph != nullptr && !sub_graph->GetGraphUnknownFlag()) { + GE_CHK_STATUS_RET(AddMemcpyAsyncNode(node), "Add memcpyasync node failed in known subgraph."); + } + } + } if (graph->GetGraphUnknownFlag()) { GELOGD("Graph[%s] is unknown graph, skip.", graph->GetName().c_str()); return SUCCESS; @@ -63,6 +71,28 @@ Status MemcpyAddrAsyncPass::Run(ComputeGraphPtr graph) { return SUCCESS; } +Status MemcpyAddrAsyncPass::AddMemcpyAsyncNode(const NodePtr &node) { + GE_CHECK_NOTNULL(node); + GELOGI("Start add memcpyasync node in front of node %s", node->GetName().c_str()); + known_sub_graph_ = true; + auto sub_graph = node->GetOwnerComputeGraph(); + for (InDataAnchorPtr &in_data_anchor : node->GetAllInDataAnchors()) { + OutDataAnchorPtr peer_out_anchor = in_data_anchor->GetPeerOutAnchor(); + GE_IF_BOOL_EXEC(peer_out_anchor == nullptr, continue); + auto memcpy_async_node = CreateMemcpyAddrAsyncNode(sub_graph, peer_out_anchor, node); + if (memcpy_async_node == nullptr) { + GELOGE(INTERNAL_ERROR, "Create memcpyasync node failed."); + return INTERNAL_ERROR; + } + Status ret = InsertMemcpyAddrAsyncNode(peer_out_anchor, in_data_anchor, memcpy_async_node); + if (ret != SUCCESS) { + GELOGE(ret, "Insert memcpyasync node failed."); + return ret; + } + } + return SUCCESS; +} + Status MemcpyAddrAsyncPass::AddMemcpyAddrAsyncNode(const ComputeGraphPtr &graph, const NodePtr &node) { GELOGI("Start AddMemcpyAddrAsyncNode for %s.", node->GetName().c_str()); for (InDataAnchorPtr &in_data_anchor : node->GetAllInDataAnchors()) { @@ -208,9 +238,15 @@ NodePtr MemcpyAddrAsyncPass::CreateMemcpyAddrAsyncNode(const ComputeGraphPtr &gr static uint32_t new_node_index = 0; OpDescPtr pre_op_desc = out_data_anchor->GetOwnerNode()->GetOpDesc(); GE_CHK_BOOL_EXEC(pre_op_desc != nullptr, return nullptr, "Op_desc of pre node is invalid."); - std::string node_name = pre_op_desc->GetName() + "_" + MEMCPYADDRASYNC + "_" + std::to_string(new_node_index++); - OpDescPtr op_desc = MakeShared(node_name, MEMCPYADDRASYNC); + OpDescPtr op_desc = nullptr; + if (known_sub_graph_) { // insert memcpyasync node when known sub graph + string node_name = pre_op_desc->GetName() + "_" + MEMCPYASYNC + "_" + std::to_string(new_node_index++); + op_desc = MakeShared(node_name, MEMCPYASYNC); + } else { + string node_name = pre_op_desc->GetName() + "_" + MEMCPYADDRASYNC + "_" + std::to_string(new_node_index++); + op_desc = MakeShared(node_name, MEMCPYADDRASYNC); + } GE_CHECK_NOTNULL_EXEC(op_desc, return nullptr); if (op_desc->AddInputDesc(pre_op_desc->GetOutputDesc(out_data_anchor->GetIdx())) != GRAPH_SUCCESS) { diff --git a/ge/graph/passes/memcpy_addr_async_pass.h b/ge/graph/passes/memcpy_addr_async_pass.h index 0f22d10b..a4190828 100755 --- a/ge/graph/passes/memcpy_addr_async_pass.h +++ b/ge/graph/passes/memcpy_addr_async_pass.h @@ -27,6 +27,7 @@ class MemcpyAddrAsyncPass : public GraphPass { private: Status AddMemcpyAddrAsyncNode(const ComputeGraphPtr &graph, const NodePtr &node); + Status AddMemcpyAsyncNode(const NodePtr &node); void FindUserData(const NodePtr &node, uint32_t &parent_index); void FindUserDataForKnown(const NodePtr &parent_node, uint32_t &parent_index); void FindUserDataForNonDynamic(const ge::NodePtr &parent_node, uint32_t &parent_index); @@ -48,6 +49,7 @@ class MemcpyAddrAsyncPass : public GraphPass { OutDataAnchorPtr peer_out_anchor_for_known_; InDataAnchorPtr in_anchor_for_known_; bool find_user_data_for_known_ = false; + bool known_sub_graph_ = false; }; } // namespace ge #endif // GE_GRAPH_PASSES_MEMCPY_ADDR_ASYNC_PASS_H_ diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index 0bc9a6e1..ff26721d 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/tests/ut/ge/CMakeLists.txt @@ -303,7 +303,6 @@ set(COMMON_SRC_FILES "${GE_CODE_DIR}/ge/ir_build/attr_options/keep_dtype_option.cc" "${GE_CODE_DIR}/ge/ir_build/attr_options/weight_compress_option.cc" "${GE_CODE_DIR}/ge/graph/build/label_allocator.cc" - "${GE_CODE_DIR}/ge/graph/passes/memcpy_addr_async_pass.cc" "${GE_CODE_DIR}/ge/graph/partition/stage_partition.cc" "${GE_CODE_DIR}/ge/graph/partition/dynamic_shape_partition.cc" "${GE_CODE_DIR}/ge/graph/optimize/summary_optimize.cc" @@ -430,7 +429,6 @@ set(DISTINCT_GRAPH_LOAD_SRC_FILES "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/memcpy_async_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/profiler_trace_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/stream_active_task_info.cc" - "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/stream_switch_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/end_graph_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/model_exit_task_info.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/task_info/super_kernel/super_kernel.cc"