Skip to content

Add support for arrayanalysis of tuple args. #7398

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 16 commits into from
Oct 6, 2021
Merged

Add support for arrayanalysis of tuple args. #7398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
36a9da7
Add support for arrayanalysis of tuple args.
DrTodd13 Sep 13, 2021
85e5548
Support tuples of integer literals in alias analysis.
DrTodd13 Sep 17, 2021
c3406ce
Support tuples that are combinations of integer vars and literals.
DrTodd13 Sep 17, 2021
435d434
Add test for pndindex of tuple arg with mix of literal and non-litera…
DrTodd13 Sep 17, 2021
6be6198
Fix flake8 problems.
DrTodd13 Sep 17, 2021
96981f2
Force index vars for pndindex to be constructed as tuples for 1 dimen…
DrTodd13 Sep 17, 2021
1f922eb
Add tests for 1d pndindex.
DrTodd13 Sep 17, 2021
98a6923
Add comment for force_tuple param of make_index_var.
DrTodd13 Oct 5, 2021
68047d3
Use numba.literally inside numba function to pass to another to trigg…
DrTodd13 Oct 5, 2021
cdd7a26
Add test and fix mistake in new parfor tests.
DrTodd13 Oct 5, 2021
8c06789
fix scope issue
DrTodd13 Oct 5, 2021
29c1440
Remove unneeded literally.
DrTodd13 Oct 5, 2021
ed34eb5
more arg tuple literal fixes
DrTodd13 Oct 6, 2021
99dec34
Add manual test of mixed tuple of int and literal.
DrTodd13 Oct 6, 2021
391893a
Add integer argument test for pndindex on 2d array.
DrTodd13 Oct 6, 2021
e39f6c9
Add ability for pndindex to take an integer argument in which case it…
DrTodd13 Oct 6, 2021
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
Next Next commit
Add support for arrayanalysis of tuple args.
  • Loading branch information
@DrTodd13
DrTodd13 committed Sep 13, 2021
commit 36a9da79b9833d63ed539f232d7a5a212674f456
11 changes: 11 additions & 0 deletions numba/parfors/array_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,12 @@ def _analyze_inst(self, label, scope, equiv_set, inst, redefined):
shape = gvalue
elif isinstance(gvalue, int):
shape = (gvalue,)
elif isinstance(inst.value, ir.Arg):
if (
isinstance(typ, types.containers.UniTuple)
and isinstance(typ.dtype, types.Integer)
):
shape = inst.value

if isinstance(shape, ir.Const):
if isinstance(shape.value, tuple):
Expand Down Expand Up @@ -3128,11 +3134,16 @@ def _gen_shape_call(self, equiv_set, var, ndims, shape, post):
# attr call: A_sh_attr = getattr(A, shape)
if isinstance(shape, ir.Var):
shape = equiv_set.get_shape(shape)

# already a tuple variable that contains size
if isinstance(shape, ir.Var):
attr_var = shape
shape_attr_call = None
shape = None
elif isinstance(shape, ir.Arg):
attr_var = var
shape_attr_call = None
shape = None
else:
shape_attr_call = ir.Expr.getattr(var, "shape", var.loc)
attr_var = ir.Var(
Expand Down
7 changes: 7 additions & 0 deletions numba/tests/test_parfors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,13 @@ def test_impl(x):
x = np.ones((2, 2, 2, 2, 2, 15))
self.check(test_impl, x)

def test_tuple_arg(self):
def test_impl(x, sz):
for i in numba.pndindex(sz):
x[i] = 1
return x
sz = (10,10)
self.check(test_impl, np.empty(sz), sz)

@skip_parfors_unsupported
class TestParforsLeaks(MemoryLeakMixin, TestParforsBase):
Expand Down