提交 f6023d35 authored 作者: Pascal Lamblin's avatar Pascal Lamblin

Fix import paths

上级 19279ae2
...@@ -373,11 +373,11 @@ def local_gpu_conv(node): ...@@ -373,11 +373,11 @@ def local_gpu_conv(node):
gpu_conv = GpuConvOp_from_ConvOp(node.op) gpu_conv = GpuConvOp_from_ConvOp(node.op)
return [host_from_gpu(gpu_conv(gpu_from_host(img), gpu_from_host(kern)))] return [host_from_gpu(gpu_conv(gpu_from_host(img), gpu_from_host(kern)))]
import tensor.signal.downsample import theano.tensor.signal.downsample as downsample
@register_opt() @register_opt()
@local_optimizer([]) @local_optimizer([])
def local_gpu_downsample_factor_max(node): def local_gpu_downsample_factor_max(node):
if isinstance(node.op, tensor.signal.downsample.DownsampleFactorMax): if isinstance(node.op, downsample.DownsampleFactorMax):
x, = node.inputs x, = node.inputs
if (x.owner and x.owner.op == host_from_gpu): if (x.owner and x.owner.op == host_from_gpu):
gpu_ds = GpuDownsampleFactorMax(node.op.ds, node.op.ignore_border) gpu_ds = GpuDownsampleFactorMax(node.op.ds, node.op.ignore_border)
...@@ -386,7 +386,7 @@ def local_gpu_downsample_factor_max(node): ...@@ -386,7 +386,7 @@ def local_gpu_downsample_factor_max(node):
@register_opt() @register_opt()
@local_optimizer([]) @local_optimizer([])
def local_gpu_downsample_factor_max_grad(node): def local_gpu_downsample_factor_max_grad(node):
if isinstance(node.op, tensor.signal.downsample.DownsampleFactorMaxGrad): if isinstance(node.op, downsample.DownsampleFactorMaxGrad):
x,z,gz = node.inputs x,z,gz = node.inputs
if (x.owner and x.owner.op == host_from_gpu): if (x.owner and x.owner.op == host_from_gpu):
gpu_ds_grad = GpuDownsampleFactorMaxGrad(node.op.ds, node.op.ignore_border) gpu_ds_grad = GpuDownsampleFactorMaxGrad(node.op.ds, node.op.ignore_border)
......
...@@ -13,7 +13,7 @@ if cuda_ndarray.enable_cuda == False: ...@@ -13,7 +13,7 @@ if cuda_ndarray.enable_cuda == False:
import theano.sandbox.cuda as tcn import theano.sandbox.cuda as tcn
from tensor.signal.downsample import DownsampleFactorMax from theano.tensor.signal.downsample import DownsampleFactorMax
import theano.compile.mode import theano.compile.mode
......
...@@ -7,7 +7,7 @@ from theano import tensor ...@@ -7,7 +7,7 @@ from theano import tensor
import theano.tensor.nnet import theano.tensor.nnet
import theano.sandbox.conv import theano.sandbox.conv
import tensor.signal.downsample import theano.tensor.signal.downsample as downsample
import numpy import numpy
...@@ -307,7 +307,7 @@ def run_conv_nnet2_classif(use_gpu, isize, ksize, n_batch, n_iter, ...@@ -307,7 +307,7 @@ def run_conv_nnet2_classif(use_gpu, isize, ksize, n_batch, n_iter,
conv_op.set_flops() conv_op.set_flops()
conv_op1.set_flops() conv_op1.set_flops()
ds_op = tensor.signal.downsample.DownsampleFactorMax((2,2), ignore_border=False) ds_op = downsample.DownsampleFactorMax((2,2), ignore_border=False)
if downsample_ops: if downsample_ops:
hid = tensor.tanh(ds_op(conv_op(x, w0)+b0.dimshuffle((0,'x','x')))) hid = tensor.tanh(ds_op(conv_op(x, w0)+b0.dimshuffle((0,'x','x'))))
else: else:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论