Skip to content

Update opset imports in version_converter #2295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Update opset imports in version_converter #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b54659
Update opset imports in version_converter
shubhambhokare1 May 12, 2025
762c9e8
update version_converter loop order
shubhambhokare1 May 12, 2025
421c1dc
add log
shubhambhokare1 May 12, 2025
3950910
graph assignments
shubhambhokare1 May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 39 additions & 21 deletions onnxscript/version_converter/_version_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from __future__ import annotations

import copy
import dataclasses
import functools
import logging
Expand Down Expand Up @@ -276,39 +277,45 @@ def visit_node(
self.replace_node(node, replacement, root)
return None

def visit_graph(self, graph: ir.Graph) -> None:
def visit_graph(self, graph: ir.Graph) -> ir.Graph | None:
if self.target_version > SUPPORTED_MAX_ONNX_OPSET:
logger.warning(
"Conversion to target opset: %s not currently supported.",
self.target_version,
)
return None
for node in graph:
up_conversion = True
if node.version is None:
node.version = self.model_version
# Iterate each node from current node version -> target version
# and updating node based on the correct adapter
# Up-conversion [ver->ver+1] or down-conversion [ver->ver-1]
# TODO(shubhambhokare1): Remove once down-conversion adapters are supoorted
if self.target_version < node.version:
up_conversion = False
logger.warning(
"Target opset: %s less than %s, downstream version conversion not currently handled.",
self.target_version,
self.model_version,
)
return None
for opset_version in range(node.version, self.target_version):

# TODO(shubhambhokare1): Support down-conversion
while self.model_version < self.target_version:
pre_conversion_graph = copy.copy(graph)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@justinchuby : how expensive is copy? Specifically, what does it do for large tensors?

Copy link
Collaborator

@justinchuby justinchuby May 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't copy graphs yet. This won't work (sorry)

I intend to implement graph.duplicate(). But I have not done it. cc @titaiwangms who has a similar need.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@justinchuby What would be the correct way to store pre-conversion state graphs?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe implement a proper graph.duplicate()? Before that maybe aborting on failures is acceptable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#2298

# Up-convert each node in the graph from opset_version -> opset_version + 1
# or down-convert from opset_version -> opset_version - 1
# Return non-converted graph if any node fails to convert.
for node in graph:
up_conversion = True
if node.version is None:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should check if it is an onnx domain op first: else skip, and don't do anything (even updating node.version).

node.version = self.model_version
if self.target_version < node.version:
# up_conversion = False
# TODO(shubhambhokare1): Remove once down-conversion adapters are supoorted
logger.warning(
"Target opset: %s less than %s, downstream version conversion not currently handled.",
self.target_version,
node.version,
)
return pre_conversion_graph
try:
self.visit_node(node, graph, opset_version, up_conversion)
self._upgrade_version(node, opset_version, up_conversion)
self.visit_node(node, graph, self.model_version, up_conversion)
self._upgrade_version(node, self.model_version, up_conversion)
except VersionConverterError as e:
logger.warning(
"Skipping version conversion for node %s due to exception: %s",
node.op_type,
e,
)
return pre_conversion_graph
self.model_version += 1
del pre_conversion_graph
return None

def visit_model(self, model: ir.Model) -> None:
Expand All @@ -319,7 +326,18 @@ def visit_model(self, model: ir.Model) -> None:
if model_version is None:
return None
self.model_version = model_version
self.visit_graph(model.graph)
graph = self.visit_graph(model.graph)
if graph is not None:
model.graph = graph

# Finally, update the opset imports for the model
if self.model_version != self.target_version:
logger.warning(
"Converting to opset %s failed. Model was converted to opset version %s.",
self.target_version,
self.model_version,
)
model.opset_imports[""] = self.model_version
return None


Expand Down
14 changes: 14 additions & 0 deletions onnxscript/version_converter/_version_converter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def test_version_convert_compatible(self):
)
model = ir.serde.deserialize_model(model_proto)
target_version = 19
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "Constant")
Expand All @@ -123,6 +124,7 @@ def test_version_convert_compatible(self):
self.assertEqual(model.graph.node(1).version, 19)
self.assertEqual(model.graph.node(4).op_type, "MatMul")
self.assertEqual(model.graph.node(4).version, 19)
self.assertEqual(model.opset_imports[""], 19)


