Merge pull request #1234 from onnx/tom/StrictOptimizers

Made unittests require optimizers to not fail

Author: TomWildenhain-Microsoft

tests/backend_test_base.py

@@ -190,7 +190,7 @@ def run_test_case(self, func, feed_dict, input_names_with_port, output_names_wit
                                  const_node_values=const_node_values,
                                  initialized_tables=initialized_tables,
                                  **process_args)
-            g = optimizer.optimize_graph(g)
+            g = optimizer.optimize_graph(g, catch_errors=False)
             actual = self.run_backend(g, output_names_with_port, onnx_feed_dict, large_model)
 
         for expected_val, actual_val in zip(expected, actual):

tf2onnx/optimizer/__init__.py

@@ -36,8 +36,8 @@ def _get_optimizers():
     return _optimizers
 
 
-def optimize_graph(graph):
-    """ Optimize graph, return optimized graph. No throw. """
+def optimize_graph(graph, catch_errors=True):
+    """ Optimize graph, return optimized graph. No throw if catch_errors is true"""
     logger = logging.getLogger(__name__)
     logger.info("Optimizing ONNX model")
 
@@ -47,17 +47,21 @@ def optimize_graph(graph):
     while continue_flag:
         continue_flag = False
         for name, factory in opts.items():
-            try:
-                logger.verbose("Apply %s", name)
-                current = copy.deepcopy(graph)
+            logger.verbose("Apply %s", name)
+            if catch_errors:
+                try:
+                    current = copy.deepcopy(graph)
+                    opt = factory()
+                    graph = opt.optimize(current) or graph
+                    continue_flag = continue_flag or opt.graph_been_opt
+                except Exception:  # pylint: disable=broad-except
+                    # if current optimizer fails, continue with other optimizers
+                    logger.warning("Failed to apply %s", name, exc_info=1)
+            else:
                 opt = factory()
-                graph = opt.optimize(current) or graph
+                graph = opt.optimize(graph)
                 continue_flag = continue_flag or opt.graph_been_opt
 
-            except Exception:  # pylint: disable=broad-except
-                # if current optimizer fails, continue with other optimizers
-                logger.warning("Failed to apply %s", name, exc_info=1)
-
     try:
         graph.topological_sort(graph.get_nodes())
     except Exception:  # pylint: disable=broad-except

tf2onnx/optimizer/transpose_optimizer.py

@@ -571,6 +571,7 @@ def _split_handler(self, trans, node):
 
     def _squeeze_handler(self, trans, node):
         def _calculate_new_attr(ori_perm, ori_squeeze_axes):
+            ori_squeeze_axes = [i if i >= 0 else i + 4 for i in ori_squeeze_axes]
             new_squeeze_axes = sorted([ori_perm[i] for i in ori_squeeze_axes])
             # calculate output shape after trans and squeeze
             input_shape = "abcd"