Merge pull request #5870 from lamblin/fix_5869

theano/gpuarray/tests/config.py

@@ -8,7 +8,8 @@ if theano.gpuarray.pygpu is None:
     raise SkipTest("pygpu not installed")
 
 if (not theano.gpuarray.pygpu_activated and
-        not theano.config.init_gpu_device.startswith('gpu')):
+        not theano.config.init_gpu_device.startswith('gpu') and
+        not theano.config.force_device):
     theano.gpuarray.init_dev('cuda')
 
 if not theano.gpuarray.pygpu_activated:

theano/gpuarray/tests/test_cgpukernelbase.py

@@ -6,15 +6,10 @@ import theano
 from theano import tensor, config, Apply, Op
 from theano.gradient import grad_undefined
 
-from .config import mode_with_gpu, test_ctx_name
-
 from ..basic_ops import CGpuKernelBase
 from ..type import GpuArrayType, get_context
 
 
-from pygpu.gpuarray import dtype_to_typecode
-
-
 # This is an implementation to test that CGpuKernelBase works and also
 # to use as an example in the docs.  It is not used for user graphs.
 class GpuEye(CGpuKernelBase, Op):
@@ -58,10 +53,16 @@ class GpuEye(CGpuKernelBase, Op):
                 for i in xrange(2)]
 
     def get_op_params(self):
+        from pygpu.gpuarray import dtype_to_typecode
+
         return [('TYPECODE', str(dtype_to_typecode(self.dtype)))]
 
 
 def test_cgpukernelbase():
+    # Import inside the function to prevent the back-end from being
+    # initialized when reloading the GpuEye object from cache.
+    from .config import mode_with_gpu, test_ctx_name
+
     op = GpuEye(dtype='int32', context_name=test_ctx_name)
 
     f = theano.function([], op(4, 5), mode=mode_with_gpu)