class VersionConverter19to20Test(unittest.TestCase):
Expand All @@ -142,6 +144,7 @@ def test_version_convert_compatible(self):
)
model = ir.serde.deserialize_model(model_proto)
target_version = 20
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "Constant")
Expand All @@ -153,6 +156,7 @@ def test_version_convert_compatible(self):
self.assertEqual(model.graph.node(3).op_type, "DFT")
self.assertEqual(model.graph.node(3).version, 20)
self.assertEqual(len(model.graph.node(3).inputs), 2)
self.assertEqual(model.opset_imports[""], 20)

def test_version_convert_gridsample_linear(self):
model_proto = onnx.parser.parse_model(
Expand All @@ -175,6 +179,7 @@ def test_version_convert_gridsample_linear(self):
self.assertEqual(model.graph.node(4).attributes["mode"].value, "bilinear")

target_version = 20
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "Constant")
Expand All @@ -184,6 +189,7 @@ def test_version_convert_gridsample_linear(self):
self.assertEqual(model.graph.node(4).op_type, "GridSample")
self.assertEqual(model.graph.node(4).version, 20)
self.assertEqual(model.graph.node(4).attributes["mode"].value, "linear")
self.assertEqual(model.opset_imports[""], 20)

def test_version_convert_gridsample_cubic(self):
model_proto = onnx.parser.parse_model(
Expand All @@ -206,6 +212,7 @@ def test_version_convert_gridsample_cubic(self):
self.assertEqual(model.graph.node(4).attributes["mode"].value, "bicubic")

target_version = 20
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "Constant")
Expand All @@ -215,6 +222,7 @@ def test_version_convert_gridsample_cubic(self):
self.assertEqual(model.graph.node(4).op_type, "GridSample")
self.assertEqual(model.graph.node(4).version, 20)
self.assertEqual(model.graph.node(4).attributes["mode"].value, "cubic")
self.assertEqual(model.opset_imports[""], 20)

def test_version_convert_inline(self):
model_proto = onnx.parser.parse_model(
Expand All @@ -238,6 +246,7 @@ def test_version_convert_inline(self):
)
model = ir.serde.deserialize_model(model_proto)
target_version = 20
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "Constant")
Expand All @@ -250,6 +259,7 @@ def test_version_convert_inline(self):
self.assertEqual(model.graph.node(6).op_type, "DFT")
self.assertEqual(model.graph.node(6).version, 20)
self.assertEqual(len(model.graph.node(6).inputs), 2)
self.assertEqual(model.opset_imports[""], 20)


class VersionConverter20to21Test(unittest.TestCase):
Expand All @@ -267,6 +277,7 @@ def test_version_groupnorm(self):
)
model = ir.serde.deserialize_model(model_proto)
target_version = 21
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(3).op_type, "Reshape")
Expand All @@ -283,6 +294,7 @@ def test_version_groupnorm(self):
self.assertEqual(model.graph.node(8).version, 21)
self.assertEqual(model.graph.node(9).op_type, "GroupNormalization")
self.assertEqual(model.graph.node(9).version, 21)
self.assertEqual(model.opset_imports[""], 21)

def test_version_groupnorm_no_bias(self):
model_proto = onnx.parser.parse_model(
Expand All @@ -298,10 +310,12 @@ def test_version_groupnorm_no_bias(self):
)
model = ir.serde.deserialize_model(model_proto)
target_version = 21
self.assertEqual(model.opset_imports[""], 18)
version_converter.convert_version(model, target_version=target_version)

self.assertEqual(model.graph.node(0).op_type, "GroupNormalization")
self.assertEqual(model.graph.node(0).version, 20)
self.assertEqual(model.opset_imports[""], 20)


class VersionConverter23to24Test(unittest.TestCase):
Expand Down
Loading