Merge pull request #409 from lucienwang1009/bugs

Load saved model with redundant inputs

Author: guschmue

tests/models/saved_model_with_redundant_inputs/saved_model.pb

@@ -27,6 +27,15 @@ regression-saved-model:
   outputs:
     - pred:0
 
+saved_model_with_redundant_inputs:
+  model: tests/models/saved_model_with_redundant_inputs
+  model_type: saved_model
+  input_get: get_ramp
+  inputs:
+    "Placeholder:0": [1, 10]
+  outputs:
+    - Add:0
+
 benchtf-fc:
   model: tests/models/fc-layers/frozen.pb
   input_get: get_ramp

tests/run_pretrained_models.yaml

@@ -8,9 +8,15 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import logging
+
 import tensorflow as tf
 from tensorflow.python.framework.graph_util import convert_variables_to_constants
 
+from tf2onnx import utils
+
+logging.basicConfig(level=logging.INFO)
+log = logging.getLogger("loader")
 
 # pylint: disable=unused-argument
 
@@ -87,6 +93,15 @@ def from_saved_model(model_path, input_names, output_names):
             for _, output_tensor in sorted(outputs_tensor_info.items()):
                 outputs[output_tensor.name] = sess.graph.get_tensor_by_name(output_tensor.name)
         frozen_graph = freeze_session(sess, output_names=list(outputs.keys()))
+        frozen_inputs = []
+        # get inputs in frozen graph
+        for n in frozen_graph.node:
+            for inp, _ in inputs.items():
+                if utils.node_name(inp) == n.name:
+                    frozen_inputs.append(inp)
+        deleted_inputs = list(set(inputs.keys()) - set(frozen_inputs))
+        if deleted_inputs:
+            log.warning("inputs [%s] is not in frozen graph, delete them", ",".join(deleted_inputs))
     # clean up
     tf.reset_default_graph()
-    return frozen_graph, inputs.keys(), outputs.keys()
+    return frozen_graph, frozen_inputs, outputs.keys()