resolve requests

Author: lucienwang1009

tests/test_loops.py

@@ -8,13 +8,11 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import unittest
-
 import numpy as np
 import tensorflow as tf
 
 from backend_test_base import Tf2OnnxBackendTestBase
-from common import unittest_main, check_tf_min_version
+from common import unittest_main, check_tf_min_version, check_onnxruntime_min_version
 
 
 # pylint: disable=missing-docstring,invalid-name,unused-argument,using-constant-test
@@ -162,7 +160,8 @@ def b(i, out_ta):
         output_names_with_port = ["i:0", "output_ta:0"]
         self.run_test_case(feed_dict, input_names_with_port, output_names_with_port, rtol=1e-06)
 
-    @unittest.skip(
+    @check_onnxruntime_min_version(
+        "0.5.0",
         "disable this case due to onnxruntime loop issue: https://github.com/microsoft/onnxruntime/issues/1272"
     )
     def test_while_loop_with_cond_init_false(self):

tf2onnx/constants.py

@@ -37,6 +37,3 @@
 
 # Environment variables
 ENV_TF2ONNX_DEBUG_MODE = "TF2ONNX_DEBUG_MODE"
-
-# Logging level
-VERBOSE = 15

tf2onnx/graph.py

@@ -603,7 +603,7 @@ def update_node_shape_dtype(self, node, override=False):
         initializers = []
         for i, inp in enumerate(node.inputs):
             if inp is None:
-                if logger.isEnabledFor(constants.VERBOSE):
+                if logger.isEnabledFor(logging.INFO):
                     logger.warning(
                         "[%s] infer a inexistent node: [%s], please check the code",
                         node.name, node.input[i]
@@ -1181,10 +1181,10 @@ def delete_unused_nodes(self, outputs_name):
                     body_graph.delete_unused_nodes(body_graph.outputs)
         self.reset_nodes(related_nodes)
 
-    def delete_nodes_without_dependency(self, to_delete):
-        """Delete nodes in `to_delete` without third-party dependency."""
+    def safe_remove_nodes(self, to_delete):
+        """Delete nodes in `to_delete` without third-party node consuming it."""
         delete_set = set(to_delete)
-        for n in to_delete:
+        for n in delete_set:
             out_consumers = set()
             for out in n.output:
                 out_consumers |= set(self.find_output_consumers(out))

tf2onnx/rewriter/leakyrelu_rewriter.py

@@ -43,7 +43,7 @@ def rewrite_leakyrelu(g, ops):
             ops.append(leakyrelu)
             g.replace_all_inputs(ops, max_node.output[0], leakyrelu.output[0])
             to_delete = [max_node, mul_node]
-            g.delete_nodes_without_dependency(to_delete)
+            g.safe_remove_nodes(to_delete)
 
     return ops
 

tf2onnx/rewriter/random_uniform.py

@@ -63,7 +63,7 @@ def rewrite_random_uniform_fold_const(g, ops):
         to_delete = list(set(match.get_nodes()))
         new_node = create_onnx_random_uniform_op(g, tmax, tmin, ru_op, output, to_delete)
         g.replace_all_inputs(ops, output.output[0], new_node.output[0])
-        g.delete_nodes_without_dependency(to_delete)
+        g.safe_remove_nodes(to_delete)
 
     return ops
 

tf2onnx/rewriter/thresholded_relu_rewriter.py

@@ -45,5 +45,5 @@ def rewrite_thresholded_relu(g, ops):
                                            dtypes=[g.get_dtype(mul_node.output[0])])
             g.replace_all_inputs(ops, mul_node.output[0], thresholded_relu.output[0])
             to_delete = [cast_node, mul_node]
-            g.delete_nodes_without_dependency(to_delete)
+            g.safe_remove_nodes(to_delete)
     return ops

tf2onnx/tfonnx.py

@@ -141,8 +141,8 @@ def rewrite_transpose(g, ops):
         dims = [i for i in range(len(shape) - 1, -1, -1)]
         output.set_attr("perm", dims)
         g.remove_input(output, output.input[1])
-        to_delete = [n for n in set(match.get_nodes()) if n != output]
-        g.delete_nodes_without_dependency(to_delete)
+        to_delete = [n for n in match.get_nodes() if n != output]
+        g.safe_remove_nodes(to_delete)
     return ops
 
 
@@ -174,7 +174,7 @@ def rewrite_random_normal(g, ops):
                                    attr={"shape": shape, "mean": mean, "scale": 1.0, "dtype": dtype})
 
         g.replace_all_inputs(ops, output.output[0], new_node.output[0])
-        g.delete_nodes_without_dependency(set(match.get_nodes()))
+        g.safe_remove_nodes(match.get_nodes())
     return ops
 
 
@@ -206,7 +206,7 @@ def rewrite_dropout(g, ops):
             dtypes=[g.get_dtype(inputs2.input[0])]
         )
         g.replace_all_inputs(ops, outputs.output[0], new_node.output[0])
-        g.delete_nodes_without_dependency(set(match.get_nodes()))
+        g.safe_remove_nodes(match.get_nodes())
 
     # remove dropout if its ratio is 1.0
     for node in g.get_nodes():
@@ -291,8 +291,8 @@ def rewrite_flatten(g, ops):
 
             g.set_shape(out_name, input_shape[:-2] + [new_dim])
             g.replace_all_inputs(ops, reshape_node.output[0], out_name)
-            to_delete = [n for n in set(match.get_nodes()) if n != input_node]
-            g.delete_nodes_without_dependency(to_delete)
+            to_delete = [n for n in match.get_nodes() if n != input_node]
+            g.safe_remove_nodes(to_delete)
 
     return ops
 
@@ -649,7 +649,7 @@ def run_rewriters(g, funcs, continue_on_error):
             else:
                 raise ex
 
-        if logger.isEnabledFor(constants.VERBOSE):
+        if utils.is_debug_mode():
             broken_outputs = g.check_integrity()
             if broken_outputs:
                 logging.error(

tf2onnx/verbose_logging.py

@@ -15,12 +15,14 @@
 
 from . import constants
 
-_logging.addLevelName(constants.VERBOSE, "VERBOSE")
+VERBOSE = 15
+
+_logging.addLevelName(VERBOSE, "VERBOSE")
 
 
 def _verbose(self, message, *args, **kwargs):
-    if self.isEnabledFor(constants.VERBOSE):
-        self._log(constants.VERBOSE, message, args, **kwargs)  # pylint: disable=protected-access
+    if self.isEnabledFor(VERBOSE):
+        self._log(VERBOSE, message, args, **kwargs)  # pylint: disable=protected-access
 
 
 def getLogger(name=None):  # pylint: disable=invalid-name, function-redefined
@@ -45,7 +47,7 @@ def basicConfig(**kwargs):  # pylint: disable=invalid-name, function-redefined
     set_tf_verbosity(_logging.getLogger().getEffectiveLevel())
 
 
-_LOG_LEVELS = [FATAL, ERROR, WARNING, INFO, constants.VERBOSE, DEBUG]
+_LOG_LEVELS = [FATAL, ERROR, WARNING, INFO, VERBOSE, DEBUG]
 
 
 def get_verbosity_level(verbosity, base_level=INFO):