提交 1fef9423 authored 作者: Iban Harlouchet's avatar Iban Harlouchet 提交者: Frederic

flake8 fortheano/tensor/nnet/conv3d2d.py

上级 80a8289d
...@@ -194,13 +194,13 @@ def conv3d(signals, filters, ...@@ -194,13 +194,13 @@ def conv3d(signals, filters,
_signals_shape_5d[2], _signals_shape_5d[2],
_signals_shape_5d[3], _signals_shape_5d[3],
_signals_shape_5d[4], _signals_shape_5d[4],
) )
_filters_shape_4d = ( _filters_shape_4d = (
_filters_shape_5d[0] * _filters_shape_5d[1], _filters_shape_5d[0] * _filters_shape_5d[1],
_filters_shape_5d[2], _filters_shape_5d[2],
_filters_shape_5d[3], _filters_shape_5d[3],
_filters_shape_5d[4], _filters_shape_5d[4],
) )
if border_mode[1] != border_mode[2]: if border_mode[1] != border_mode[2]:
raise NotImplementedError('height and width bordermodes must match') raise NotImplementedError('height and width bordermodes must match')
...@@ -228,7 +228,7 @@ def conv3d(signals, filters, ...@@ -228,7 +228,7 @@ def conv3d(signals, filters,
_filters_shape_5d[1], # Tf _filters_shape_5d[1], # Tf
_signals_shape_5d[3] - _filters_shape_5d[3] + 1, _signals_shape_5d[3] - _filters_shape_5d[3] + 1,
_signals_shape_5d[4] - _filters_shape_5d[4] + 1, _signals_shape_5d[4] - _filters_shape_5d[4] + 1,
)) ))
elif border_mode[1] == 'full': elif border_mode[1] == 'full':
out_tmp = out_4d.reshape(( out_tmp = out_4d.reshape((
_signals_shape_5d[0], # Ns _signals_shape_5d[0], # Ns
...@@ -237,7 +237,7 @@ def conv3d(signals, filters, ...@@ -237,7 +237,7 @@ def conv3d(signals, filters,
_filters_shape_5d[1], # Tf _filters_shape_5d[1], # Tf
_signals_shape_5d[3] + _filters_shape_5d[3] - 1, _signals_shape_5d[3] + _filters_shape_5d[3] - 1,
_signals_shape_5d[4] + _filters_shape_5d[4] - 1, _signals_shape_5d[4] + _filters_shape_5d[4] - 1,
)) ))
elif border_mode[1] == 'same': elif border_mode[1] == 'same':
raise NotImplementedError() raise NotImplementedError()
else: else:
...@@ -246,15 +246,15 @@ def conv3d(signals, filters, ...@@ -246,15 +246,15 @@ def conv3d(signals, filters,
# now sum out along the Tf to get the output # now sum out along the Tf to get the output
# but we have to sum on a diagonal through the Tf and Ts submatrix. # but we have to sum on a diagonal through the Tf and Ts submatrix.
if border_mode[0] == 'valid': if border_mode[0] == 'valid':
if _filters_shape_5d[1]!=1: if _filters_shape_5d[1] != 1:
out_5d = diagonal_subtensor(out_tmp, 1, 3).sum(axis=3) out_5d = diagonal_subtensor(out_tmp, 1, 3).sum(axis=3)
else: # for Tf==1, no sum along Tf, the Ts-axis of the output is unchanged! else: # for Tf==1, no sum along Tf, the Ts-axis of the output is unchanged!
out_5d = out_tmp.reshape(( out_5d = out_tmp.reshape((
_signals_shape_5d[0], _signals_shape_5d[0],
_signals_shape_5d[1], _signals_shape_5d[1],
_filters_shape_5d[0], _filters_shape_5d[0],
_signals_shape_5d[3] - _filters_shape_5d[3] + 1, _signals_shape_5d[3] - _filters_shape_5d[3] + 1,
_signals_shape_5d[4] - _filters_shape_5d[4] + 1, _signals_shape_5d[4] - _filters_shape_5d[4] + 1,
)) ))
elif border_mode[0] in ('full', 'same'): elif border_mode[0] in ('full', 'same'):
raise NotImplementedError('sequence border mode', border_mode[0]) raise NotImplementedError('sequence border mode', border_mode[0])
...@@ -316,7 +316,7 @@ if cuda.cuda_available: ...@@ -316,7 +316,7 @@ if cuda.cuda_available:
def local_inplace_DiagonalSubtensor(node): def local_inplace_DiagonalSubtensor(node):
""" also work for IncDiagonalSubtensor """ """ also work for IncDiagonalSubtensor """
if (isinstance(node.op, (DiagonalSubtensor, IncDiagonalSubtensor)) and if (isinstance(node.op, (DiagonalSubtensor, IncDiagonalSubtensor)) and
not node.op.inplace): not node.op.inplace):
new_op = node.op.__class__(inplace=True) new_op = node.op.__class__(inplace=True)
new_node = new_op(*node.inputs) new_node = new_op(*node.inputs)
return [new_node] return [new_node]
......
...@@ -89,7 +89,6 @@ whitelist_flake8 = [ ...@@ -89,7 +89,6 @@ whitelist_flake8 = [
"tensor/signal/tests/test_conv.py", "tensor/signal/tests/test_conv.py",
"tensor/signal/tests/test_downsample.py", "tensor/signal/tests/test_downsample.py",
"tensor/nnet/__init__.py", "tensor/nnet/__init__.py",
"tensor/nnet/conv3d2d.py",
"tensor/nnet/conv.py", "tensor/nnet/conv.py",
"tensor/nnet/neighbours.py", "tensor/nnet/neighbours.py",
"tensor/nnet/tests/test_conv.py", "tensor/nnet/tests/test_conv.py",
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论