提交 6f0af857 authored 作者: Arnaud Bergeron's avatar Arnaud Bergeron 提交者: Pascal Lamblin

Some flake8 bugfixes.

上级 7a2a76c2
...@@ -21,7 +21,7 @@ from theano.tensor.signal.downsample import (DownsampleFactorMax, ...@@ -21,7 +21,7 @@ from theano.tensor.signal.downsample import (DownsampleFactorMax,
MaxPoolGrad, AveragePoolGrad) MaxPoolGrad, AveragePoolGrad)
from . import pygpu from . import pygpu
from .type import get_context, gpu_context_type, list_contexts from .type import get_context, gpu_context_type, list_contexts, GpuArrayType
from .basic_ops import (as_gpuarray_variable, infer_context_name, from .basic_ops import (as_gpuarray_variable, infer_context_name,
gpu_contiguous, HostFromGpu, gpu_contiguous, HostFromGpu,
GpuAllocEmpty, empty_like) GpuAllocEmpty, empty_like)
...@@ -837,7 +837,7 @@ def dnn_gradweight(img, topgrad, kerns_shp, border_mode='valid', ...@@ -837,7 +837,7 @@ def dnn_gradweight(img, topgrad, kerns_shp, border_mode='valid',
def dnn_gradinput(kerns, topgrad, img_shp, border_mode='valid', def dnn_gradinput(kerns, topgrad, img_shp, border_mode='valid',
subsample=(1, 1), conv_mode='conv'): subsample=(1, 1), conv_mode='conv'):
ctx_name = infer_context_name(img, topgrad) ctx_name = infer_context_name(kerns, topgrad)
kerns = gpu_contiguous(kerns) kerns = gpu_contiguous(kerns)
topgrad = gpu_contiguous(topgrad) topgrad = gpu_contiguous(topgrad)
img_shp = as_tensor_variable(img_shp) img_shp = as_tensor_variable(img_shp)
...@@ -1268,6 +1268,7 @@ def local_conv_dnn_alternative(node): ...@@ -1268,6 +1268,7 @@ def local_conv_dnn_alternative(node):
conv_groupopt.register('local_conv_dnn', local_conv_dnn, 20, conv_groupopt.register('local_conv_dnn', local_conv_dnn, 20,
'conv_dnn', 'fast_compile', 'fast_run', 'cudnn') 'conv_dnn', 'fast_compile', 'fast_run', 'cudnn')
@local_optimizer([AbstractConv2d, AbstractConv2d_gradWeights, @local_optimizer([AbstractConv2d, AbstractConv2d_gradWeights,
AbstractConv2d_gradInputs]) AbstractConv2d_gradInputs])
def local_abstractconv_cudnn(node): def local_abstractconv_cudnn(node):
......
...@@ -14,6 +14,7 @@ from theano.gof.optdb import LocalGroupDB ...@@ -14,6 +14,7 @@ from theano.gof.optdb import LocalGroupDB
from theano.scalar.basic import Scalar, Pow, Cast from theano.scalar.basic import Scalar, Pow, Cast
from theano.scan_module import scan_utils, scan_op, scan_opt from theano.scan_module import scan_utils, scan_op, scan_opt
from theano.tensor import as_tensor_variable
from theano.tensor.nnet.conv import ConvOp from theano.tensor.nnet.conv import ConvOp
from theano.tensor.nnet.abstract_conv2d import (BaseAbstractConv2d, from theano.tensor.nnet.abstract_conv2d import (BaseAbstractConv2d,
AbstractConv2d, AbstractConv2d,
...@@ -864,6 +865,7 @@ def local_lift_abstractconv2d(node, context_name): ...@@ -864,6 +865,7 @@ def local_lift_abstractconv2d(node, context_name):
as_gpuarray_variable(node.inputs[0], as_gpuarray_variable(node.inputs[0],
context_name=context_name))] context_name=context_name))]
@register_opt() @register_opt()
@op_lifter([AbstractConv2d_gradWeights, @op_lifter([AbstractConv2d_gradWeights,
AbstractConv2d_gradInputs]) AbstractConv2d_gradInputs])
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论