Merge pull request #6170 from abergeron/skip_gpu

theano/gpuarray/dnn_fwd.c

@@ -288,12 +288,12 @@ APPLY_SPECIFIC(conv_fwd)(PyGpuArrayObject *input, PyGpuArrayObject *kerns,
     err = cudnnConvolutionForward(
       params->handle,
       alpha_p,
-      APPLY_SPECIFIC(input), PyGpuArray_DEV_DATA(input) + input_offset * g,
-      APPLY_SPECIFIC(kerns), PyGpuArray_DEV_DATA(kerns) + kern_offset * g,
+      APPLY_SPECIFIC(input), ((char *)PyGpuArray_DEV_DATA(input)) + input_offset * g,
+      APPLY_SPECIFIC(kerns), ((char *)PyGpuArray_DEV_DATA(kerns)) + kern_offset * g,
       desc, algo,
       worksize == 0 ? NULL : *(void **)workspace, worksize,
       beta_p,
-      APPLY_SPECIFIC(output), PyGpuArray_DEV_DATA(*output) + output_offset * g);
+      APPLY_SPECIFIC(output), ((char *)PyGpuArray_DEV_DATA(*output)) + output_offset * g);
     }
 
     if (worksize != 0)

theano/gpuarray/dnn_gi.c

@@ -294,11 +294,11 @@ APPLY_SPECIFIC(conv_gi)(PyGpuArrayObject *kerns, PyGpuArrayObject *output,
     err = cudnnConvolutionBackwardData(
       params->handle,
       alpha_p,
-      APPLY_SPECIFIC(kerns), PyGpuArray_DEV_DATA(kerns) + kern_offset * g,
-      APPLY_SPECIFIC(output), PyGpuArray_DEV_DATA(output) + output_offset * g,
+      APPLY_SPECIFIC(kerns), ((char *)PyGpuArray_DEV_DATA(kerns)) + kern_offset * g,
+      APPLY_SPECIFIC(output), ((char *)PyGpuArray_DEV_DATA(output)) + output_offset * g,
       desc, algo, worksize == 0 ? NULL : *(void **)workspace, worksize,
       beta_p,
-      APPLY_SPECIFIC(input), PyGpuArray_DEV_DATA(*input) + input_offset * g);
+      APPLY_SPECIFIC(input), ((char *)PyGpuArray_DEV_DATA(*input)) + input_offset * g);
   }
 
   if (worksize != 0)

theano/gpuarray/dnn_gw.c

@@ -283,11 +283,11 @@ APPLY_SPECIFIC(conv_gw)(PyGpuArrayObject *input, PyGpuArrayObject *output,
     err = cudnnConvolutionBackwardFilter(
       params->handle,
       alpha_p,
-      APPLY_SPECIFIC(input), PyGpuArray_DEV_DATA(input) + input_offset * g ,
-      APPLY_SPECIFIC(output), PyGpuArray_DEV_DATA(output) + output_offset * g,
+      APPLY_SPECIFIC(input), ((char *)PyGpuArray_DEV_DATA(input)) + input_offset * g ,
+      APPLY_SPECIFIC(output), ((char *)PyGpuArray_DEV_DATA(output)) + output_offset * g,
       desc, algo, worksize == 0 ? NULL : *(void **)workspace, worksize,
       beta_p,
-      APPLY_SPECIFIC(kerns), PyGpuArray_DEV_DATA(*kerns) + kern_offset * g);
+      APPLY_SPECIFIC(kerns), ((char *)PyGpuArray_DEV_DATA(*kerns)) + kern_offset * g);
   }
 
   if (worksize != 0)

theano/gpuarray/tests/config.py

@@ -8,9 +8,11 @@ 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') and
         not theano.config.force_device):
-    theano.gpuarray.init_dev('cuda')
+    try:
+        theano.gpuarray.init_dev('cuda')
+    except Exception:
+        pass
 
 if not theano.gpuarray.pygpu_activated:
     raise SkipTest("pygpu disabled")