Merge pull request #5390 from abergeron/fix_jenkins

theano/gpuarray/tests/test_opt.py

@@ -17,9 +17,9 @@ from ..basic_ops import (
 from ..blas import GpuGemm
 from ..elemwise import GpuCAReduceCuda, GpuCAReduceCPY, GpuElemwise
 from ..subtensor import GpuSubtensor
-from ..linalg import GpuCusolverSolve
+from ..linalg import GpuCusolverSolve, cusolver_available
 
-from .config import mode_with_gpu, test_ctx_name
+from .config import mode_with_gpu, test_ctx_name, SkipTest
 
 
 def test_local_assert():
@@ -501,6 +501,8 @@ def test_no_complex():
 
 
 def test_local_lift_solve():
+    if not cusolver_available:
+        raise SkipTest('No cuSolver')
     A = tensor.fmatrix()
     b = tensor.fmatrix()
     o = slinalg.solve(A, b)

theano/sandbox/cuda/tests/test_dnn.py

@@ -1023,9 +1023,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
 
     @parameterized.expand(product(border_modes, conv_modes), utt.custom_name_func)
     def test_conv_gradw(self, border_mode, conv_mode):
-        self._test_conv_gradw(T.tensor4('img'),
-                              T.tensor4('topgrad'),
-                              T.tensor4('kerns'),
+        self._test_conv_gradw(T.ftensor4('img'),
+                              T.ftensor4('topgrad'),
+                              T.ftensor4('kerns'),
                               (5, 2, 6, 13),
                               (1, 2, 3, 7),
                               border_mode,
@@ -1071,9 +1071,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
 
     @parameterized.expand(product(border_modes, conv_modes), utt.custom_name_func)
     def test_conv3d_gradw(self, border_mode, conv_mode):
-        self._test_conv3d_gradw(T.tensor5('img'),
-                                T.tensor5('topgrad'),
-                                T.tensor5('kerns'),
+        self._test_conv3d_gradw(T.ftensor5('img'),
+                                T.ftensor5('topgrad'),
+                                T.ftensor5('kerns'),
                                 (5, 2, 6, 13, 21),
                                 (1, 2, 3, 7, 9),
                                 border_mode,