Merge pull request #175 from kylelutz/fix-platform-empty-devices

Fix errors when using platforms with no devices
boostorg · Jul 8, 2014 · bd164a2 · bd164a2
2 parents 5d6921f + 73443e0
commit bd164a2
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/include/boost/compute/platform.hpp b/include/boost/compute/platform.hpp
@@ -118,6 +118,10 @@ class platform
     std::vector<device> devices(cl_device_type type = CL_DEVICE_TYPE_ALL) const
     {
         size_t count = device_count(type);
+        if(count == 0){
+            // no devices for this platform
+            return std::vector<device>();
+        }
 
         std::vector<cl_device_id> device_ids(count);
         cl_int ret = clGetDeviceIDs(m_platform,
@@ -143,7 +147,14 @@ class platform
         cl_uint count = 0;
         cl_int ret = clGetDeviceIDs(m_platform, type, 0, 0, &count);
         if(ret != CL_SUCCESS){
-            BOOST_THROW_EXCEPTION(opencl_error(ret));
+            if(ret == CL_DEVICE_NOT_FOUND){
+                // no devices for this platform
+                return 0;
+            }
+            else {
+                // something else went wrong
+                BOOST_THROW_EXCEPTION(opencl_error(ret));
+            }
         }
 
         return count;