Merge pull request #1148 from onnx/tom/SetAggressiveInliningTrue

Set aggressive inlining to true

Author: guschmue

tf2onnx/tf_loader.py

@@ -105,23 +105,26 @@ def convert_variables_to_constants_large_model(func):
         except ImportError:
             _not_implemented_tf_placeholder("_convert_variables_to_constants_v2_impl")()
         frozen_graph_def, _ = \
-            _convert_variables_to_constants_v2_impl(func, lower_control_flow=False, aggressive_inlining=False)
+            _convert_variables_to_constants_v2_impl(func, lower_control_flow=False, aggressive_inlining=True)
         return frozen_graph_def
 
     try:
         from tensorflow.python.framework.convert_to_constants import \
             _FunctionConverterData, _replace_variables_by_constants # pylint: disable=protected-access
     except ImportError:
         _not_implemented_tf_placeholder("_replace_variables_by_constants")()
-    converter_data = _FunctionConverterData(func=func, lower_control_flow=False, aggressive_inlining=False)
+    converter_data = _FunctionConverterData(func=func, lower_control_flow=False, aggressive_inlining=True)
     frozen_graph_def, _ = _replace_variables_by_constants(converter_data=converter_data)
     return frozen_graph_def
 
 def from_function(func, input_names, output_names, large_model=False):
     if large_model:
         return convert_variables_to_constants_large_model(func)
 
-    frozen_func = convert_variables_to_constants_v2(func, lower_control_flow=False)
+    if get_tf_version() < LooseVersion("2.2"):
+        frozen_func = convert_variables_to_constants_v2(func, lower_control_flow=False)
+    else:
+        frozen_func = convert_variables_to_constants_v2(func, lower_control_flow=False, aggressive_inlining=True)
     graph_def = frozen_func.graph.as_graph_def(add_shapes=True)
     # output_names = [i.name for i in frozen_func.outputs]
     tf_reset_default_graph()