Pre Merge pull request !713 from 刘江涛/ge_dev

metadef

@@ -1 +1 @@
-Subproject commit e6da96dd3928123d3f1d0389f0229055cf171890
+Subproject commit 623acbd9e245b795925db01f2965adac99b898be

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"†

tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc

@@ -137,7 +137,17 @@ ge::onnx::GraphProto CreateOnnxGraph() {
 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);

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"†

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();