Merge pull request #2542 from peastman/cldevice

Catch exception when an OpenCL platform has no devices

platforms/opencl/src/OpenCLContext.cpp

@@ -104,7 +104,13 @@ OpenCLContext::OpenCLContext(const System& system, int platformIndex, int device
 
             string platformVendor = platforms[j].getInfo<CL_PLATFORM_VENDOR>();
             vector<cl::Device> devices;
-            platforms[j].getDevices(CL_DEVICE_TYPE_ALL, &devices);
+            try {
+                platforms[j].getDevices(CL_DEVICE_TYPE_ALL, &devices);
+            }
+            catch (...) {
+                // There are no devices available for this platform.
+                continue;
+            }
             if (deviceIndex < -1 || deviceIndex >= (int) devices.size())
                 throw OpenMMException("Illegal value for DeviceIndex: "+intToString(deviceIndex));
 

platforms/opencl/tests/TestOpenCLDeviceQuery.cpp

@@ -47,7 +47,13 @@ int main() {
 
     for (int j = 0; j < platforms.size(); j++) {
         vector<cl::Device> devices;
-        platforms[j].getDevices(CL_DEVICE_TYPE_ALL, &devices);
+        try {
+            platforms[j].getDevices(CL_DEVICE_TYPE_ALL, &devices);
+        }
+        catch (...) {
+            // There are no devices available for this platform.
+            continue;
+        }
 
         for (int i = 0; i < devices.size(); i++) {
             cl::Device d = devices[i];