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
Support for kws > 15
  • Loading branch information
Nicholas J Riasanovsky
Nicholas J Riasanovsky committed Feb 22, 2022
commit ebea7109561969f21069f3057d9f934bebdfb297
107 changes: 98 additions & 9 deletions numba/core/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ def peep_hole_call_function_ex_to_call_function_kw(func_ir):
# so it can be traversed in any order.
for blk in func_ir.blocks.values():
new_body = []
errmsg = "CALL_FUNCTION_EX with **kwargs not supported"
for i, stmt in enumerate(blk.body):
if (
isinstance(stmt, ir.Assign)
Expand Down Expand Up @@ -166,7 +167,6 @@ def peep_hole_call_function_ex_to_call_function_kw(func_ir):
not_found = False
else:
varkwarg_loc -= 1
start_search = varkwarg_loc
if (
kws
or not_found
Expand All @@ -178,15 +178,104 @@ def peep_hole_call_function_ex_to_call_function_kw(func_ir):
# If we couldn't find where the kwargs are created
# then it should be a normal **kwargs call
# so we produce an unsupported message.
errmsg = "CALL_FUNCTION_EX with **kwargs not supported"
raise UnsupportedError(errmsg)
# Extract the kws from the build_map
kws = keyword_def.value.items.copy()
# kws are required to have constants for all of the strings.
# We update these with the value_indexes
for key, index in keyword_def.value.value_indexes.items():
kws[index] = (key, kws[index][1])

# Determine the kws
if keyword_def.value.items:
# n_kws <= 15 case.
# Extract the kws directly from the build_map
kws = keyword_def.value.items.copy()
# kws are required to have constant keys.
# We update these with the value_indexes
value_indexes = keyword_def.value.value_indexes
for key, index in value_indexes.items():
kws[index] = (key, kws[index][1])
else:
# n_kws > 15 case.
# The map is initially created without any initial
# values and there should be a series of setitem to
# populate the map between varkwarg_loc and
# start_search.
# Each section here should be of the form:
#
# $constvar = const(str, ...) # create the const key
# CREATE THE ARGUMENT, This may take multiple lines.
# $var = getattr(
# value=$build_map_var,
# attr=__setitem__,
# )
# $unused_var = call $var($constvar, $created_arg)
#
# We check for this structure and append to kws.
# We also remove the getattr and call from
# the IR.
kws = []
append_search_idx = varkwarg_loc + 1
while append_search_idx <= start_search:
# The first value must be a constant.
const_stmt = blk.body[append_search_idx]
if not (
isinstance(const_stmt, ir.Assign)
and isinstance(const_stmt.value, ir.Const)
):
# We cannot handle this format so raise the
# original error message.
raise UnsupportedError(errmsg)
key_var_name = const_stmt.target.name
key_val = const_stmt.value.value
append_search_idx += 1
# Now we need to search for a getattr with setitem
not_found_getattr = True
while (
append_search_idx <= start_search
and not_found_getattr
):
getattr_stmt = blk.body[append_search_idx]
if (
isinstance(getattr_stmt, ir.Assign)
and isinstance(getattr_stmt.value, ir.Expr)
and getattr_stmt.value.op == "getattr"
and (
getattr_stmt.value.value.name
== varkwarg.name
)
and getattr_stmt.value.attr == "__setitem__"
):
not_found_getattr = False
else:
append_search_idx += 1
if (
not_found_getattr
or append_search_idx == start_search
):
# We cannot handle this format so raise the
# original error message.
raise UnsupportedError(errmsg)
setitem_stmt = blk.body[append_search_idx + 1]
if not (
isinstance(setitem_stmt, ir.Assign)
and isinstance(setitem_stmt.value, ir.Expr)
and setitem_stmt.value.op == "call"
and (
setitem_stmt.value.func.name
== getattr_stmt.target.name
)
and len(setitem_stmt.value.args) == 2
and (
setitem_stmt.value.args[0].name
== key_var_name
)
):
# We cannot handle this format so raise the
# original error message.
raise UnsupportedError(errmsg)
arg_var = setitem_stmt.value.args[1]
# Append the (key, value) pair.
kws.append((key_val, arg_var))
# Remove the __setitem__ getattr and call
new_body[append_search_idx] = None
new_body[append_search_idx + 1] = None
append_search_idx += 2
start_search = varkwarg_loc
# Remove the build_map from the body.
new_body[varkwarg_loc] = None
if vararg is not None:
Expand Down