Skip to content

Initial refactoring of parfor reduction lowering #7837

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 3 commits into from
Mar 1, 2022
Merged

Initial refactoring of parfor reduction lowering #7837

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f202c
Refactor parfor reduction lowering.
sklam Feb 5, 2022
30101bb
Add debug helper
sklam Feb 11, 2022
2b32ca8
Apply suggestions from code review
sklam Feb 25, 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
23 changes: 23 additions & 0 deletions numba/core/lowering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,29 @@ def debug_print(self, msg):
if config.DEBUG_JIT:
self.context.debug_print(self.builder, "DEBUGJIT: {0}".format(msg))

def print_variable(self, msg, varname):
"""Helper to emit ``print(msg, varname)`` for debugging.

Parameters
----------
msg : str
Literal string to be printed.
varname : str
A variable name whose value will be printed.
"""
argtys = (
types.literal(msg),
self.fndesc.typemap[varname]
)
args = (
self.context.get_dummy_value(),
self.loadvar(varname),
)
sig = typing.signature(types.none, *argtys)

impl = self.context.get_function(print, sig)
impl(self.builder, args)


class Lower(BaseLower):
GeneratorLower = generators.GeneratorLower
Expand Down
15 changes: 14 additions & 1 deletion numba/parfors/parfor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from collections import defaultdict, OrderedDict, namedtuple
from contextlib import contextmanager
import operator
from dataclasses import make_dataclass

import numba.core.ir
from numba.core import types, typing, utils, errors, ir, analysis, postproc, rewrites, typeinfer, config, ir_utils
Expand Down Expand Up @@ -3488,6 +3489,14 @@ def get_parfor_outputs(parfor, parfor_params):
outputs = list(set(outputs) & set(parfor_params))
return sorted(outputs)


_RedVarInfo = make_dataclass(
"_RedVarInfo",
["init_val", "reduce_nodes", "redop"],
frozen=True,
)


def get_parfor_reductions(func_ir, parfor, parfor_params, calltypes, reductions=None,
reduce_varnames=None, param_uses=None, param_nodes=None,
var_to_param=None):
Expand Down Expand Up @@ -3562,7 +3571,11 @@ def get_parfor_reductions(func_ir, parfor, parfor_params, calltypes, reductions=
else:
init_val = None
redop = None
reductions[param_name] = (init_val, reduce_nodes, redop)
reductions[param_name] = _RedVarInfo(
init_val=init_val,
reduce_nodes=reduce_nodes,
redop=redop,
)

return reduce_varnames, reductions

Expand Down
Loading