提交 43cdd6e5 authored 作者: Ian Goodfellow's avatar Ian Goodfellow

switched to Olivier's preferred exception arguments format

more pep8 fixes
上级 e5584f03
...@@ -730,10 +730,11 @@ class Elemwise(Op): ...@@ -730,10 +730,11 @@ class Elemwise(Op):
if odat is not None: if odat is not None:
odat.resize(shape, refcheck = 0) odat.resize(shape, refcheck = 0)
else: else:
odat = numpy.ndarray(shape, dtype = output.type.dtype) odat = \
numpy.ndarray(shape, dtype = output.type.dtype)
storage[0] = odat storage[0] = odat
ufunc_args = inputs # + output_storage ufunc_args = inputs # + output_storage
if self.nfunc and len(inputs) == self.nfunc_spec[1]: if self.nfunc and len(inputs) == self.nfunc_spec[1]:
ufunc = self.nfunc ufunc = self.nfunc
nout = self.nfunc_spec[2] nout = self.nfunc_spec[2]
...@@ -745,9 +746,11 @@ class Elemwise(Op): ...@@ -745,9 +746,11 @@ class Elemwise(Op):
# optimization is probably not worth the effort, since we # optimization is probably not worth the effort, since we
# should normally run the C version of the Op. # should normally run the C version of the Op.
else: else:
# the second calling form is used because in certain versions of numpy # the second calling form is
#used because in certain versions of numpy
# the first (faster) version leads to segfaults # the first (faster) version leads to segfaults
ufunc = self.ufunc or numpy.frompyfunc(self.scalar_op.impl, len(inputs), self.scalar_op.nout) ufunc = self.ufunc or \
numpy.frompyfunc(self.scalar_op.impl, len(inputs), self.scalar_op.nout)
nout = ufunc.nout nout = ufunc.nout
try: try:
...@@ -767,13 +770,13 @@ class Elemwise(Op): ...@@ -767,13 +770,13 @@ class Elemwise(Op):
errormsg += 'outputs are: \n' errormsg += 'outputs are: \n'
for i, output in enumerate(node.outputs): for i, output in enumerate(node.outputs):
errormsg += '(' + str(i) + ') ' + \ errormsg += '(' + str(i) + ') ' + \
min_informative_str(output)+'\n' min_informative_str(output) + '\n'
errormsg += 'original exception was: ' + \ errormsg += 'original exception was: ' + \
'\n'.join( \ '\n'.join( \
traceback.format_exception_only(*sys.exc_info()[0:2])) traceback.format_exception_only(*sys.exc_info()[0:2]))
raise Exception(errormsg) raise Exception(errormsg)
else: else:
e.args = (e.args, errormsg) e.args = e.args + (errormsg, )
raise raise
if nout == 1: if nout == 1:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论