ignore attr

Author: RandyShuai

tf2onnx/onnx_opset/controlflow.py

@@ -377,8 +377,10 @@ class IteratorGetNext:
     @classmethod
     def version_8(cls, ctx, node, **kwargs):
         output_names = node.output
+        type_0 = ctx.get_dtype(output_names[0])
+        type_1 = ctx.get_dtype(output_names[1])
+        shape_0 = ctx.get_shape(output_names[0])
+        shape_1 = ctx.get_shape(output_names[1])
         ctx.remove_node(node.name)
-        output_types = list(node.get_attr('output_types').ints)
-        output_shapes = list(node.get_attr('output_shapes').ints)
-        ctx.add_graph_input(output_names[0], output_types[0], output_shapes[:output_shapes.index(0)])
-        ctx.add_graph_input(output_names[1], output_types[1], output_shapes[output_shapes.index(0)+1:-1])
+        ctx.add_graph_input(output_names[0], type_0, shape_0)
+        ctx.add_graph_input(output_names[1], type_1, shape_1)

tf2onnx/tfonnx.py

@@ -46,7 +46,9 @@ def tflist_to_onnx(node_list, shape_override):
     ignored_attr = ["unknown_rank", "_class", "Tshape", "use_cudnn_on_gpu", "Index", "Tpaddings",
                     "TI", "Tparams", "Tindices", "Tlen", "Tdim", "dynamic_size", "Tmultiples",
                     "Tblock_shape", "Tcrops", "index_type", "Taxis", "U", "maxval",
-                    "Tout", "Tlabels", "Tindex", "element_shape", "Targmax", "T_threshold"]
+                    "Tout", "Tlabels", "Tindex", "element_shape", "Targmax", "T_threshold",
+                    "output_types", "output_shapes", "key_dtype", "value_dtype", "Tin", "Tout"]
+
     # some stats
     op_cnt = collections.Counter()
     attr_cnt = collections.Counter()
@@ -80,8 +82,7 @@ def tflist_to_onnx(node_list, shape_override):
                 if dtype:
                     if not isinstance(dtype, list):
                         dtypes[node.name] = utils.map_tf_dtype(dtype)
-            elif a in ["output_type", "output_dtype", "out_type", "Tidx",
-                       "out_idx", "key_dtype", "value_dtype", "Tin", "Tout"]:
+            elif a in ["output_type", "output_dtype", "out_type", "Tidx", "out_idx"]:
                 # Tidx is used by Range
                 # out_idx is used by ListDiff
                 attr[a] = utils.map_tf_dtype(utils.get_tf_node_attr(node, a))
@@ -100,10 +101,6 @@ def tflist_to_onnx(node_list, shape_override):
                 continue
             elif a in ignored_attr:
                 continue
-            elif a == "output_types":
-                attr[a] = [utils.map_tf_dtype(v) for v in utils.get_tf_node_attr(node, a)]
-            elif a == "output_shapes":
-                attr[a] = utils.get_tf_output_shapes_attr(node)
             else:
                 attr[a] = utils.get_tf_node_attr(node, a)
 

tf2onnx/utils.py

@@ -177,17 +177,6 @@ def get_tf_shape_attr(node):
         pass
     return dims
 
-def get_tf_output_shapes_attr(node):
-    """Get output shapes from tensorflow attr "output_shapes"."""
-    dims = []
-    try:
-        shapes = get_tf_node_attr(node, "output_shapes")
-        for shape in shapes:
-            dims.extend([d.size for d in shape.dim])
-            dims.append(0)
-    except:  # pylint: disable=bare-except
-        pass
-    return dims
 
 def get_tf_tensor_shape(tensor):
     shape = []