Slight refactor of conv3d2d tests

theano/sandbox/cuda/tests/test_tensor_op.py

@@ -3,12 +3,14 @@ This file test tensor op that should also operate on CudaNdaray.
 """
 from __future__ import absolute_import, print_function, division
 from nose.plugins.skip import SkipTest
+from nose_parameterized import parameterized
 
 import numpy
 
 import theano
 from theano import tensor
 import theano.tensor as T
+import theano.tests.unittest_tools as utt
 
 # Skip test if cuda_ndarray is not available.
 import theano.sandbox.cuda as cuda
@@ -139,6 +141,8 @@ def test_get_diagonal_subtensor_view():
     test_conv3d2d.test_get_diagonal_subtensor_view(wrap=cuda.CudaNdarray)
 
 
-def test_conv3d():
-    test_conv3d2d.test_conv3d(mode=mode_with_gpu,
+@parameterized.expand(('valid', 'full'), utt.custom_name_func)
+def test_conv3d(border_mode):
+    test_conv3d2d.check_conv3d(border_mode=border_mode,
+                               mode=mode_with_gpu,
                                shared=cuda.shared_constructor)

theano/tensor/nnet/tests/test_conv3d2d.py

@@ -92,7 +92,15 @@ def check_diagonal_subtensor_view_traces(fn):
 
 
 @parameterized.expand(('valid', 'full'), utt.custom_name_func)
-def test_conv3d(border_mode, mode=mode_without_gpu, shared=theano.tensor._shared):
+def test_conv3d(border_mode):
+    check_conv3d(border_mode=border_mode,
+                 mode=mode_without_gpu,
+                 shared=theano.tensor._shared)
+
+
+# This function will also be used in theano/sandbox/cuda/tests/test_tensor_op.py,
+# which is not possible if it is decorated by @parameterized.expand
+def check_conv3d(border_mode, mode=mode_without_gpu, shared=theano.tensor._shared):
     if ndimage is None:
         raise SkipTest("conv3d2d tests need SciPy")