Merge pull request #854 from RandySheriffH/rashuai/FixPadConv

prevent multi-transpose on pad

Author: guschmue

tf2onnx/graph.py

@@ -135,7 +135,8 @@ def domain(self, val):
     @property
     def data_format(self):
         """Return data_format."""
-        return self.get_attr_str("data_format")
+        attr_str = self.get_attr_value("data_format")
+        return "unkown" if attr_str is None else attr_str.decode("utf-8")
 
     @data_format.setter
     def data_format(self, val):

tf2onnx/optimizer/transpose_optimizer.py

@@ -557,11 +557,13 @@ def _pad_handler(self, trans, node):
             node.set_attr("pads", new_pads)
             return self._switch_transpose_and_node(node, trans)
         if node.inputs[1].is_const():
-            pads = node.inputs[1].get_tensor_value()
-            # NHWC->NCHW
-            new_pads = np.array([pads[0], pads[3], pads[1], pads[2], pads[4], pads[7], pads[5], pads[6]],
-                                dtype=np.int64)
-            node.inputs[1].set_tensor_value(new_pads)
+            if node.inputs[1].data_format in ["NHWC", "unkown"]:
+                pads = node.inputs[1].get_tensor_value()
+                # NHWC->NCHW
+                new_pads = np.array([pads[0], pads[3], pads[1], pads[2], pads[4], pads[7], pads[5], pads[6]],
+                                    dtype=np.int64)
+                node.inputs[1].set_tensor_value(new_pads)
+                node.inputs[1].data_format = "NCHW"
             return self._switch_transpose_and_node(node, trans)
         return False