remove topological sort in run_rewriters

Author: wayuanho

.coverage.aiinfra-win.141010.856263

@@ -0,0 +1 @@
+!coverage.py: This is a private format, don't read it directly!{"lines":{"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/graph.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/tfonnx.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/__init__.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/graph_matcher.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/shape_inference.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/utils.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/version.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/convert.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/__init__.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/range.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/sparse_softmax_cross_entropy_with_logits.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/matrixbandpart.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/select.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/function/gathernd.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/optimizer/__init__.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/optimizer/transpose_optimizer.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/leakyrelu_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/rnn_utils.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/random_uniform.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/custom_rnn_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/__init__.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/loop_rewriter_base.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/bigru_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/unit_rewriter_base.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/loop_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/gru_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/grublock_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/cond_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/lstm_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/bilstm_rewriter.py":[],"/home/wayuanho/workspace/onnx/tensorflow-onnx/tf2onnx/rewriter/rnn.py":[]}}

tf2onnx/tfonnx.py

@@ -2475,12 +2475,21 @@ def topological_sort(g, continue_on_error):
             pass
 
 
-def run_rewriters(g, funcs, continue_on_error=False, need_sort=True):
-    if need_sort:
-        topological_sort(g, continue_on_error)
+def run_rewriters(g, funcs, continue_on_error):
+    """Rewrite the original graph and body graphs of nodes"""
+    # NOTE: not topologically sort graph here
     for func in funcs:
-        ops = func(g, g.get_nodes())
-        g.set_nodes(ops)
+        try:
+            ops = func(g, g.get_nodes())
+            g.set_nodes(ops)
+        except Exception as ex:
+            type_, value_, traceback_ = sys.exc_info()
+            log.error("rewriter %s: exception %s", func, ex)
+            ex_ext = traceback.format_exception(type_, value_, traceback_)
+            if continue_on_error:
+                log.info(ex_ext)
+            else:
+                raise ex
 
     if g.contained_graphs:
         for dict_val in g.contained_graphs.values():
@@ -2554,7 +2563,7 @@ def process_tf_graph(tf_graph, continue_on_error=False, verbose=False, target=No
     if custom_rewriter is not None:
         rewriters.extend(custom_rewriter)
 
-    run_rewriters(g, rewriters, need_sort=False)
+    run_rewriters(g, rewriters, continue_on_error)
 
     # some nodes may already copied into inner Graph, so remove them from main Graph.
     g.delete_unused_nodes(output_names)
@@ -2571,7 +2580,7 @@ def process_tf_graph(tf_graph, continue_on_error=False, verbose=False, target=No
     if TARGET_RS6 in target:
         late_rewriters.append(rewrite_incomplete_type_support_rs6)
     if late_rewriters:
-        run_rewriters(g, late_rewriters, continue_on_error, True)
+        run_rewriters(g, late_rewriters, continue_on_error)
 
     # onnx requires topological sorting
     topological_sort(g, continue_on_error)