From dc935c86c5212a4de4445f9984612948f4ca76c7 Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Wed, 24 Mar 2021 14:09:57 +0800 Subject: [PATCH 1/3] fix error --- ge/graph/build/memory/var_mem_assign_util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ge/graph/build/memory/var_mem_assign_util.cc b/ge/graph/build/memory/var_mem_assign_util.cc index d7b442ae..052b130c 100755 --- a/ge/graph/build/memory/var_mem_assign_util.cc +++ b/ge/graph/build/memory/var_mem_assign_util.cc @@ -130,7 +130,7 @@ Status VarMemAssignUtil::SetOutVariableAttr(const ge::NodePtr &node, const ge::N VarManager::Instance(session_id)->GetVarAddr(var_node->GetName(), var_tensor_desc, &dev_ptr, memory_type)); int out_list_size = static_cast(output_list.size()); - if (index < out_list_size) { + if (index > out_list_size) { REPORT_INNER_ERROR("E19999", "param index:%d >= output_list.size() %d in node %s, " "check invalid when SetOutVariableAttr", index, out_list_size, node->GetName().c_str()); GELOGE(FAILED, "index %d >= output_list.size() %d", index, out_list_size); @@ -177,7 +177,7 @@ Status VarMemAssignUtil::DealBroadCastNode(uint32_t graph_id, const ge::NodePtr auto broad_cast_index = static_cast(broad_cast_info.idx); auto input_tensor_desc_ptr_vistor = op_desc->GetAllInputsDescPtr(); - if (input_tensor_desc_ptr_vistor.size() > broad_cast_index) { + if (input_tensor_desc_ptr_vistor.size() < broad_cast_index) { REPORT_INNER_ERROR("E19999", "Get broadcast op %s input tensor desc size [%zu] < idx [%d]", node->GetName().c_str(), input_tensor_desc_ptr_vistor.size(), broad_cast_info.idx); GELOGE(FAILED, "Get broadcast op %s input tensor desc size [%zu] < idx [%d]", node->GetName().c_str(), From fd97c34af6fa664cd17050bd404555f9c5b80aee Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Wed, 24 Mar 2021 14:13:48 +0800 Subject: [PATCH 2/3] for ut cov --- ge/graph/build/memory/graph_mem_assigner.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ge/graph/build/memory/graph_mem_assigner.cc b/ge/graph/build/memory/graph_mem_assigner.cc index ea48afd8..b216348d 100755 --- a/ge/graph/build/memory/graph_mem_assigner.cc +++ b/ge/graph/build/memory/graph_mem_assigner.cc @@ -337,7 +337,7 @@ uint32_t GetContinuousMemoryType(const OpDescPtr &op_desc) { } if (continuous_type != 0) { - GELOGI("[Get][MemType:Continuous]Current node %s, value is %d", op_desc->GetName().c_str(), continuous_type); + GELOGI("[Get][MemType:Continuous]Current node %s, value is %d.", op_desc->GetName().c_str(), continuous_type); } return continuous_type; } @@ -482,7 +482,7 @@ Status GraphMemoryAssigner::ReAssignContinuousMemory(bool is_loop_graph) { "[Assign][Memory:Continuous:Input]fail for node:%s.", node->GetName().c_str()) } for (auto pair : memory_offset_) { - GELOGD("[Reassign][Memory:Continuous]At last, memory type = %ld, mem offset = %zu.", pair.first, + GELOGD("[Reassign][Memory:Continuous]At last, memory type = %ld, mem offset = %zu", pair.first, pair.second.mem_offset_); } return ge::SUCCESS; From 06505151f41233305b997204f27c1d92f4040dde Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Wed, 24 Mar 2021 14:17:36 +0800 Subject: [PATCH 3/3] fix --- ge/graph/build/memory/var_mem_assign_util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ge/graph/build/memory/var_mem_assign_util.cc b/ge/graph/build/memory/var_mem_assign_util.cc index 052b130c..f8b290cf 100755 --- a/ge/graph/build/memory/var_mem_assign_util.cc +++ b/ge/graph/build/memory/var_mem_assign_util.cc @@ -130,7 +130,7 @@ Status VarMemAssignUtil::SetOutVariableAttr(const ge::NodePtr &node, const ge::N VarManager::Instance(session_id)->GetVarAddr(var_node->GetName(), var_tensor_desc, &dev_ptr, memory_type)); int out_list_size = static_cast(output_list.size()); - if (index > out_list_size) { + if (index >= out_list_size) { REPORT_INNER_ERROR("E19999", "param index:%d >= output_list.size() %d in node %s, " "check invalid when SetOutVariableAttr", index, out_list_size, node->GetName().c_str()); GELOGE(FAILED, "index %d >= output_list.size() %d", index, out_list_size); @@ -177,7 +177,7 @@ Status VarMemAssignUtil::DealBroadCastNode(uint32_t graph_id, const ge::NodePtr auto broad_cast_index = static_cast(broad_cast_info.idx); auto input_tensor_desc_ptr_vistor = op_desc->GetAllInputsDescPtr(); - if (input_tensor_desc_ptr_vistor.size() < broad_cast_index) { + if (input_tensor_desc_ptr_vistor.size() <= broad_cast_index) { REPORT_INNER_ERROR("E19999", "Get broadcast op %s input tensor desc size [%zu] < idx [%d]", node->GetName().c_str(), input_tensor_desc_ptr_vistor.size(), broad_cast_info.idx); GELOGE(FAILED, "Get broadcast op %s input tensor desc size [%zu] < idx [%d]", node->GetName().c_str(),