diff --git a/parser/tensorflow/tensorflow_parser.cc b/parser/tensorflow/tensorflow_parser.cc index 189e176..01c1e7a 100644 --- a/parser/tensorflow/tensorflow_parser.cc +++ b/parser/tensorflow/tensorflow_parser.cc @@ -195,25 +195,16 @@ void AddDumpOriginName(const std::string& subgraph_name, const ge::NodePtr paren auto parend_desc = parent_node->GetOpDesc(); (void)ge::AttrUtils::GetListStr(parend_desc, ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, original_names); if (original_names.empty()) { - original_names.emplace_back(string(subgraph_name).append("/").append(node->GetName())); - } else { - // for fusion node also used original_names[0] - (void)original_names[0].append("/").append(subgraph_name).append("/").append(node->GetName()); + original_names.emplace_back(parent_node->GetName()); } + // for fusion node also used original_names[0] + (void)original_names[0].append("/").append(subgraph_name).append("/").append(node->GetName()); if (!ge::AttrUtils::SetListStr(node->GetOpDesc(), ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, original_names)) { GELOGW("Set %s to %s fail.", ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES.c_str(), node->GetOpDesc()->GetName().c_str()); } GELOGD("Add dump origin name %s for node %s.", original_names[0].c_str(), node->GetName().c_str()); } -void AddDumpOriginNameForRootGraph(const ge::ComputeGraphPtr& graph) { - for (auto &node : graph->GetDirectNode()) { - if (ge::AttrUtils::SetListStr(node->GetOpDesc(), ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, {node->GetName()})) { - GELOGD("Add dump origin name %s for node %s.", node->GetName().c_str(), - node->GetName().c_str()); - } - } -} } // namespace ge namespace ge { @@ -281,7 +272,6 @@ Status GenSubgraphParseTasks(const ge::ComputeGraphPtr &parent_graph, std::deque Status PostOpProcessForSubgraph(const ParseArg &arg) { if (arg.parent_node == nullptr) { - AddDumpOriginNameForRootGraph(arg.graph); return SUCCESS; } std::string op_type = arg.parent_node->GetType(); diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc index 94a84dd..0da5ebe 100644 --- a/tests/st/testcase/test_tensorflow_parser.cc +++ b/tests/st/testcase/test_tensorflow_parser.cc @@ -4245,7 +4245,7 @@ TEST_F(STestTensorflowParser, AddDumpOriginName_test) std::vector original_names; (void)ge::AttrUtils::GetListStr(desc, ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, original_names); EXPECT_EQ(original_names.empty(), false); - EXPECT_EQ(original_names[0], "while/COND0/cond/Data1"); + EXPECT_EQ(original_names[0], "WHILE0/while/COND0/cond/Data1"); } } // namespace ge diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc index 5f983c5..b62338f 100644 --- a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc +++ b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc @@ -4807,7 +4807,7 @@ TEST_F(UtestTensorflowParser, AddDumpOriginName_test) std::vector original_names; (void)ge::AttrUtils::GetListStr(desc, ge::ATTR_NAME_DATA_DUMP_ORIGIN_OP_NAMES, original_names); EXPECT_EQ(original_names.empty(), false); - EXPECT_EQ(original_names[0], "while/COND0/cond/Data1"); + EXPECT_EQ(original_names[0], "WHILE0/while/COND0/cond/Data1"); } } // namespace ge