From 58103c9d3bf44e8d75a0e6c7cec44b72208769df Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 9 Nov 2020 23:33:56 +0300 Subject: [PATCH] Patch for change numpy functions mapping Changed in 8ccfd36 and a77eab6 by @reazulhoque. Possibly this 2 changes are not related to each other. --- numba/np/npyimpl.py | 7 +------ numba/parfors/parfor.py | 5 ++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/numba/np/npyimpl.py b/numba/np/npyimpl.py index 1763b6a3f42..d1e65e72e80 100644 --- a/numba/np/npyimpl.py +++ b/numba/np/npyimpl.py @@ -448,12 +448,7 @@ def __init__(self, context, builder, outer_sig): super(_KernelImpl, self).__init__(context, builder, outer_sig) loop = ufunc_find_matching_loop( ufunc, outer_sig.args + tuple(_unpack_output_types(ufunc, outer_sig))) - - if hasattr(context, 'ufunc_db'): - self.fn = context.ufunc_db[ufunc].get(loop.ufunc_sig) - else: - self.fn = ufunc_db.get_ufunc_info(ufunc).get(loop.ufunc_sig) - + self.fn = ufunc_db.get_ufunc_info(ufunc).get(loop.ufunc_sig) self.inner_sig = _ufunc_loop_sig(loop.outputs, loop.inputs) if self.fn is None: diff --git a/numba/parfors/parfor.py b/numba/parfors/parfor.py index c73d99905dd..0f23e69843a 100644 --- a/numba/parfors/parfor.py +++ b/numba/parfors/parfor.py @@ -1350,7 +1350,7 @@ class PreParforPass(object): implementations of numpy functions if available. """ def __init__(self, func_ir, typemap, calltypes, typingctx, options, - swapped={}, replace_functions_map=replace_functions_map): + swapped={}): self.func_ir = func_ir self.typemap = typemap self.calltypes = calltypes @@ -1358,7 +1358,6 @@ def __init__(self, func_ir, typemap, calltypes, typingctx, options, self.options = options # diagnostics self.swapped = swapped - self.replace_functions_map = replace_functions_map self.stats = { 'replaced_func': 0, 'replaced_dtype': 0, @@ -1395,7 +1394,7 @@ def _replace_parallel_functions(self, blocks): def replace_func(): func_def = get_definition(self.func_ir, expr.func) callname = find_callname(self.func_ir, expr) - repl_func = self.replace_functions_map.get(callname, None) + repl_func = replace_functions_map.get(callname, None) # Handle method on array type if (repl_func is None and len(callname) == 2 and