Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion requirements/lintrunner/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ lintrunner-adapters>=0.8.0
# RUFF, RUFF-FIX
ruff==0.14.8
# MYPY
mypy==1.18.2
mypy==1.19.0
types-PyYAML==6.0.12.20250822
# EDITORCONFIG-CHECKER
editorconfig-checker==3.4.1
6 changes: 4 additions & 2 deletions src/onnx_ir/passes/common/inliner.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,13 @@ def _instantiate_call(self, node: ir.Node, call_site_id: CallSiteId) -> NodeRepl

def rename(node: ir.Node) -> None:
"""Rename node/values in inlined node to ensure uniqueness in the inlined context."""
node.name = _make_unique_name(node.name, new_call_stack, self.used_node_names)
node_name = node.name or "node"
node.name = _make_unique_name(node_name, new_call_stack, self.used_node_names)
for output in node.outputs:
if output is not None:
output_name = output.name or "val"
output.name = _make_unique_name(
output.name, new_call_stack, self.used_value_names
output_name, new_call_stack, self.used_value_names
)
# Update context in case the new node is itself a call node that will be inlined.
self.node_context[node] = new_call_stack
Expand Down
16 changes: 8 additions & 8 deletions src/onnx_ir/passes/common/naming.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def _fix_graph_names(self, graph_like: ir.Graph | ir.Function) -> bool:
scoped_used_node_names: list[set[str]] = [set()]

# Counters for generating unique names (using list to pass by reference)
value_counter = collections.Counter()
node_counter = collections.Counter()
value_counter: collections.Counter[str] = collections.Counter()
node_counter: collections.Counter[str] = collections.Counter()

def enter_graph(graph_like) -> None:
"""Callback for entering a subgraph."""
Expand Down Expand Up @@ -182,7 +182,7 @@ def _process_value(
value: ir.Value,
used_value_names: set[str],
seen_values: set[ir.Value],
value_counter: collections.Counter,
value_counter: collections.Counter[str],
) -> bool:
"""Process a value only if it hasn't been processed before."""
if value in seen_values:
Expand All @@ -202,7 +202,7 @@ def _process_value(
return modified

def _assign_value_name(
self, value: ir.Value, used_names: set[str], counter: collections.Counter
self, value: ir.Value, used_names: set[str], counter: collections.Counter[str]
) -> bool:
"""Assign a name to an unnamed value. Returns True if modified."""
assert not value.name, (
Expand All @@ -215,7 +215,7 @@ def _assign_value_name(
return True

def _assign_node_name(
self, node: ir.Node, used_names: set[str], counter: collections.Counter
self, node: ir.Node, used_names: set[str], counter: collections.Counter[str]
) -> bool:
"""Assign a name to an unnamed node. Returns True if modified."""
assert not node.name, (
Expand All @@ -228,7 +228,7 @@ def _assign_node_name(
return True

def _fix_duplicate_value_name(
self, value: ir.Value, used_names: set[str], counter: collections.Counter
self, value: ir.Value, used_names: set[str], counter: collections.Counter[str]
) -> bool:
"""Fix a value's name if it conflicts with existing names. Returns True if modified."""
original_name = value.name
Expand All @@ -249,7 +249,7 @@ def _fix_duplicate_value_name(
return True

def _fix_duplicate_node_name(
self, node: ir.Node, used_names: set[str], counter: collections.Counter
self, node: ir.Node, used_names: set[str], counter: collections.Counter[str]
) -> bool:
"""Fix a node's name if it conflicts with existing names. Returns True if modified."""
original_name = node.name
Expand All @@ -269,7 +269,7 @@ def _fix_duplicate_node_name(


def _find_and_record_next_unique_name(
preferred_name: str, used_names: set[str], counter: collections.Counter
preferred_name: str, used_names: set[str], counter: collections.Counter[str]
) -> str:
"""Generate a unique name based on the preferred name and current counter."""
new_name = preferred_name
Expand Down