Merge pull request #484 from lucienwang1009/opset10_bug

disable shape inference test for scan in opsets larger than 8

Author: nbcsm

tests/common.py

@@ -13,11 +13,27 @@
 from parameterized import parameterized
 from tf2onnx import constants, logging, utils
 
-__all__ = ["TestConfig", "get_test_config", "unittest_main", "check_onnxruntime_backend",
-           "check_tf_min_version", "check_tf_max_version", "skip_tf_versions", "check_onnxruntime_min_version",
-           "check_opset_min_version", "check_target", "skip_caffe2_backend", "skip_onnxruntime_backend",
-           "skip_opset", "check_onnxruntime_incompatibility", "validate_const_node",
-           "group_nodes_by_type", "test_ms_domain", "check_node_domain"]
+__all__ = [
+    "TestConfig",
+    "get_test_config",
+    "unittest_main",
+    "check_onnxruntime_backend",
+    "check_tf_min_version",
+    "check_tf_max_version",
+    "skip_tf_versions",
+    "check_onnxruntime_min_version",
+    "check_opset_min_version",
+    "check_opset_max_version",
+    "check_target",
+    "skip_caffe2_backend",
+    "skip_onnxruntime_backend",
+    "skip_opset",
+    "check_onnxruntime_incompatibility",
+    "validate_const_node",
+    "group_nodes_by_type",
+    "test_ms_domain",
+    "check_node_domain"
+]
 
 
 # pylint: disable=missing-docstring
@@ -174,6 +190,13 @@ def check_opset_min_version(min_required_version, message=""):
     return unittest.skipIf(config.opset < min_required_version, reason)
 
 
+def check_opset_max_version(max_accepted_version, message=""):
+    """ Skip if opset > max_accepted_version """
+    config = get_test_config()
+    reason = _append_message("conversion requires opset <= {}".format(max_accepted_version), message)
+    return unittest.skipIf(config.opset > max_accepted_version, reason)
+
+
 def skip_opset(opset_v, message=""):
     """ Skip if opset = opset_v """
     config = get_test_config()

tests/test_onnx_shape_inference.py

@@ -267,7 +267,7 @@ def test_constant_of_shape(self):
 
     # node with subgraph
     @check_opset_min_version(8, "Scan")
-    @skip_opset(9, "Scan")
+    @check_opset_max_version(8, "Scan")
     def test_scan(self):
         batch_size = 1
         seq_len = 16