From 9b50ed519a100bdab23553177729e83e258fa773 Mon Sep 17 00:00:00 2001
From: liujiangtao <liujiangtao3@huawei.com>
Date: Thu, 20 Oct 2022 15:48:46 +0800
Subject: [PATCH] tensorflow parser test

---
 metadef                                       |   2 +-
 .../onnx_model/{if.onnx => if.pb}             | Bin
 .../onnx_parser_testcase/onnx_model/tf_add.pb |  13 ++++++++
 .../onnx_parser_unittest.cc                   |  12 ++++++-
 ...nnx_const_type.onnx => onnx_const_type.pb} | Bin
 .../tensorflow_model/tf_add.onnx              |  13 ++++++++
 .../tensorflow_parser_unittest.cc             |  31 +++++++++++++++++-
 7 files changed, 68 insertions(+), 3 deletions(-)
 rename tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/{if.onnx => if.pb} (100%)
 create mode 100644 tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/tf_add.pb
 rename tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/{onnx_const_type.onnx => onnx_const_type.pb} (100%)
 create mode 100644 tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/tf_add.onnx

diff --git a/metadef b/metadef
index e6da96d..623acbd 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit e6da96dd3928123d3f1d0389f0229055cf171890
+Subproject commit 623acbd9e245b795925db01f2965adac99b898be
diff --git a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.onnx b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.pb
similarity index 100%
rename from tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.onnx
rename to tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/if.pb
diff --git a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/tf_add.pb b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/tf_add.pb
new file mode 100644
index 0000000..b9a42a3
--- /dev/null
+++ b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_model/tf_add.pb
@@ -0,0 +1,13 @@
+
+8
+PlaceholderPlaceholder*
+dtype0*
+shape:

+:
+
Placeholder_1Placeholder*
+dtype0*
+shape:

+6
+
+add_test_1AddPlaceholder
Placeholder_1*
+
T0"†

\ No newline at end of file
diff --git a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc
index b0338ce..8bd670d 100644
--- a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc
+++ b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc
@@ -114,7 +114,17 @@ void UtestOnnxParser::RegisterCustomOp() {
 TEST_F(UtestOnnxParser, onnx_parser_if_node) {
   std::string case_dir = __FILE__;
   case_dir = case_dir.substr(0, case_dir.find_last_of("/"));
-  std::string model_file = case_dir + "/onnx_model/if.onnx";
+  std::string model_file = case_dir + "/onnx_model/tf_add.pb";
+  std::map<ge::AscendString, ge::AscendString> parser_params;
+  ge::Graph graph;
+  auto ret = ge::aclgrphParseONNX(model_file.c_str(), parser_params, graph);
+  EXPECT_EQ(ret, GRAPH_SUCCESS);
+}
+
+TEST_F(UtestOnnxParser, onnx_parser_if_node2) {
+  std::string case_dir = __FILE__;
+  case_dir = case_dir.substr(0, case_dir.find_last_of("/"));
+  std::string model_file = case_dir + "/onnx_model/if.pb";
   std::map<ge::AscendString, ge::AscendString> parser_params;
   ge::Graph graph;
   auto ret = ge::aclgrphParseONNX(model_file.c_str(), parser_params, graph);
diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/onnx_const_type.onnx b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/onnx_const_type.pb
similarity index 100%
rename from tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/onnx_const_type.onnx
rename to tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/onnx_const_type.pb
diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/tf_add.onnx b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/tf_add.onnx
new file mode 100644
index 0000000..b9a42a3
--- /dev/null
+++ b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_model/tf_add.onnx
@@ -0,0 +1,13 @@
+
+8
+PlaceholderPlaceholder*
+dtype0*
+shape:

+:
+
Placeholder_1Placeholder*
+dtype0*
+shape:

+6
+
+add_test_1AddPlaceholder
Placeholder_1*
+
T0"†

\ No newline at end of file
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 996c5b0..f2d331c 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
@@ -1030,7 +1030,7 @@ TEST_F(UtestTensorflowParser, tensorflow_parser_success) {
   std::string case_dir = __FILE__;
   ParserOperator unused("Add");
   case_dir = case_dir.substr(0, case_dir.find_last_of("/"));
-  std::string model_file = case_dir + "/tensorflow_model/tf_add.pb";
+  std::string model_file = case_dir + "/tensorflow_model/onnx_if.onnx";
   std::map<ge::AscendString, ge::AscendString> parser_params = {
       {ge::AscendString(ge::ir_option::INPUT_DATA_NAMES), ge::AscendString("Placeholder,Placeholder_1")},
   };
@@ -1047,6 +1047,35 @@ TEST_F(UtestTensorflowParser, tensorflow_parser_success) {
   EXPECT_EQ(net_out_name.at(0), "add_test_1:0");
 }
 
+TEST_F(UtestTensorflowParser, tensorflow_parser_success2) {
+  RegisterCustomOp();
+
+  std::string case_dir = __FILE__;
+  ParserOperator unused("Add");
+  case_dir = case_dir.substr(0, case_dir.find_last_of("/"));
+  std::string model_file = case_dir + "/tensorflow_model/onnx_const_type.pb";
+  std::map<ge::AscendString, ge::AscendString> parser_params = {
+      {ge::AscendString(ge::ir_option::INPUT_DATA_NAMES), ge::AscendString("Placeholder,Placeholder_1")},
+  };
+  ge::Graph graph;
+  auto ret = ge::aclgrphParseTensorFlow(model_file.c_str(), parser_params, graph);
+  ASSERT_EQ(ret, SUCCESS);
+}
+
+TEST_F(UtestTensorflowParser, tensorflow_parser_success3_modify_suffix) {
+  RegisterCustomOp();
+
+  std::string case_dir = __FILE__;
+  ParserOperator unused("Add");
+  case_dir = case_dir.substr(0, case_dir.find_last_of("/"));
+  std::string model_file = case_dir + "/tensorflow_model/tf_add.onnx";
+  std::map<ge::AscendString, ge::AscendString> parser_params = {
+      {ge::AscendString(ge::ir_option::INPUT_DATA_NAMES), ge::AscendString("Placeholder,Placeholder_1")},
+  };
+  ge::Graph graph;
+  auto ret = ge::aclgrphParseTensorFlow(model_file.c_str(), parser_params, graph);
+  ASSERT_EQ(ret, SUCCESS);
+}
 TEST_F(UtestTensorflowParser, tensorflow_parser_input_data_names_failed) {
   RegisterCustomOp();