Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix opencv/opencv#20613

Browse Source 
* copy 4.x selectOpenCLDevice() -- it is compatible
* filter platforms rather than trying only first matching
* this works on 3.4 and 4.x master
pull/20689/head
Dale Phurrough 3 years ago
parent 1e0d290f2e
commit de1a459879
No known key found for this signature in database
GPG Key ID: E53384A29713D41F
1 changed files with 30 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      modules/core/src/ocl.cpp

59
modules/core/src/ocl.cpp
Unescape View File

@ -1670,7 +1670,7 @@ static bool parseOpenCLDeviceConfiguration(const std::string& configurationStr,
split(configurationStr, ':', parts); split(configurationStr, ':', parts);
if (parts.size() > 3) if (parts.size() > 3)
{ {
std::cerr << "ERROR: Invalid configuration string for OpenCL device" << std::endl; CV_LOG_ERROR(NULL, "OpenCL: Invalid configuration string for OpenCL device: " << configurationStr);
return false; return false;
} }
if (parts.size() > 2) if (parts.size() > 2)
@ -1687,22 +1687,20 @@ static bool parseOpenCLDeviceConfiguration(const std::string& configurationStr,
} }
#if defined WINRT || defined _WIN32_WCE #if defined WINRT || defined _WIN32_WCE
static cl_device_id selectOpenCLDevice() static cl_device_id selectOpenCLDevice(const char* configuration = NULL)
{ {
CV_UNUSED(configuration)
return NULL; return NULL;
} }
#else #else
// std::tolower is int->int static cl_device_id selectOpenCLDevice(const char* configuration = NULL)
static char char_tolower(char ch)
{
return (char)std::tolower((int)ch);
}
static cl_device_id selectOpenCLDevice()
{ {
std::string platform, deviceName; std::string platform, deviceName;
std::vector<std::string> deviceTypes; std::vector<std::string> deviceTypes;
const char* configuration = getenv("OPENCV_OPENCL_DEVICE"); if (!configuration)
configuration = getenv("OPENCV_OPENCL_DEVICE");
if (configuration && if (configuration &&
(strcmp(configuration, "disabled") == 0 || (strcmp(configuration, "disabled") == 0 ||
!parseOpenCLDeviceConfiguration(std::string(configuration), platform, deviceTypes, deviceName) !parseOpenCLDeviceConfiguration(std::string(configuration), platform, deviceTypes, deviceName)
@ -1747,22 +1745,24 @@ static cl_device_id selectOpenCLDevice()
platforms.resize(numPlatforms); platforms.resize(numPlatforms);
} }
int selectedPlatform = -1;
if (platform.length() > 0) if (platform.length() > 0)
{ {
for (size_t i = 0; i < platforms.size(); i++) for (std::vector<cl_platform_id>::iterator currentPlatform = platforms.begin(); currentPlatform != platforms.end();)
{ {
std::string name; std::string name;
CV_OCL_DBG_CHECK(getStringInfo(clGetPlatformInfo, platforms[i], CL_PLATFORM_NAME, name)); CV_OCL_DBG_CHECK(getStringInfo(clGetPlatformInfo, *currentPlatform, CL_PLATFORM_NAME, name));
if (name.find(platform) != std::string::npos) if (name.find(platform) != std::string::npos)
{ {
selectedPlatform = (int)i; ++currentPlatform;
break; }
else
{
currentPlatform = platforms.erase(currentPlatform);
} }
} }
if (selectedPlatform == -1) if (platforms.size() == 0)
{ {
std::cerr << "ERROR: Can't find OpenCL platform by name: " << platform << std::endl; CV_LOG_ERROR(NULL, "OpenCL: Can't find OpenCL platform by name: " << platform);
goto not_found; goto not_found;
} }
} }
@ -1781,7 +1781,7 @@ static cl_device_id selectOpenCLDevice()
{ {
int deviceType = 0; int deviceType = 0;
std::string tempStrDeviceType = deviceTypes[t]; std::string tempStrDeviceType = deviceTypes[t];
std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), char_tolower); std::transform(tempStrDeviceType.begin(), tempStrDeviceType.end(), tempStrDeviceType.begin(), details::char_tolower);
if (tempStrDeviceType == "gpu" || tempStrDeviceType == "dgpu" || tempStrDeviceType == "igpu") if (tempStrDeviceType == "gpu" || tempStrDeviceType == "dgpu" || tempStrDeviceType == "igpu")
deviceType = Device::TYPE_GPU; deviceType = Device::TYPE_GPU;
@ -1793,17 +1793,15 @@ static cl_device_id selectOpenCLDevice()
deviceType = Device::TYPE_ALL; deviceType = Device::TYPE_ALL;
else else
{ {
std::cerr << "ERROR: Unsupported device type for OpenCL device (GPU, CPU, ACCELERATOR): " << deviceTypes[t] << std::endl; CV_LOG_ERROR(NULL, "OpenCL: Unsupported device type for OpenCL device (GPU, CPU, ACCELERATOR): " << deviceTypes[t]);
goto not_found; goto not_found;
} }
std::vector<cl_device_id> devices; // TODO Use clReleaseDevice to cleanup std::vector<cl_device_id> devices;
for (int i = selectedPlatform >= 0 ? selectedPlatform : 0; for (std::vector<cl_platform_id>::iterator currentPlatform = platforms.begin(); currentPlatform != platforms.end(); ++currentPlatform)
(selectedPlatform >= 0 ? i == selectedPlatform : true) && (i < (int)platforms.size());
i++)
{ {
cl_uint count = 0; cl_uint count = 0;
cl_int status = clGetDeviceIDs(platforms[i], deviceType, 0, NULL, &count); cl_int status = clGetDeviceIDs(*currentPlatform, deviceType, 0, NULL, &count);
if (!(status == CL_SUCCESS || status == CL_DEVICE_NOT_FOUND)) if (!(status == CL_SUCCESS || status == CL_DEVICE_NOT_FOUND))
{ {
CV_OCL_DBG_CHECK_RESULT(status, "clGetDeviceIDs get count"); CV_OCL_DBG_CHECK_RESULT(status, "clGetDeviceIDs get count");
@ -1812,7 +1810,7 @@ static cl_device_id selectOpenCLDevice()
continue; continue;
size_t base = devices.size(); size_t base = devices.size();
devices.resize(base + count); devices.resize(base + count);
status = clGetDeviceIDs(platforms[i], deviceType, count, &devices[base], &count); status = clGetDeviceIDs(*currentPlatform, deviceType, count, &devices[base], &count);
if (!(status == CL_SUCCESS || status == CL_DEVICE_NOT_FOUND)) if (!(status == CL_SUCCESS || status == CL_DEVICE_NOT_FOUND))
{ {
CV_OCL_DBG_CHECK_RESULT(status, "clGetDeviceIDs get IDs"); CV_OCL_DBG_CHECK_RESULT(status, "clGetDeviceIDs get IDs");
@ -1844,13 +1842,16 @@ not_found:
if (!configuration) if (!configuration)
return NULL; // suppress messages on stderr return NULL; // suppress messages on stderr
std::cerr << "ERROR: Requested OpenCL device not found, check configuration: " << configuration << std::endl std::ostringstream msg;
<< " Platform: " << (platform.length() == 0 ? "any" : platform) << std::endl msg << "ERROR: Requested OpenCL device not found, check configuration: '" << configuration << "'" << std::endl
<< " Device types: "; << " Platform: " << (platform.length() == 0 ? "any" : platform) << std::endl
<< " Device types:";
for (size_t t = 0; t < deviceTypes.size(); t++) for (size_t t = 0; t < deviceTypes.size(); t++)
std::cerr << deviceTypes[t] << " "; msg << ' ' << deviceTypes[t];
msg << std::endl << " Device name: " << (deviceName.length() == 0 ? "any" : deviceName);
std::cerr << std::endl << " Device name: " << (deviceName.length() == 0 ? "any" : deviceName) << std::endl; CV_LOG_ERROR(NULL, msg.str());
return NULL; return NULL;
} }
#endif #endif

Write Preview
Loading…
Cancel
Save