提交 37fb0d6c authored 作者: Frederic's avatar Frederic

Remove now useless exception_verbosity extra info that is now added by default.

上级 8bfc9eb5
...@@ -7843,24 +7843,11 @@ class Dot(Op): ...@@ -7843,24 +7843,11 @@ class Dot(Op):
def perform(self, node, inp, out): def perform(self, node, inp, out):
x, y = inp x, y = inp
z, = out z, = out
try:
# the asarray is here because dot between two vectors # the asarray is here because dot between two vectors
# gives a numpy float object but we need to return a 0d # gives a numpy float object but we need to return a 0d
# ndarray # ndarray
z[0] = numpy.asarray(numpy.dot(x, y)) z[0] = numpy.asarray(numpy.dot(x, y))
except ValueError, e:
# The error raised by numpy has no shape information, we mean to
# add that
if config.exception_verbosity == 'high':
raise ValueError('dot product failed.\n'
'First arg dims: ' + str(x.shape) + '\n'
'Second arg dims: ' + str(y.shape) + '\n'
'First arg: \n' +
min_informative_str(node.inputs[0]) +
'\nSecond arg: \n' +
min_informative_str(node.inputs[1]))
e.args = e.args + (x.shape, y.shape)
raise
def grad(self, inp, grads): def grad(self, inp, grads):
......
...@@ -807,14 +807,7 @@ class Elemwise(Op): ...@@ -807,14 +807,7 @@ class Elemwise(Op):
base_exc_str = 'Dimension mismatch; shapes are %s' % ( base_exc_str = 'Dimension mismatch; shapes are %s' % (
', '.join(msg)) ', '.join(msg))
if config.exception_verbosity == 'high': raise ValueError(base_exc_str)
msg_chunks = [base_exc_str]
for i, ipt in enumerate(node.inputs):
msg_chunks.append('input %d: %s' %
(i, min_informative_str(ipt)))
raise ValueError('\n'.join(msg_chunks))
else:
raise ValueError(base_exc_str)
# Determine the shape of outputs # Determine the shape of outputs
out_shape = [] out_shape = []
...@@ -875,29 +868,7 @@ class Elemwise(Op): ...@@ -875,29 +868,7 @@ class Elemwise(Op):
self.scalar_op.nout)) self.scalar_op.nout))
nout = ufunc.nout nout = ufunc.nout
try: variables = ufunc(*ufunc_args)
variables = ufunc(*ufunc_args)
except Exception, e:
errormsg = ('While computing ' + str(node.outputs) +
': Failed calling ufunc for op ' +
str(self.scalar_op) +
' for params of shape ' +
str([arg.shape for arg in ufunc_args]))
if config.exception_verbosity == 'high':
errormsg += 'inputs are: \n'
for i, ipt in enumerate(node.inputs):
errormsg += '(' + str(i) + ') ' + \
min_informative_str(ipt) + '\n'
errormsg += 'outputs are: \n'
for i, output in enumerate(node.outputs):
errormsg += '(' + str(i) + ') ' + \
min_informative_str(output) + '\n'
errormsg += 'original exception was: ' + '\n'.join(
traceback.format_exception_only(*sys.exc_info()[0:2]))
e.args = e.args + (errormsg, )
raise
if nout == 1: if nout == 1:
variables = [variables] variables = [variables]
......
...@@ -4907,9 +4907,6 @@ class t_dot(unittest.TestCase): ...@@ -4907,9 +4907,6 @@ class t_dot(unittest.TestCase):
# Reported by Theano perform # Reported by Theano perform
e0.split()[0:4] e0.split()[0:4]
== ['Incompatible', 'shapes', 'for', 'gemv'] or == ['Incompatible', 'shapes', 'for', 'gemv'] or
# Reported by Theano when 'exception_verbosity' is set
# to 'high'.
e0.split()[0:3] == ['dot', 'product', 'failed.'],
e) e)
finally: finally:
_logger.setLevel(oldlevel) _logger.setLevel(oldlevel)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论