Skip to content

Support for large numbers of args/kws with Python 3.10 #7866

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

Merged
sklam merged 24 commits into from
May 6, 2022
Merged

Support for large numbers of args/kws with Python 3.10 #7866

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7ad9642
added basic support for args <= 30 and kws <= 15
Feb 22, 2022
ebea710
Support for kws > 15
Feb 22, 2022
3107840
working with args > 30, needs refactoring + error checking
Feb 23, 2022
fd6669b
Refactored the code into helpful functions, still need to write tests
Feb 25, 2022
f3ad535
added tests
Feb 25, 2022
29953e7
added Ehsan's comments
Feb 28, 2022
28a22ee
fixed small bug in skip_unless_py10
Mar 1, 2022
f726b3a
updated the comments and tests
Mar 2, 2022
974da74
added an objmode test
Apr 18, 2022
dbb4dec
fixed the definition updates
Apr 18, 2022
7231d71
Add Siu's changes
Apr 18, 2022
2a01061
prepared to add extra tests
Apr 18, 2022
1d38efa
updated the error message and added additional tests
Apr 18, 2022
f766532
Added tests to check for inlined control flow, doesn't handle only args
Apr 18, 2022
7e8d424
added error handling for the inline case with all args
Apr 18, 2022
cd04a5e
simplified the error message sources
Apr 18, 2022
224c514
fix pytest assertion
Apr 18, 2022
9d234a2
updated the error message
Apr 28, 2022
af48701
Update numba/core/interpreter.py
njriasan Apr 28, 2022
9ed27ea
made Stuart's test changes
May 4, 2022
530284e
apply stuart's interpreter changes
May 4, 2022
9bb2ee5
Merge branch 'nick/16_kwargs_py310_peephole' of https://github.com/nj…
May 4, 2022
ba83ffb
applied remaining comment changes
May 4, 2022
265a426
Made Stuart's final changes
May 6, 2022
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
Prev Previous commit
Next Next commit
simplified the error message sources
  • Loading branch information
Nicholas J Riasanovsky
Nicholas J Riasanovsky committed Apr 18, 2022
commit cd04a5e451ee4d381042ccbbfed38dda846ff0da
14 changes: 10 additions & 4 deletions numba/core/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,8 @@ def _call_function_ex_replace_args_large(
else:
# There must always be an initial assignement
# https://github.com/numba/numba/blob/59fa2e335be68148b3bd72a29de3ff011430038d/numba/core/interpreter.py#L259-L260
# If this changes we may need to support this branch. We can
# reach this section if there is an unsupported conversion due
# to a failure in the list_to_tuple conversion.
raise UnsupportedError(errmsg)
# If this changes we may need to support this branch.
raise AssertionError("unreachable")
start_not_found = True
# Traverse backwards to find all concatentations
# until eventually reaching the original empty tuple.
Expand Down Expand Up @@ -623,6 +621,14 @@ def peep_hole_call_function_ex_to_call_function_kw(func_ir):
vararg_loc,
func_ir,
)
elif (
isinstance(args_def.value, ir.Expr)
and args_def.value.op == "list_to_tuple"
):
# If there is a call with vararg we need to check
# if the list -> tuple conversion failed and if so
# throw an error.
raise UnsupportedError(errmsg)
else:
# Here the IR is an initial empty build_tuple.
# Then for each arg, a new tuple with a single
Expand Down