From dca2b72d08ca56f4505d49a0744fec6274ca534e Mon Sep 17 00:00:00 2001 From: TangQunzhang Date: Tue, 26 Jan 2021 21:45:36 +0800 Subject: [PATCH] Fix concat memory bug --- ge/graph/build/memory/graph_mem_assigner.cc | 4 ++-- metadef | 2 +- parser | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ge/graph/build/memory/graph_mem_assigner.cc b/ge/graph/build/memory/graph_mem_assigner.cc index 8c5d8940..ca64c869 100755 --- a/ge/graph/build/memory/graph_mem_assigner.cc +++ b/ge/graph/build/memory/graph_mem_assigner.cc @@ -528,7 +528,7 @@ Status GraphMemoryAssigner::AssignContinuousInputMemory(const ge::NodePtr &node, GELOGI("[IMAS]Continuous input : Set %s name[%s] optype[%s] output[%d] offset to [%zu] stream_id[%ld] memtype[%ld] " "size[%zu] realsize[%ld] nopadding[%d].", node->GetOwnerComputeGraph()->GetName().c_str(), - node->GetType().c_str(), peer_op_desc->GetName().c_str(),peer_out_data_anchor->GetIdx(), + peer_op_desc->GetName().c_str(), node->GetType().c_str(), peer_out_data_anchor->GetIdx(), output_list.at(peer_out_data_anchor->GetIdx()), peer_op_desc->GetStreamId(), memory_type, is_continuous_input_allocated ? 0UL : align_size, real_size, is_nopadding); } @@ -618,7 +618,7 @@ Status GraphMemoryAssigner::AssignContinuousOutputMemory(const ge::NodePtr &node } GELOGI("[IMAS]Continuous output : Set %s name[%s] optype[%s] output[%d] offset to [%zu] stream_id[%ld] memtype[%ld]" " size[%zu] realsize[%ld] nopadding[%d].", node->GetOwnerComputeGraph()->GetName().c_str(), - node->GetType().c_str(), out_op_desc->GetName().c_str(), out_data_anchor->GetIdx(), + out_op_desc->GetName().c_str(), node->GetType().c_str(), out_data_anchor->GetIdx(), output_list[out_data_anchor->GetIdx()], out_op_desc->GetStreamId(), memory_type, 0UL, is_nopadding ? nopadding_size : tensor_desc_size, is_nopadding); } diff --git a/metadef b/metadef index 8ab60be2..c8e05214 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 8ab60be2870b80b1ec952bb21c7f05ae2a624984 +Subproject commit c8e05214e35ec13050aeeae1c4ab2b795a0e2987 diff --git a/parser b/parser index 98f17f4a..6989d1fc 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 98f17f4a2a37f283797858eabefa9dba1d06a66b +Subproject commit 6989d1fcc704b19e7b0c62660ca35d8839d201c0