提交 61bc0cfd authored 作者: Vincent Michalski's avatar Vincent Michalski

fixed conv3d2d unit test

上级 65a3614b
...@@ -10,7 +10,6 @@ except ImportError: ...@@ -10,7 +10,6 @@ except ImportError:
from six.moves import xrange from six.moves import xrange
import theano import theano
import theano.sandbox.cuda as cuda
from theano.tensor.nnet.conv3d2d import * from theano.tensor.nnet.conv3d2d import *
import theano.tests.unittest_tools as utt import theano.tests.unittest_tools as utt
...@@ -75,13 +74,9 @@ def pyconv3d(signals, filters): ...@@ -75,13 +74,9 @@ def pyconv3d(signals, filters):
return rval return rval
def check_diagonal_subtensor_view_traces(fn): def check_diagonal_subtensor_view_traces(fn):
if cuda.cuda_available:
for apply_node in fn.maker.fgraph.apply_nodes: for apply_node in fn.maker.fgraph.apply_nodes:
print( 'apply_node.op: {0}'.format(apply_node.op, ))
print( 'apply_node: {0}'.format(apply_node, ))
print( 'apply_node.tag: {0}'.format(apply_node.tag, ))
if isinstance(apply_node.op, (DiagonalSubtensor, IncDiagonalSubtensor)): if isinstance(apply_node.op, (DiagonalSubtensor, IncDiagonalSubtensor)):
assert hasattr(apply_node.tag, 'trace') assert hasattr(apply_node.outputs[0].tag, 'trace')
def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared): def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared):
if ndimage is None: if ndimage is None:
...@@ -120,6 +115,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared): ...@@ -120,6 +115,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared):
(s_signals, gsignals)], (s_signals, gsignals)],
mode=mode, mode=mode,
name='grad') name='grad')
check_diagonal_subtensor_view_traces(gnewconv3d)
t0 = time.time() t0 = time.time()
gnewconv3d() gnewconv3d()
...@@ -154,6 +150,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared): ...@@ -154,6 +150,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared):
newconv3d = theano.function([], [], newconv3d = theano.function([], [],
updates={s_output: out}, updates={s_output: out},
mode=mode) mode=mode)
check_diagonal_subtensor_view_traces(newconv3d)
t0 = time.time() t0 = time.time()
newconv3d() newconv3d()
...@@ -165,6 +162,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared): ...@@ -165,6 +162,7 @@ def test_conv3d(mode=mode_without_gpu, shared=theano.tensor._shared):
(s_signals, gsignals)], (s_signals, gsignals)],
mode=mode, mode=mode,
name='grad') name='grad')
check_diagonal_subtensor_view_traces(gnewconv3d)
t0 = time.time() t0 = time.time()
gnewconv3d() gnewconv3d()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论