Repository navigation
Replace assertion errors on IR assumption violation #7223
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.
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
359b5b0
Replace assertion errors on IR assumption violation
sklam e307287
pep8
sklam 34dea22
pep8
sklam ec01acd
Use loc in warning class instead
sklam 30a4cd2
Apply suggestions from code review
sklam d67e05d
Remove dead comments
sklam 5463998
Update test to new error message
sklam 9ffdd3d
Fix typo
sklam 46a2f9f
Ask user to report the issue in pedantic warning msg.
sklam edc82f7
Replace "error" with "warning"
sklam d660e36
Update numba/core/errors.py
sklam 3d6fb07
Add comments to explain the dummy function in test
sklam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,25 @@ | ||
| import unittest | ||
| from numba import objmode | ||
| from unittest.case import TestCase | ||
| import warnings | ||
| import numpy as np | ||
|
|
||
| from numba import objmode | ||
| from numba.core import ir, compiler | ||
| from numba.core import errors | ||
| from numba.core.compiler import ( | ||
| CompilerBase, | ||
| ReconstructSSA, | ||
| ) | ||
| from numba.core.compiler_machinery import ( | ||
| FunctionPass, | ||
| PassManager, | ||
| register_pass, | ||
| ) | ||
| from numba.core.untyped_passes import ( | ||
| TranslateByteCode, | ||
| IRProcessing, | ||
| ) | ||
| from numba import njit | ||
|
|
||
|
|
||
| class TestIR(unittest.TestCase): | ||
|
|
@@ -466,5 +484,75 @@ def baz(a, b): | |
| check_diffstr(tmp, ["c + b", "b + c"]) | ||
|
|
||
|
|
||
| class TestIRPedanticChecks(TestCase): | ||
| def test_var_in_scope_assumption(self): | ||
| # Create a pass that clears ir.Scope in ir.Block | ||
| @register_pass(mutates_CFG=False, analysis_only=False) | ||
| class RemoveVarInScope(FunctionPass): | ||
| _name = "_remove_var_in_scope" | ||
|
|
||
| def __init__(self): | ||
| FunctionPass.__init__(self) | ||
|
|
||
| # implement method to do the work, "state" is the internal compiler | ||
| # state from the CompilerBase instance. | ||
| def run_pass(self, state): | ||
| func_ir = state.func_ir | ||
| # walk the blocks | ||
| for blk in func_ir.blocks.values(): | ||
| oldscope = blk.scope | ||
| # put in an empty Scope | ||
| blk.scope = ir.Scope(parent=oldscope.parent, | ||
| loc=oldscope.loc) | ||
| return True | ||
|
|
||
| # Create a pass that always fails, to stop the compiler | ||
| @register_pass(mutates_CFG=False, analysis_only=False) | ||
| class FailPass(FunctionPass): | ||
| _name = "_fail" | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| FunctionPass.__init__(self) | ||
|
|
||
| def run_pass(self, state): | ||
| # This is unreachable. SSA pass should have raised before this | ||
| # pass when run with `error.NumbaPedanicWarning`s raised as | ||
| # errors. | ||
| raise AssertionError("unreachable") | ||
|
|
||
| class MyCompiler(CompilerBase): | ||
| def define_pipelines(self): | ||
| pm = PassManager("testing pm") | ||
| pm.add_pass(TranslateByteCode, "analyzing bytecode") | ||
| pm.add_pass(IRProcessing, "processing IR") | ||
| pm.add_pass(RemoveVarInScope, "_remove_var_in_scope") | ||
| pm.add_pass(ReconstructSSA, "ssa") | ||
| pm.add_pass(FailPass, "_fail") | ||
| pm.finalize() | ||
| return [pm] | ||
|
|
||
| @njit(pipeline_class=MyCompiler) | ||
| def dummy(x): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps add a comment explaining why this
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done in 3d6fb07 |
||
| a = 1 | ||
| b = 2 | ||
| if a < b: | ||
| a = 2 | ||
| else: | ||
| b = 3 | ||
| return a, b | ||
|
|
||
| with warnings.catch_warnings(): | ||
| # Make NumbaPedanticWarning an error | ||
| warnings.simplefilter("error", errors.NumbaPedanticWarning) | ||
| # Catch NumbaIRAssumptionWarning | ||
| with self.assertRaises(errors.NumbaIRAssumptionWarning) as raises: | ||
| dummy(1) | ||
| # Verify the error message | ||
| self.assertRegex( | ||
| str(raises.exception), | ||
| r"variable '[a-z]' is not in scope", | ||
| ) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| unittest.main() | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed