Merge pull request #4210 from fvisin/fix_docgen_cuda

theano/misc/pycuda_init.py

@@ -28,7 +28,7 @@ if (not hasattr(theano.sandbox, 'cuda') or
         import pycuda
         import pycuda.autoinit
         pycuda_available = True
-    except ImportError:
+    except (ImportError, RuntimeError):
         # presumably, the user wanted to use pycuda, else they wouldn't have
         # imported this module, so issue a warning that the import failed.
         warnings.warn("PyCUDA import failed in theano.misc.pycuda_init")

theano/sandbox/cuda/fftconv.py

@@ -6,11 +6,11 @@ import theano.tensor as T
 
 from theano.sandbox.cuda import cuda_available, GpuOp
 from theano.ifelse import ifelse
+from theano.misc.pycuda_init import pycuda_available
 
 if cuda_available:
     from theano.sandbox.cuda import (basic_ops, CudaNdarrayType,
                                      CudaNdarray)
-from theano.misc.pycuda_init import pycuda_available
 if pycuda_available:
     import pycuda.gpuarray
 
@@ -19,7 +19,7 @@ try:
     from scikits.cuda import fft, cublas
     scikits.cuda.misc.init()
     scikits_cuda_available = True
-except ImportError:
+except (ImportError, Exception):
     scikits_cuda_available = False
 
 
@@ -363,7 +363,7 @@ def mult_and_reduce(input_fft_v, filters_fft_v, input_shape=None,
 
     Parameters
     ----------
-    input_fft_v 
+    input_fft_v
         It's (b, ic, i0, i1//2 + 1, 2).
     filters_fft_v
         It's (oc, ic, i0, i1//2 + 1, 2).