Merge pull request Theano#232 from abergeron/maint

Stop using opencl0:0 as the default test device.

Author: nouiz

doc/installation.rst

@@ -191,13 +191,10 @@ directory and run this command:
 
 ::
 
-  python -c "import pygpu;pygpu.test()"
+  DEVICE="<test device>" python -c "import pygpu;pygpu.test()"
 
-By default it will attempt to run the test on 'opencl0:0'.  To use a
-different device set the environment variable DEVICE or
-GPUARRAY_DEVICE to the desired device name.  See the documentation for
-:py:meth:`pygpu.gpuarray.init` for more details on the syntax of the
-device name.
+See the documentation for :py:meth:`pygpu.gpuarray.init` for more
+details on the syntax of the device name.
 
 The test script prints the device name of the chosen device so that
 you can confirm which device it is running on.

pygpu/tests/support.py

@@ -26,7 +26,7 @@ def get_env_dev():
     for name in ['GPUARRAY_TEST_DEVICE', 'DEVICE']:
         if name in os.environ:
             return os.environ[name]
-    return "opencl0:0"
+    raise RuntimeError("No test device specified.  Specify one using the DEVICE or GPUARRAY_TEST_DEVICE environment variables.")
 
 
 context = gpuarray.init(get_env_dev())

tests/device.c

@@ -17,8 +17,8 @@ int get_env_dev(const char **name) {
   if (dev == NULL) {
     if ((dev = getenv("GPUARRAY_TEST_DEVICE")) == NULL) {
       if ((dev = getenv("DEVICE")) == NULL) {
-        *name = "opencl";
-        return 0; /* opencl0:0 */
+        fprintf(stderr, "No device specified for testing, specify a device with DEVICE or GPUARRAY_TEST_DEVICE");
+        return -1
       }
     }
   }