Catch exception by Theano 0.10+ on importing theano.sandbox.cuda

Lasagne · Feb 21, 2018 · 0334f76 · 0334f76
1 parent 8978b1d
commit 0334f76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lasagne/layers/corrmm.py b/lasagne/layers/corrmm.py
@@ -20,7 +20,7 @@
 if not gpu_enabled:
  try:
  from theano.sandbox import cuda as gpu
- except ImportError:
+ except Exception: # Theano 0.10+ raises nose.SkipTest
  gpu_enabled = False
  else:
  gpu_enabled = gpu.cuda_enabled

diff --git a/lasagne/layers/dnn.py b/lasagne/layers/dnn.py
@@ -23,7 +23,7 @@
  try:
  from theano.sandbox import cuda as gpu
  import theano.sandbox.cuda.dnn
- except ImportError:
+ except Exception: # Theano 0.10+ raises nose.SkipTest
  gpu_enabled = False
  else:
  gpu_enabled = gpu.cuda_enabled

diff --git a/lasagne/tests/layers/test_conv.py b/lasagne/tests/layers/test_conv.py
@@ -19,7 +19,7 @@
  from theano.sandbox import cuda
  theano_backend = "cuda_sandbox"
  gpu = cuda.cuda_enabled
- except ImportError:
+ except Exception: # Theano 0.10+ raises nose.SkipTest
  gpu = False
  if not gpu:
  theano_backend = "cpu"