From 3c87768cc6e6513e7ba2fedebd70f4c3190b4968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E9=B9=8F?= <xuepeng4@huawei.com>
Date: Mon, 4 Jul 2022 08:54:33 +0000
Subject: [PATCH] =?UTF-8?q?!590=20=E5=8E=BB=E9=99=A4=E6=A0=B9=E5=9B=BE?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8A=E7=9A=84dump=20origin=20name?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=20Merge=20pull=20request=20!590=20from=20?=
 =?UTF-8?q?=E8=96=9B=E9=B9=8F/r1.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parser/tensorflow/tensorflow_parser.cc           | 16 +++-------------
 tests/st/testcase/test_tensorflow_parser.cc      |  2 +-
 .../tensorflow_parser_unittest.cc                |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

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<std::string> 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 fbdeca0..da46d13 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
@@ -4712,7 +4712,7 @@ TEST_F(UtestTensorflowParser, AddDumpOriginName_test)
   std::vector<std::string> 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