提交 7d354827 authored 作者: Olivier Delalleau's avatar Olivier Delalleau

PEP8

上级 6add7735
...@@ -127,7 +127,8 @@ class DimShuffle(Op): ...@@ -127,7 +127,8 @@ class DimShuffle(Op):
for i, j in enumerate(new_order): for i, j in enumerate(new_order):
if j != 'x': if j != 'x':
# There is a bug in numpy that results in isinstance(x, int) returning False for numpy integers. # There is a bug in numpy that results in isinstance(x, int)
# returning False for numpy integers.
# See <http://projects.scipy.org/numpy/ticket/2235>. # See <http://projects.scipy.org/numpy/ticket/2235>.
if not isinstance(j, (int, numpy.integer)): if not isinstance(j, (int, numpy.integer)):
raise TypeError( raise TypeError(
...@@ -135,7 +136,7 @@ class DimShuffle(Op): ...@@ -135,7 +136,7 @@ class DimShuffle(Op):
if j >= len(input_broadcastable): if j >= len(input_broadcastable):
raise ValueError(("new_order[%d] is %d, but the input " raise ValueError(("new_order[%d] is %d, but the input "
"only has %d axes.") % "only has %d axes.") %
(i,j,len(input_broadcastable))) (i, j, len(input_broadcastable)))
if j in new_order[(i + 1):]: if j in new_order[(i + 1):]:
raise ValueError(( raise ValueError((
"The same input dimension may not appear twice in the " "The same input dimension may not appear twice in the "
...@@ -659,11 +660,9 @@ class Elemwise(Op): ...@@ -659,11 +660,9 @@ class Elemwise(Op):
def grad(self, inputs, ograds): def grad(self, inputs, ograds):
outs = self(*inputs) outs = self(*inputs)
if not isinstance(outs, (list,tuple)): if not isinstance(outs, (list, tuple)):
outs = [ outs ] outs = [outs]
#compute grad with respect to broadcasted input #compute grad with respect to broadcasted input
rval = self._bgrad(inputs, ograds) rval = self._bgrad(inputs, ograds)
...@@ -694,7 +693,6 @@ class Elemwise(Op): ...@@ -694,7 +693,6 @@ class Elemwise(Op):
new_rval.append(elem) new_rval.append(elem)
return new_rval return new_rval
#sum out the broadcasted dimensions #sum out the broadcasted dimensions
for i, ipt in enumerate(inputs): for i, ipt in enumerate(inputs):
if rval[i] is None: if rval[i] is None:
...@@ -1183,7 +1181,8 @@ class CAReduce(Op): ...@@ -1183,7 +1181,8 @@ class CAReduce(Op):
if axis is None: if axis is None:
self.axis = axis self.axis = axis
# There is a bug in numpy that results in isinstance(x, int) returning False for numpy integers. # There is a bug in numpy that results in isinstance(x, int) returning
# False for numpy integers.
# See <http://projects.scipy.org/numpy/ticket/2235>. # See <http://projects.scipy.org/numpy/ticket/2235>.
elif isinstance(axis, (int, numpy.integer)): elif isinstance(axis, (int, numpy.integer)):
self.axis = (axis,) self.axis = (axis,)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论