From fc4aabf874ef61d3c713bbef406328f8bff4d660 Mon Sep 17 00:00:00 2001
From: jwx930962 <jiangcheng22@hisilicon.com>
Date: Mon, 22 Nov 2021 18:53:14 +0800
Subject: [PATCH] increase parser st

---
 metadef                                       |   2 +-
 .../origin_models/conv2d_depthwise_pb_gen.py  |  26 +++++++++++++++
 tests/st/testcase/origin_models/model.pb      | Bin 0 -> 660 bytes
 .../origin_models/test_conv2d_pb_gen.py       |  27 ++++++++++++++++
 .../origin_models/test_depth_wise_conv2d.pb   | Bin 0 -> 764 bytes
 tests/st/testcase/test_tensorflow_parser.cc   |  30 +++++++++++++++++-
 6 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 tests/st/testcase/origin_models/conv2d_depthwise_pb_gen.py
 create mode 100644 tests/st/testcase/origin_models/model.pb
 create mode 100644 tests/st/testcase/origin_models/test_conv2d_pb_gen.py
 create mode 100644 tests/st/testcase/origin_models/test_depth_wise_conv2d.pb

diff --git a/metadef b/metadef
index 326ecbb..8ad7cbd 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit 326ecbb2b4837699aa674cc30e9b9956e4fd364d
+Subproject commit 8ad7cbd3c18d322381583d75c32906f8374a348d
diff --git a/tests/st/testcase/origin_models/conv2d_depthwise_pb_gen.py b/tests/st/testcase/origin_models/conv2d_depthwise_pb_gen.py
new file mode 100644
index 0000000..7ac9c2d
--- /dev/null
+++ b/tests/st/testcase/origin_models/conv2d_depthwise_pb_gen.py
@@ -0,0 +1,26 @@
+import tensorflow as tf
+import os
+
+pb_file_path = os.getcwd()
+
+with tf.compat.v1.Session(graph=tf.Graph()) as sess:
+    # NHWC 
+    fmap_shape = [17, 101, 101, 17]
+    filter_size = [5, 5, 17, 1]
+    dy_shape = [17, 49, 49, 17]
+    strideh, stridew = [2, 2]
+    padding = 'VALID'
+    tensor_x1 = tf.compat.v1.placeholder(dtype="float16", shape=fmap_shape)
+    tensor_x2 = tf.compat.v1.placeholder(dtype="float16", shape=fmap_shape)
+    tensor_x = tf.add(tensor_x1, tensor_x2)
+    tensor_dy1 = tf.compat.v1.placeholder(dtype="float16", shape=dy_shape)
+    tensor_dy2 = tf.compat.v1.placeholder(dtype="float16", shape=dy_shape)
+    tensor_dy = tf.add(tensor_dy1, tensor_dy2)
+    
+    op = tf.nn.depthwise_conv2d_backprop_filter(tensor_x, filter_size, tensor_dy,
+                                  strides=[1, strideh, stridew, 1],
+                                  padding=padding,
+                                  data_format='NHWC',
+                                  dilations=[1,1,1,1])
+
+    tf.io.write_graph(sess.graph, logdir="./", name="test_depth_wise_conv2d.pb", as_text=False)
diff --git a/tests/st/testcase/origin_models/model.pb b/tests/st/testcase/origin_models/model.pb
new file mode 100644
index 0000000000000000000000000000000000000000..9bd83df10deb9429f51b46e38a50ed3af2f5e6d9
GIT binary patch
literal 660
zcmb7B!AiqG5X~k{n@-TmU_s-p#~{R;5PPtCu?MM$c<~T6*~Kob*^o_ZEB=&!=%xW{
z5Q|=Bc82%f%$tQ%AS?9mB+d9-Nyf|22bWdrf}?%rgnQuXIW<KmwvPxH^!o4UCpbx?
zX)Y>3rFi3IB${`!q;kR0y;ixd!b9jLnWS1HfQMbFviLG>Z-L-8l>SxEbI^(jfp;J&
z`j51{p*fR$R{SC~gaMUOy>gZ?z7!ePXoD3Fpr5I{q9W%d+Gw>0nj18>?br$td{dN0
zAg3=J9V97Sz{ptBTXQTjtF#)k0`X@rFytwCX*AJVJm+}OWCIj5t!)@Uu<LBCMd2KV
zX>`vi+k~wO?$^z2ZB*ODV{mR466+9<RY2BZ56DCP=P-sq6-lKMU8$1)S9lEmH#RyG
R#)8e19im^eM~?T=`2-3ow$A_n

literal 0
HcmV?d00001

diff --git a/tests/st/testcase/origin_models/test_conv2d_pb_gen.py b/tests/st/testcase/origin_models/test_conv2d_pb_gen.py
new file mode 100644
index 0000000..ca88b21
--- /dev/null
+++ b/tests/st/testcase/origin_models/test_conv2d_pb_gen.py
@@ -0,0 +1,27 @@
+import tensorflow as tf
+import os
+from tensorflow.python.framework import graph_util
+
+pb_file_path = os.getcwd()
+
+def generate_conv2d_pb():
+    with tf.compat.v1.Session(graph=tf.Graph()) as sess:
+        input_x = tf.compat.v1.placeholder(dtype="float32", shape=(1,56,56,64))
+        input_filter = tf.compat.v1.placeholder(dtype="float32", shape=(3,3,64,64))
+        op = tf.nn.conv2d(input_x, input_filter, strides=[1,1,1,1], padding=[[0,0],[1,1],[1,1],[0,0]],
+                          data_format="NHWC", dilations=[1,1,1,1], name='conv2d_res')
+        tf.io.write_graph(sess.graph, logdir="./", name="conv2d.pb", as_text=False)
+
+
+def generate_add_pb():
+    with tf.compat.v1.Session(graph=tf.Graph()) as sess:
+        x = tf.compat.v1.placeholder(tf.int32, name='x')
+        y = tf.compat.v1.placeholder(tf.int32, name='y')
+        b = tf.Variable(1, name='b')
+        xy = tf.multiply(x, y)
+        op = tf.add(xy, b, name='op_to_store')
+        tf.io.write_graph(sess.graph, logdir="./", name="model.pb", as_text=False)
+
+if __name__=='__main__':
+    generate_conv2d_pb()
+    generate_add_pb()
\ No newline at end of file
diff --git a/tests/st/testcase/origin_models/test_depth_wise_conv2d.pb b/tests/st/testcase/origin_models/test_depth_wise_conv2d.pb
new file mode 100644
index 0000000000000000000000000000000000000000..1b050bba5fc68a95ababe24c866c8dcb3709bd41
GIT binary patch
literal 764
zcmbVJ%SyvQ6wTAbTZHBo5u&S#o7wcWbJqt&L5d5}Wf(eBJD4^h8S7)`C;5loq@t;A
z+76r<?#$)fbI!mBYPT_;%6SqCnPIhHHE@M~OC?(E20H~epK~hkvW}J?5a^*q0Ao0+
zutc4Gd0Jrig}`D9t5U*Edgg(7SE%|sxVzin4jCx$&p>Zqo*uZQodPH=Y^d&Tn&|zS
zSU`IuQ$2rCxf~|TRaZ>7Rx3H+)2B2`(y@xQ%v!VZh;sEVb9AXO*VQkw*#)>O9zRPw
z8-%`%4moq0b=NSA0s+A!z=s9rTg=04n!?iO&ho=`N<R^>W2gzPc{EG11=o0h&gAN0
zNY{r##S{jaMIR1A$E3whAds(VtfopwDHlR5A9J+8U<lrKjUKx9{hR9%Yk-&QObH5Y
M&0tw()Am1|FBMP7GXMYp

literal 0
HcmV?d00001

diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc
index 454ac91..4d0aa9c 100644
--- a/tests/st/testcase/test_tensorflow_parser.cc
+++ b/tests/st/testcase/test_tensorflow_parser.cc
@@ -22,7 +22,7 @@
 #include "parser/common/register_tbe.h"
 #include "external/parser/tensorflow_parser.h"
 #include "st/parser_st_utils.h"
-#include "tests/depends/ops_stub/ops_stub.h"
+#include "parser/common/acl_graph_parser_util.h"
 
 namespace ge {
 class STestTensorflowParser : public testing::Test {
@@ -76,3 +76,31 @@ TEST_F(STestTensorflowParser, tensorflow_parser_success) {
   EXPECT_EQ(net_out_name.at(0), "add_test_1:0");
 }
 } // namespace ge
+
+TEST_F(STestTensorflowParser, tensorflow_model_Failed) {
+  ge::Graph graph;
+  std::string caseDir = __FILE__;
+  std::size_t idx = caseDir.find_last_of("/");
+  caseDir = caseDir.substr(0, idx);
+
+  std::string modelFile = caseDir + "/origin_models/model.pb";
+  auto status = ge::aclgrphParseTensorFlow(modelFile.c_str(), graph);
+  EXPECT_EQ(status, ge::GRAPH_FAILED);
+
+  modelFile = caseDir + "/origin_models/test_depth_wise_conv2d.pb";
+  status = ge::aclgrphParseTensorFlow(modelFile.c_str(), graph);
+  EXPECT_EQ(status, ge::GRAPH_FAILED);
+}
+
+TEST_F(STestTensorflowParser, tensorflow_model_not_exist) {
+  ge::Graph graph;
+  std::string caseDir = __FILE__;
+  std::size_t idx = caseDir.find_last_of("/");
+  caseDir = caseDir.substr(0, idx);
+
+  // model file is not exist
+  std::string modelFile = caseDir + "/origin_models/conv2d_explicit1_pad.pb";
+  auto status = ge::aclgrphParseTensorFlow(modelFile.c_str(), graph);
+  EXPECT_EQ(status, ge::GRAPH_FAILED);
+}
+} // namespace ge