From 33e12ad18324e84bd8ce75ffa3e07c60af113aa1 Mon Sep 17 00:00:00 2001 From: chenyemeng Date: Mon, 26 Oct 2020 17:08:23 +0800 Subject: [PATCH] split MergeToStreamMergePass, rm useless input param --- ge/graph/passes/merge_input_memcpy_pass.cc | 4 ++-- ge/graph/passes/merge_to_stream_merge_pass.cc | 8 +++----- ge/graph/passes/merge_to_stream_merge_pass.h | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ge/graph/passes/merge_input_memcpy_pass.cc b/ge/graph/passes/merge_input_memcpy_pass.cc index fb1b4497..e8bf0377 100644 --- a/ge/graph/passes/merge_input_memcpy_pass.cc +++ b/ge/graph/passes/merge_input_memcpy_pass.cc @@ -42,7 +42,7 @@ Status MergeInputMemcpyPass::Run(ComputeGraphPtr graph) { /// @return Status /// Status MergeInputMemcpyPass::AddMemcpyAsyncNodes(const ComputeGraphPtr &graph, const NodePtr &node, - bool multi_batch_flag) { + bool multi_batch_flag) { for (const InDataAnchorPtr &in_data_anchor : node->GetAllInDataAnchors()) { OutDataAnchorPtr peer_out_anchor = in_data_anchor->GetPeerOutAnchor(); GE_IF_BOOL_EXEC(peer_out_anchor == nullptr, continue); @@ -74,7 +74,7 @@ Status MergeInputMemcpyPass::AddMemcpyAsyncNodes(const ComputeGraphPtr &graph, c /// @return ge::NodePtr /// NodePtr MergeInputMemcpyPass::CreateMemcpyAsyncNode(const ComputeGraphPtr &graph, const std::string &name, - const OutDataAnchorPtr &out_data_anchor, bool multi_batch_flag) { + const OutDataAnchorPtr &out_data_anchor, bool multi_batch_flag) { OpDescPtr pre_op_desc = out_data_anchor->GetOwnerNode()->GetOpDesc(); GE_CHK_BOOL_EXEC(pre_op_desc != nullptr, return nullptr, "OpDesc of pre node is invalid."); diff --git a/ge/graph/passes/merge_to_stream_merge_pass.cc b/ge/graph/passes/merge_to_stream_merge_pass.cc index b1e3f926..4b2d2b07 100644 --- a/ge/graph/passes/merge_to_stream_merge_pass.cc +++ b/ge/graph/passes/merge_to_stream_merge_pass.cc @@ -32,7 +32,7 @@ Status MergeToStreamMergePass::Run(ComputeGraphPtr graph) { OpDescPtr merge_op_desc = node->GetOpDesc(); GE_CHECK_NOTNULL(merge_op_desc); if (merge_op_desc->HasAttr(ATTR_INSERT_BY_MBATCH)) { - GE_CHK_STATUS_RET(AddActiveNodes(graph, node, true), "Merge add active node failed."); + GE_CHK_STATUS_RET(AddActiveNodes(graph, node), "Merge add active node failed."); GE_CHK_STATUS_RET(SetStreamLabel(node, node->GetName()), "Set stream label failed"); } else { GE_CHK_STATUS_RET(ReplaceMergeNode(graph, node), "Add StreamMerge node failed."); @@ -99,18 +99,16 @@ Status MergeToStreamMergePass::ReplaceMergeNode(const ComputeGraphPtr &graph, co } } - return AddActiveNodes(graph, stream_merge, false); + return AddActiveNodes(graph, stream_merge); } /// /// @brief Add StreamActive Op before StreamMerge/Merge /// @param [in] graph /// @param [in] node -/// @param [in] multi_batch_flag /// @return Status /// -Status MergeToStreamMergePass::AddActiveNodes(const ComputeGraphPtr &graph, const NodePtr &node, - bool multi_batch_flag) { +Status MergeToStreamMergePass::AddActiveNodes(const ComputeGraphPtr &graph, const NodePtr &node) { GE_CHK_BOOL_EXEC(node != nullptr, return FAILED, "Param of pre node is null."); for (const InDataAnchorPtr &in_data_anchor : node->GetAllInDataAnchors()) { OutDataAnchorPtr peer_out_anchor = in_data_anchor->GetPeerOutAnchor(); diff --git a/ge/graph/passes/merge_to_stream_merge_pass.h b/ge/graph/passes/merge_to_stream_merge_pass.h index f056e07e..283120c0 100644 --- a/ge/graph/passes/merge_to_stream_merge_pass.h +++ b/ge/graph/passes/merge_to_stream_merge_pass.h @@ -37,10 +37,9 @@ class MergeToStreamMergePass : public GraphPass { /// @brief Add StreamActive Op as StreamMerge in_node /// @param [in] graph /// @param [in] node - /// @param [in] multi_batch_flag /// @return Status /// - Status AddActiveNodes(const ComputeGraphPtr &graph, const NodePtr &node, bool multi_batch_flag); + Status AddActiveNodes(const ComputeGraphPtr &graph, const NodePtr &node); /// /// @brief Create Active Op