Fix case

Author: justinchuby

onnxscript/ir/passes/common/version_converter.py

@@ -42,21 +42,17 @@ def __init__(self, target_version: int, fallback: bool = False) -> None:
         self.inliner = _inliner.InlinePass()
 
     def call(self, model: ir.Model) -> ir.passes.PassResult:
-        # Normalize the opset import
-        if "ai.onnx" in model.graph.opset_imports:
-            model.graph.opset_imports[""] = model.graph.opset_imports["ai.onnx"]
-            del model.graph.opset_imports["ai.onnx"]
-
-        model_opset_version = model.graph.opset_imports[""]
-        if model_opset_version == self.target_version:
-            # No need to convert the version
-            return ir.passes.PassResult(model, False)
+        if "" in model.graph.opset_imports:
+            onnx_opset_version = model.graph.opset_imports[""]
+            if onnx_opset_version == self.target_version:
+                # No need to convert the version
+                return ir.passes.PassResult(model, False)
 
         # In functions, we can have attribute-parameters, which means we don't know the value of the attribute.
         # Hence, we inline all the functions.
         self.inliner(model)
 
-        if _version_converter.version_supported(model_opset_version, self.target_version):
+        if _version_converter.version_supported(model, self.target_version):
             _version_converter.convert_version(
                 model,
                 target_version=self.target_version,
@@ -67,9 +63,8 @@ def call(self, model: ir.Model) -> ir.passes.PassResult:
             logger.info(
                 "The model version conversion is not supported by the onnxscript version converter "
                 "and fallback is disabled. The model was not modified"
-                " (current version: %d, target version: %d). "
+                " (target version: %d). "
                 "Set fallback=True to enable fallback to the onnx c-api version converter.",
-                model_opset_version,
                 self.target_version,
             )
             return ir.passes.PassResult(model, False)

onnxscript/version_converter/_version_converter.py

@@ -39,15 +39,20 @@ class Replacement:
 AdapterFunction = Callable[[ir.Node, orp.RewriterContext], ReturnValue]
 
 
-def version_supported(current_version: int, target_version: int) -> bool:
+def version_supported(model: ir.Model, target_version: int) -> bool:
     """Check if the target version is supported by the current version."""
+    if "" in model.graph.opset_imports:
+        current_version = model.graph.opset_imports[""]
+    else:
+        return True
     return (
         SUPPORTED_MIN_ONNX_OPSET
         <= current_version
         <= target_version
         <= SUPPORTED_MAX_ONNX_OPSET
     )
 
+
 class AdapterRegistry:
     """A class that maintains a registry of adapters for ops."""
 

onnxscript/version_converter/_version_converter_test.py

@@ -4,15 +4,13 @@
 
 import unittest
 
-import onnx.checker
 import onnx.defs
 import onnx.parser
-import onnx.shape_inference
 
 from onnxscript import ir, version_converter
 
 
-class ApapterCoverageTest(unittest.TestCase):
+class AdapterCoverageTest(unittest.TestCase):
     def get_all_unique_schema_versions(self) -> dict[str, list]:
         """Collect all unique versions of ONNX standard domain ops"""
         op_version_dict = {}