提交 af08db3b authored 作者: Gijs van Tulder's avatar Gijs van Tulder

Use the new built-in ftensor5 in the DNN tests.

上级 48a3cc39
...@@ -479,10 +479,9 @@ class TestDnnInferShapes(utt.InferShapeTester): ...@@ -479,10 +479,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
@parameterized.expand(product(border_modes, conv_modes), utt.custom_name_func) @parameterized.expand(product(border_modes, conv_modes), utt.custom_name_func)
def test_conv3d_none(self, border_mode, conv_mode): def test_conv3d_none(self, border_mode, conv_mode):
ftensor5 = T.TensorType(dtype="float32", broadcastable=(False,) * 5) self._test_conv(T.ftensor5('img'),
self._test_conv(ftensor5('img'), T.ftensor5('kerns'),
ftensor5('kerns'), T.ftensor5('out'),
ftensor5('out'),
numpy.random.rand(10, 2, 6, 4, 11), numpy.random.rand(10, 2, 6, 4, 11),
numpy.random.rand(8, 2, 4, 3, 1), numpy.random.rand(8, 2, 4, 3, 1),
border_mode, border_mode,
......
...@@ -938,10 +938,9 @@ class TestDnnInferShapes(utt.InferShapeTester): ...@@ -938,10 +938,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
def test_conv3d(self): def test_conv3d(self):
if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)): if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)):
raise SkipTest('"cuDNN 3D convolution requires cuDNN v2') raise SkipTest('"cuDNN 3D convolution requires cuDNN v2')
ftensor5 = T.TensorType(dtype="float32", broadcastable=(False,) * 5) img = T.ftensor5('img')
img = ftensor5('img') kerns = T.ftensor5('kerns')
kerns = ftensor5('kerns') out = T.ftensor5('out')
out = ftensor5('out')
img_val = numpy.asarray( img_val = numpy.asarray(
numpy.random.rand(10, 2, 6, 4, 11), numpy.random.rand(10, 2, 6, 4, 11),
dtype='float32' dtype='float32'
...@@ -1026,10 +1025,9 @@ class TestDnnInferShapes(utt.InferShapeTester): ...@@ -1026,10 +1025,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
def test_conv3d_gradw(self): def test_conv3d_gradw(self):
if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)): if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)):
raise SkipTest('"cuDNN 3D convolution requires cuDNN v2') raise SkipTest('"cuDNN 3D convolution requires cuDNN v2')
ftensor5 = T.TensorType(dtype="float32", broadcastable=(False,) * 5) img = T.ftensor5('img')
img = ftensor5('img') kerns = T.ftensor5('kerns')
kerns = ftensor5('kerns') out = T.ftensor5('out')
out = ftensor5('out')
img_val = numpy.asarray( img_val = numpy.asarray(
numpy.random.rand(9, 2, 4, 8, 13), numpy.random.rand(9, 2, 4, 8, 13),
dtype='float32' dtype='float32'
...@@ -1116,10 +1114,9 @@ class TestDnnInferShapes(utt.InferShapeTester): ...@@ -1116,10 +1114,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
def test_conv3d_gradi(self): def test_conv3d_gradi(self):
if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)): if not (cuda.dnn.dnn_available() and dnn.version() >= (2000, 2000)):
raise SkipTest('"cuDNN 3D convolution requires cuDNN v2') raise SkipTest('"cuDNN 3D convolution requires cuDNN v2')
ftensor5 = T.TensorType(dtype="float32", broadcastable=(False,) * 5) img = T.ftensor5('img')
img = ftensor5('img') kerns = T.ftensor5('kerns')
kerns = ftensor5('kerns') out = T.ftensor5('out')
out = ftensor5('out')
img_val = numpy.asarray( img_val = numpy.asarray(
numpy.random.rand(8, 4, 6, 7, 11), numpy.random.rand(8, 4, 6, 7, 11),
dtype='float32' dtype='float32'
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论