Merge pull request #850 from jignparm/jignparm/fix_conv2d_with_pad

Fix conv2d with pad rewriter

Author: guschmue

tests/test_backend.py

@@ -403,7 +403,7 @@ def func(x):
                 return tf.identity(conv, name=_TFOUTPUT)
             self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, rtol=1e-5)
 
-    def test_conv2d_with_pad(self):
+    def test_conv2d_with_pad_valid(self):
         x_val = make_xval((1, 1, 5, 5)).transpose(NCHW_TO_NHWC)
         w = np.random.random_sample([3, 3, 1, 2]).astype(np.float32)
         strides = [1, 1, 1, 1]
@@ -414,6 +414,17 @@ def func(x):
             return tf.identity(conv, name=_TFOUTPUT)
         self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, rtol=1e-5)
 
+    def test_conv2d_with_pad_same(self):
+        x_val = make_xval((1, 1, 5, 5)).transpose(NCHW_TO_NHWC)
+        w = np.random.random_sample([3, 3, 1, 2]).astype(np.float32)
+        strides = [1, 1, 1, 1]
+        def func(x):
+            kernel = tf.constant(w, dtype=tf.float32, name='k')
+            x_pad = tf.pad(x, paddings=[[0, 0], [2, 2], [2, 2], [0, 0]])
+            conv = tf.nn.conv2d(x_pad, kernel, strides=strides, padding="SAME")
+            return tf.identity(conv, name=_TFOUTPUT)
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, rtol=1e-5)
+
     def test_conv2d_transpose(self):
         x_shape = [2, 6, 4, 3]
         output_shape = [2, 13, 9, 2]

tf2onnx/rewriter/conv2d_with_pad_rewriter.py

@@ -37,7 +37,7 @@ def rewrite_conv2d_with_pad(g, ops):
         if mode not in [None, "constant"] or len(pad.input) >= 3:
             continue
         # Conv2D already has a pad
-        if conv.get_attr("padding") == "SAME":
+        if conv.get_attr("padding").s.decode("utf-8") == "SAME":
             continue
 
         logger.debug("merge pad [%s] into conv [%s]", pad.name, conv.name)