Skip to content

Commit

Permalink
Merge pull request #6089 from stuartarchibald/fix/6088
Browse files Browse the repository at this point in the history 
Fix invalid reference to TypingError
  • Loading branch information
@sklam
sklam committed Aug 11, 2020
2 parents fbe65c2 + da3e3f3 commit 46ebd2e
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 41 deletions.
1 change: 0 additions & 1 deletion .flake8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ exclude =
numba/core/rewrites/static_binop.py
numba/core/rewrites/ir_print.py
numba/core/types/abstract.py
numba/core/types/functions.py
numba/core/types/misc.py
numba/core/types/npytypes.py
numba/core/types/common.py
Expand Down
87 changes: 47 additions & 40 deletions numba/core/types/functions.py
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import traceback
from collections import namedtuple, defaultdict
import inspect
import itertools
import logging
import textwrap
from os import path
from shutil import get_terminal_size

from .abstract import Callable, DTypeSpec, Dummy, Literal, Type, weakref
from .common import Opaque
from .misc import unliteral
from numba.core import errors, utils, types, config
import numba


_logger = logging.getLogger(__name__)

Expand All @@ -33,28 +31,33 @@
" - Of which {nmatches} did not match due to:\n
"""


def _wrapper(tmp, indent=0):
return textwrap.indent(tmp, ' ' * indent, lambda line: True)
return textwrap.indent(tmp, ' ' * indent, lambda line: True)


_overload_template = ("- Of which {nduplicates} did not match due to:\n"
"{kind} {inof} function '{function}': File: {file}: "
"Line {line}.\n With argument(s): '({args})':")

_err_reasons = {}
_err_reasons['specific_error'] = ("Rejected as the implementation raised a "
"specific error:\n{}")

_err_reasons = {'specific_error': "Rejected as the implementation raised a "
"specific error:\n{}"}


def _bt_as_lines(bt):
"""
Converts a backtrace into a list of lines, squashes it a bit on the way.
"""
return [y for y in itertools.chain(*[x.split('\n') for x in bt]) if y]


def argsnkwargs_to_str(args, kwargs):
buf = [str(a) for a in tuple(args)]
buf.extend(["{}={}".format(k, v) for k, v in kwargs.items()])
return ', '.join(buf)


class _ResolutionFailures(object):
"""Collect and format function resolution failures.
"""
Expand Down Expand Up @@ -93,7 +96,6 @@ def format(self):
argstr = argsnkwargs_to_str(self._args, self._kwargs)
ncandidates = sum([len(x) for x in self._failures.values()])


# sort out a display name for the function
tykey = self._function_type.typing_key
# most things have __name__
Expand Down Expand Up @@ -152,27 +154,27 @@ def template_info(tp):

msgbuf.append(_termcolor.errmsg(
_wrapper(_overload_template.format(nduplicates=nduplicates,
kind = source_kind.title(),
function=fname,
inof='of',
file=source_file,
line=source_lines,
args=largstr),
ldepth + 1)))
kind=source_kind.title(),
function=fname,
inof='of',
file=source_file,
line=source_lines,
args=largstr),
ldepth + 1)))
msgbuf.append(_termcolor.highlight(_wrapper(err.error,
ldepth + 2)))
else:
# There was at least one match in this failure class, but it
# failed for a specific reason try and report this.
msgbuf.append(_termcolor.errmsg(
_wrapper(_overload_template.format(nduplicates=nduplicates,
kind = source_kind.title(),
function=source_name,
inof='in',
file=source_file,
line=source_lines[0],
args=largstr),
ldepth + 1)))
kind=source_kind.title(),
function=source_name,
inof='in',
file=source_file,
line=source_lines[0],
args=largstr),
ldepth + 1)))

if isinstance(error, BaseException):
reason = indent + self.format_error(error)
Expand All @@ -190,7 +192,7 @@ def template_info(tp):
bt_as_lines = _bt_as_lines(bt)
nd2indent = '\n{}'.format(2 * indent)
errstr += _termcolor.reset(nd2indent +
nd2indent.join(bt_as_lines))
nd2indent.join(bt_as_lines))
msgbuf.append(_termcolor.highlight(_wrapper(errstr,
ldepth + 2)))
loc = self.get_loc(template, error)
Expand Down Expand Up @@ -230,7 +232,7 @@ def _unlit_non_poison(ty):
out = unliteral(ty)
if isinstance(out, types.Poison):
m = f"Poison type used in arguments; got {out}"
raise TypingError(m)
raise errors.TypingError(m)
return out


Expand Down Expand Up @@ -351,7 +353,7 @@ def __init__(self, template, this):

def unify(self, typingctx, other):
if (isinstance(other, BoundFunction) and
self.typing_key == other.typing_key):
self.typing_key == other.typing_key):
this = typingctx.unify_pairs(self.this, other.this)
if this is not None:
# XXX is it right that both template instances are distinct?
Expand Down Expand Up @@ -391,16 +393,16 @@ def get_call_type(self, context, args, kws):
else:
break
else:
# if the unliteral_args and unliteral_kws are the same as the literal
# ones, set up to not bother retrying
# if the unliteral_args and unliteral_kws are the same as the
# literal ones, set up to not bother retrying
unliteral_args = tuple([_unlit_non_poison(a) for a in args])
unliteral_kws = {k: _unlit_non_poison(v)
for k, v in kws.items()}
skip = unliteral_args == args and kws == unliteral_kws

# If the above template application failed and the non-literal args are
# different to the literal ones, try again with literals rewritten as
# non-literals
# If the above template application failed and the non-literal
# args are different to the literal ones, try again with
# literals rewritten as non-literals
if not skip and out is None:
try:
out = template.apply(unliteral_args, unliteral_kws)
Expand All @@ -420,6 +422,7 @@ def get_call_type(self, context, args, kws):
tmplt = _termcolor.highlight(header)
if config.DEVELOPER_MODE:
indent = ' ' * 4

def add_bt(error):
if isinstance(error, BaseException):
# if the error is an actual exception instance, trace it
Expand All @@ -429,7 +432,7 @@ def add_bt(error):
bt = [""]
nd2indent = '\n{}'.format(2 * indent)
errstr = _termcolor.reset(nd2indent +
nd2indent.join(_bt_as_lines(bt)))
nd2indent.join(_bt_as_lines(bt)))
return _termcolor.reset(errstr)
else:
add_bt = lambda X: ''
Expand All @@ -444,12 +447,12 @@ def nested_msg(literalness, e):
nested_msg('non-literal', nonliteral_e))
return out


def get_call_signatures(self):
sigs = getattr(self.template, 'cases', [])
is_param = hasattr(self.template, 'generic')
return sigs, is_param


class MakeFunctionLiteral(Literal, Opaque):
pass

Expand Down Expand Up @@ -493,7 +496,8 @@ def __init__(self, dispatcher):
super(Dispatcher, self).__init__("type(%s)" % dispatcher)

def dump(self, tab=''):
print(f'{tab}DUMP {type(self).__name__}[code={self._code}, name={self.name}]')
print((f'{tab}DUMP {type(self).__name__}[code={self._code}, '
f'name={self.name}]'))
self.dispatcher.dump(tab=tab + ' ')
print(f'{tab}END DUMP')

Expand All @@ -503,7 +507,8 @@ def get_call_type(self, context, args, kws):
A signature returned and it is ensured that a compiled specialization
is available for it.
"""
template, pysig, args, kws = self.dispatcher.get_call_template(args, kws)
template, pysig, args, kws = \
self.dispatcher.get_call_template(args, kws)
sig = template(context).apply(args, kws)
if sig:
sig = sig.replace(pysig=pysig)
Expand All @@ -516,7 +521,8 @@ def get_call_signatures(self):
@property
def dispatcher(self):
"""
A strong reference to the underlying numba.dispatcher.Dispatcher instance.
A strong reference to the underlying numba.dispatcher.Dispatcher
instance.
"""
return self._get_object()

Expand Down Expand Up @@ -566,8 +572,8 @@ class GilRequiringDefn(AbstractTemplate):
def generic(self, args, kws):
if kws:
raise TypeError("does not support keyword arguments")
# Make ffi_forced_object a bottom type to allow any type to be
# casted to it. This is the only place that support
# Make ffi_forced_object a bottom type to allow any type to
# be casted to it. This is the only place that support
# ffi_forced_object.
coerced = [actual if formal == ffi_forced_object else formal
for actual, formal
Expand All @@ -585,8 +591,8 @@ def key(self):

class ExternalFunction(Function):
"""
A named native function (resolvable by LLVM) accepting an explicit signature.
For internal use only.
A named native function (resolvable by LLVM) accepting an explicit
signature. For internal use only.
"""

def __init__(self, symbol, sig):
Expand All @@ -612,7 +618,8 @@ def __init__(self, instance_class):
super(NamedTupleClass, self).__init__(name)

def get_call_type(self, context, args, kws):
# Overridden by the __call__ constructor resolution in typing.collections
# Overridden by the __call__ constructor resolution in
# typing.collections
return None

def get_call_signatures(self):
Expand Down

0 comments on commit 46ebd2e

Please sign in to comment.