Merged

theano/sandbox/cuda/tests/test_basic_ops.py

@@ -5,8 +5,14 @@ from theano import tensor
 
 import numpy
 
+# Skip test if cuda_ndarray is not available.
+from nose.plugins.skip import SkipTest
+try:
+    import cuda_ndarray
+except ImportError:
+    raise SkipTest('Optional package cuda_ndarray not available')
+
 import theano.sandbox.cuda as tcn
-import cuda_ndarray
 
 def tes_use():
     tcn.use()

theano/sandbox/cuda/tests/test_bench_loopfusion.py

@@ -267,6 +267,12 @@ def test_bench_elemwise(n_iter=1000, **kwargs):
         setattr(conf, k, kwargs[k])
 
     if conf.use_gpu:
+        # Skip test if cuda_ndarray is not available.
+        from nose.plugins.skip import SkipTest
+        try:
+            import cuda_ndarray
+        except ImportError:
+            raise SkipTest('Optional package cuda_ndarray not available')
         import theano.sandbox.cuda
         theano.sandbox.cuda.use()
 

theano/sandbox/cuda/tests/test_blas.py

@@ -5,6 +5,13 @@ from theano import tensor
 
 import numpy
 
+# Skip test if cuda_ndarray is not available.
+from nose.plugins.skip import SkipTest
+try:
+    import cuda_ndarray
+except ImportError:
+    raise SkipTest('Optional package cuda_ndarray not available')
+
 import theano.sandbox.cuda as tcn
 
 from theano.sandbox.downsample import DownsampleFactorMax

theano/sandbox/cuda/tests/test_nnet.py

@@ -11,6 +11,13 @@ import theano.sandbox.downsample
 
 import numpy
 
+# Skip test if cuda_ndarray is not available.
+from nose.plugins.skip import SkipTest
+try:
+    import cuda_ndarray
+except ImportError:
+    raise SkipTest('Optional package cuda_ndarray not available')
+
 import theano.sandbox.cuda as tcn
 
 import logging