From a26253bb0aa073744796426d1cacf3dd9718cf6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 00:43:24 +0000 Subject: [PATCH 1/2] Bump mypy from 1.18.2 to 1.19.0 in /requirements/lintrunner Bumps [mypy](https://github.com/python/mypy) from 1.18.2 to 1.19.0. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v1.18.2...v1.19.0) --- updated-dependencies: - dependency-name: mypy dependency-version: 1.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/lintrunner/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/lintrunner/requirements.txt b/requirements/lintrunner/requirements.txt index 5c5ad3b9..5de830f7 100644 --- a/requirements/lintrunner/requirements.txt +++ b/requirements/lintrunner/requirements.txt @@ -3,7 +3,7 @@ lintrunner-adapters>=0.8.0 # RUFF, RUFF-FIX ruff==0.14.6 # MYPY -mypy==1.18.2 +mypy==1.19.0 types-PyYAML==6.0.12.20250822 # EDITORCONFIG-CHECKER editorconfig-checker==3.4.1 From 5b3d3259cf433b8b0972cd49bc83f7bea62d282a Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Fri, 12 Dec 2025 15:18:23 -0800 Subject: [PATCH 2/2] Improve typing Signed-off-by: Justin Chu --- src/onnx_ir/passes/common/inliner.py | 6 ++++-- src/onnx_ir/passes/common/naming.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/onnx_ir/passes/common/inliner.py b/src/onnx_ir/passes/common/inliner.py index a49d419e..496c31a7 100644 --- a/src/onnx_ir/passes/common/inliner.py +++ b/src/onnx_ir/passes/common/inliner.py @@ -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 diff --git a/src/onnx_ir/passes/common/naming.py b/src/onnx_ir/passes/common/naming.py index cff9267d..66b3620d 100644 --- a/src/onnx_ir/passes/common/naming.py +++ b/src/onnx_ir/passes/common/naming.py @@ -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.""" @@ -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: @@ -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, ( @@ -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, ( @@ -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 @@ -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 @@ -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