AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Cherry pick 5c6b85 from KhronosGroup/OpenCL-CLHPP

Telusuri Sumber 
Updates cl2.hpp and cl.hpp to handle case of platform with zero devices without error.

Change-Id: I6190c65ebf894b3a26579c54e96881c334346358
This commit is contained in:
Vlad Sytchenko
2020-04-10 16:22:53 -04:00
committed by Vladislav Sytchenko
orang tua 17d5d73ff2
melakukan 0779b034c4
2 mengubah file dengan 17 tambahan dan 10 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
opencl/khronos/headers/opencl2.2/CL/cl.hpp
+11 -6
Melihat File
@@ -2240,17 +2240,22 @@ public:
return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR);
}
cl_int err = ::clGetDeviceIDs(object_, type, 0, NULL, &n);
if (err != CL_SUCCESS) {
if (err != CL_SUCCESS && err != CL_DEVICE_NOT_FOUND) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
}
cl_device_id* ids = (cl_device_id*) alloca(n * sizeof(cl_device_id));
err = ::clGetDeviceIDs(object_, type, n, ids, NULL);
if (err != CL_SUCCESS) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
if (n > 0) {
cl_device_id* ids = (cl_device_id*) alloca(n * sizeof(cl_device_id));
err = ::clGetDeviceIDs(object_, type, n, ids, NULL);
if (err != CL_SUCCESS) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
}
devices->assign(&ids[0], &ids[n]);
} else {
devices->clear();
}
devices->assign(&ids[0], &ids[n]);
return CL_SUCCESS;
}
opencl/khronos/headers/opencl2.2/CL/cl2.hpp
+6 -4
Melihat File
@@ -2349,14 +2349,16 @@ public:
return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR);
}
cl_int err = ::clGetDeviceIDs(object_, type, 0, NULL, &n);
if (err != CL_SUCCESS) {
if (err != CL_SUCCESS && err != CL_DEVICE_NOT_FOUND) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
}
vector<cl_device_id> ids(n);
err = ::clGetDeviceIDs(object_, type, n, ids.data(), NULL);
if (err != CL_SUCCESS) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
if (n>0) {
err = ::clGetDeviceIDs(object_, type, n, ids.data(), NULL);
if (err != CL_SUCCESS) {
return detail::errHandler(err, __GET_DEVICE_IDS_ERR);
}
}
// Cannot trivially assign because we need to capture intermediates