提交 549c2fdb authored 作者: Frederic's avatar Frederic

Partial fix

上级 1df727f0
......@@ -17,7 +17,7 @@ from theano.gof import (local_optimizer, EquilibriumDB, SequenceDB, ProxyDB,
Optimizer, toolbox)
from theano.gof.python25 import all, any
from theano.sandbox.cuda.basic_ops import (
device_properties, gpu_eye,
device_properties, gpu_eye, gpu_contiguous,
gpu_from_host, host_from_gpu, GpuFromHost, HostFromGpu,
GpuElemwise, GpuDimShuffle, GpuReshape, GpuCAReduce, GpuFlatten,
GpuSubtensor, GpuAdvancedSubtensor1,
......@@ -1289,8 +1289,10 @@ def local_conv_gemm(node):
node.op.border_mode == 'valid' and
node.op.subsample == (1, 1)):
print "WARNING, YOU ARE USING BUGGED CODE!"
return [GpuConvMM(node.op.border_mode)(node.inputs[0],
node.inputs[1],)]
img, kern = node.inputs
img = gpu_contiguous(img)
kern = gpu_contiguous(kern[:, :, ::-1, ::-1])
return [GpuConvMM(node.op.border_mode)(img, kern)]
gpu_optimizer.register("conv_gemm", local_conv_gemm)
......
......@@ -199,7 +199,7 @@ def _params_allgood(ishape, kshape, mode, subsample=(1, 1), img_stride=(1, 1),
rval = False
if rval:
rval = numpy.allclose(cpuval, gpuval, rtol=rtol)
assert numpy.all(numpy.isfinite(gpuval))
assert numpy.all(numpy.isfinite(gpuval)), gpuval
except NotImplementedError, e:
print >> sys.stdout, '_params_allgood Failed allclose', e
rval = False
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论