Split pattern.py #2296
Merged
Split pattern.py #2296
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
❌ 3 Tests Failed:
View the top 3 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
justinchuby
reviewed
May 12, 2025
justinchuby
reviewed
May 12, 2025
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
justinchuby
approved these changes
May 13, 2025
justinchuby
reviewed
May 13, 2025
justinchuby
reviewed
May 13, 2025
| node: ir.Node, | ||
| *, | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, |
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 2 months ago
To fix the cyclic import issue, we need to break the dependency loop between _rewrite_rule and _basics. One way to achieve this is by deferring the import of _basics.MatchingTracer to the point where it is actually needed, rather than importing it at the module level. This can be done by moving the import statement for _basics.MatchingTracer inside the try_rewrite method, where it is used. This approach ensures that _basics is fully initialized before MatchingTracer is accessed, thereby resolving the cyclic import issue.
Suggested changeset
1
onnxscript/rewriter/_rewrite_rule.py
| @@ -161,3 +161,3 @@ | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, | ||
| tracer: "MatchingTracer | None" = None, # Deferred import to avoid cyclic dependency | ||
| ) -> ReplacementSubgraph | None: | ||
| @@ -216,3 +216,4 @@ | ||
| if tracer: | ||
| tracer.log(self, graph_or_function, node, match, _basics.MatchStatus.NO_MATCH) | ||
| from onnxscript.rewriter._basics import MatchingTracer # Deferred import | ||
| tracer.log(self, graph_or_function, node, match, MatchingTracer.MatchStatus.NO_MATCH) | ||
| return None |
Copilot is powered by AI and may make mistakes. Always verify output.
| *, | ||
| commute: bool = False, | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, |
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 2 months ago
To resolve the cyclic import issue, we need to break the dependency loop between _rewrite_rule and _basics. One effective way to do this is to use a local import for MatchingTracer within the method where it is used (try_rewrite). This ensures that MatchingTracer is only imported when the method is called, avoiding the cyclic dependency during module initialization. This approach minimizes changes to the codebase and preserves existing functionality.
Suggested changeset
1
onnxscript/rewriter/_rewrite_rule.py
| @@ -161,5 +161,6 @@ | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, | ||
| tracer: "MatchingTracer" | None = None, | ||
| ) -> ReplacementSubgraph | None: | ||
| """If the node matches the pattern, then replace the node with the replacement pattern.""" | ||
| from onnxscript.rewriter._basics import MatchingTracer | ||
| if verbose and verbose > 2: |
Copilot is powered by AI and may make mistakes. Always verify output.
| graph_or_function: ir.Graph | ir.Function, | ||
| *, | ||
| verbose: int | None, | ||
| tracer: _basics.MatchingTracer | None = None, |
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 2 months ago
To fix the cyclic import issue, we need to break the dependency loop between _rewrite_rule and _basics. One way to achieve this is to move the MatchingTracer reference to a local import within the method where it is used (_apply_to_graph_or_function). This ensures that _basics.MatchingTracer is only imported when needed, avoiding the cyclic import at the module level.
Steps to fix:
- Remove the module-level import of
_basics.MatchingTracer. - Add a local import of
_basics.MatchingTracerinside the_apply_to_graph_or_functionmethod, where it is used.
Suggested changeset
1
onnxscript/rewriter/_rewrite_rule.py
| @@ -16,3 +16,3 @@ | ||
| import onnxscript.optimizer | ||
| import onnxscript.rewriter._basics as _basics | ||
| import onnxscript.rewriter._basics as _basics # Keep the import for other references, but remove `MatchingTracer` usage here. | ||
| import onnxscript.rewriter._matcher as _matcher | ||
| @@ -446,3 +446,3 @@ | ||
| verbose: int | None, | ||
| tracer: _basics.MatchingTracer | None = None, | ||
| tracer: "onnxscript.rewriter._basics.MatchingTracer" | None = None, # Use a string annotation to avoid early evaluation. | ||
| ) -> int: | ||
| @@ -464,2 +464,3 @@ | ||
| # And the graph is applied in order. | ||
| from onnxscript.rewriter._basics import MatchingTracer # Local import to avoid cyclic dependency. | ||
| for rule in self.rules: |
Copilot is powered by AI and may make mistakes. Always verify output.
| model: ir.Model, | ||
| *, | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, |
Check failure
Code scanning / CodeQL
Module-level cyclic import Error
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 2 months ago
To resolve the cyclic import issue, we can break the dependency by deferring the import of MatchingTracer from _basics to the point where it is actually needed. This can be achieved by moving the import inside the apply_to_model method, where _basics.MatchingTracer is used. This ensures that _basics is fully initialized before MatchingTracer is accessed, eliminating the cyclic dependency at the module level.
Suggested changeset
1
onnxscript/rewriter/_rewrite_rule.py
| @@ -547,3 +547,3 @@ | ||
| verbose: int | None = None, | ||
| tracer: _basics.MatchingTracer | None = None, | ||
| tracer: "MatchingTracer | None" = None, | ||
| ) -> int: | ||
| @@ -560,2 +560,3 @@ | ||
| """ | ||
| from onnxscript.rewriter._basics import MatchingTracer | ||
| assert isinstance(model, ir.Model) |
Copilot is powered by AI and may make mistakes. Always verify output.
|
The string types are not needed actually since we import from future already |
justinchuby
reviewed
May 13, 2025
|
|
||
| Example:: | ||
|
|
||
| class TransposeIdentity(RewriteRuleAsClass): |
There was a problem hiding this comment.
nit: I realized this should be RewriteRuleClassBase
There was a problem hiding this comment.
Right ... this PR auto-merged, will fix it separately.
justinchuby
approved these changes
May 13, 2025
justinchuby
approved these changes
May 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Splitting pattern.py into multiple files, each more focused:
There is more cleanup to be done in each part, but keeping this PR simple, focused only on the split-up, to avoid any major merge-issues.