Merge pull request #1553 from nouiz/fix_tests

theano/sandbox/gpuarray/tests/test_basic_ops.py

@@ -12,6 +12,9 @@ from numpy.testing.noseclasses import KnownFailureTest
 
 import theano.sandbox.gpuarray
 
+if theano.sandbox.gpuarray.pygpu is None:
+    raise SkipTest("pygpu not installed")
+
 import theano.sandbox.cuda as cuda_ndarray
 if cuda_ndarray.cuda_available and not theano.sandbox.gpuarray.pygpu_activated:
     if not cuda_ndarray.use.device_number:

theano/tensor/tests/test_basic.py

@@ -1910,7 +1910,8 @@ class TestAlloc(unittest.TestCase):
         for (typ, shp) in [(vector, [3]), (matrix, [3,4])]:
             x = typ()
             ones_tensor = theano.function([x], [tensor.ones(x.shape)])
-            assert numpy.allclose(ones_tensor(numpy.zeros(shp)),
+            inp = numpy.zeros(shp, dtype=config.floatX)
+            assert numpy.allclose(ones_tensor(inp),
                                   numpy.ones(shp))
 
     def test_zeros(self):
@@ -1927,7 +1928,8 @@ class TestAlloc(unittest.TestCase):
         for (typ, shp) in [(vector, [3]), (matrix, [3,4])]:
             x = typ()
             zeros_tensor = theano.function([x], [tensor.zeros(x.shape)])
-            assert numpy.allclose(zeros_tensor(numpy.zeros(shp)),
+            inp = numpy.zeros(shp, dtype=config.floatX)
+            assert numpy.allclose(zeros_tensor(inp),
                                   numpy.zeros(shp))