refactor

Author: zhijxu-MS

tf2onnx/optimizer/__init__.py

@@ -48,8 +48,7 @@ def optimize_graph(graph):
                 current = copy.deepcopy(graph)
                 opt = factory()
                 graph = opt.optimize(current)
-                if not continue_flag:
-                    continue_flag = opt.graph_been_opt
+                continue_flag = continue_flag or opt.graph_been_opt
 
             except Exception:  # pylint: disable=broad-except
                 # if current optimizer fails, continue with other optimizers

tf2onnx/optimizer/optimizer_base.py

@@ -16,7 +16,7 @@ class GraphOptimizerBase(object):
 
     def __init__(self):
         self._logger = logging.getLogger('.'.join(__name__.split('.')[:-1] + [self.__class__.__name__]))
-        self.graph_been_opt = False
+        self._graph_been_opt = False
 
     @property
     def logger(self):
@@ -26,6 +26,14 @@ def logger(self):
     def is_debug_mode(self):
         return utils.is_debug_mode()
 
+    @property
+    def graph_been_opt(self):
+        return self._graph_been_opt
+
+    @graph_been_opt.setter
+    def graph_been_opt(self, value):
+        self._graph_been_opt = value
+
     def optimize(self, graph):
         """ Optimize graph, return optimized graph. """
         before = graph.dump_node_statistics()