skip test if cuda not installed

theano/sandbox/cuda/tests/test_basic_ops.py

@@ -10,9 +10,8 @@ import theano.tensor as T
 
 # Skip test if cuda_ndarray is not available.
 from nose.plugins.skip import SkipTest
-try:
-    import theano.sandbox.cuda as cuda_ndarray
-except ImportError:
+import theano.sandbox.cuda as cuda_ndarray
+if cuda_ndarray.enable_cuda == False:
     raise SkipTest('Optional package cuda_ndarray not available')
 
 import theano.sandbox.cuda as tcn

theano/sandbox/cuda/tests/test_bench_loopfusion.py

@@ -269,9 +269,8 @@ def test_bench_elemwise(n_iter=1000, **kwargs):
     if conf.use_gpu:
         # Skip test if cuda_ndarray is not available.
         from nose.plugins.skip import SkipTest
-        try:
-            import cuda_ndarray
-        except ImportError:
+        import theano.sandbox.cuda as cuda_ndarray
+        if cuda_ndarray.enable_cuda == False:
             raise SkipTest('Optional package cuda_ndarray not available')
         import theano.sandbox.cuda
         theano.sandbox.cuda.use()

theano/sandbox/cuda/tests/test_blas.py

@@ -7,9 +7,8 @@ import numpy
 
 # Skip test if cuda_ndarray is not available.
 from nose.plugins.skip import SkipTest
-try:
-    import theano.sandbox.cuda as cuda_ndarray
-except ImportError:
+import theano.sandbox.cuda as cuda_ndarray
+if cuda_ndarray.enable_cuda == False:
     raise SkipTest('Optional package cuda_ndarray not available')
 
 import theano.sandbox.cuda as tcn

theano/sandbox/cuda/tests/test_conv_cuda_ndarray.py

 import sys, time
 import numpy
+# Skip test if cuda_ndarray is not available.
+from nose.plugins.skip import SkipTest
 import theano.sandbox.cuda as cuda_ndarray
+if cuda_ndarray.enable_cuda == False:
+    raise SkipTest('Optional package cuda_ndarray not available')
     
 def py_conv_valid_numpy(img, kern):
     assert img.shape[1] == kern.shape[1]

theano/sandbox/cuda/tests/test_cuda_ndarray.py

 import time, copy, sys
 import theano.sandbox.cuda as cuda_ndarray
+# Skip test if cuda_ndarray is not available.
+from nose.plugins.skip import SkipTest
+if cuda_ndarray.enable_cuda == False:
+        raise SkipTest('Optional package cuda_ndarray not available')
 import numpy
 
 def test_host_to_device():

theano/sandbox/cuda/tests/test_nnet.py

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

theano/sandbox/cuda/tests/test_opt.py

@@ -7,9 +7,8 @@ import numpy
 
 # Skip test if cuda_ndarray is not available.
 from nose.plugins.skip import SkipTest
-try:
-    import theano.sandbox.cuda as cuda_ndarray
-except ImportError:
+import theano.sandbox.cuda as cuda_ndarray
+if cuda_ndarray.enable_cuda == False:
     raise SkipTest('Optional package cuda_ndarray not available')
 
 import theano.compile.mode