Merge pull request #390 from nbcsm/fix_qv

enhance tf shape inference for LessEqual and Max

Author: nbcsm

tests/run_pretrained_models.py

@@ -153,7 +153,7 @@ def run_tensorflow(self, sess, inputs):
 
     def to_onnx(self, tf_graph, opset=None, shape_override=None, input_names=None):
         """Convert graph to tensorflow."""
-        return process_tf_graph(tf_graph, continue_on_error=True, verbose=True, opset=opset,
+        return process_tf_graph(tf_graph, continue_on_error=False, verbose=True, opset=opset,
                                 target=Test.target, shape_override=shape_override,
                                 input_names=input_names, output_names=self.output_names)
 
@@ -186,7 +186,6 @@ def run_onnxruntime(self, name, model_proto, inputs):
         """Run test against msrt-next backend."""
         import onnxruntime as rt
         model_path = utils.save_onnx_model(TEMP_DIR, name, inputs, model_proto, include_test_data=True)
-        utils.save_onnx_model(TEMP_DIR, name, inputs, model_proto, include_test_data=False, as_text=True)
         print("\t\t" + model_path)
         m = rt.InferenceSession(model_path)
         results = m.run(self.output_names, inputs)

tf2onnx/shape_inference.py

@@ -35,6 +35,7 @@
     "Greater",
     "GreaterEqual",
     "Less",
+    "LessEqual",
     "LogicalAnd",
     "LogicalOr",
     "Mul",
@@ -154,7 +155,7 @@ def infer_shape_for_node(g, node):
         g.set_shape(node.output[0], shape)
         return True
 
-    if node.type in ["All", "Any", "Min"]:
+    if node.type in ["All", "Any", "Max", "Min"]:
         axis_node = node.inputs[1]
         axis = axis_node.get_tensor_value()
         if not isinstance(axis, list):