mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor for clarity and avoiding code duplication

Browse Source 
Implement GArik's comments

Remove unnecessary c_str()

Fix brace position
This commit is contained in:
Christoph Bachhuber 2019-11-10 13:18:57 +01:00
parent ba58bba4e8
commit c638f085aa
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/core/include/opencv2/core/opencl/opencl_info.hpp
View File

@ -47,6 +47,23 @@ static std::string bytesToStringRepr(size_t value)
s = s.substr(0, s.size() - 1);
return s;
}
static String getDeviceTypeString(const cv::ocl::Device& device)
{
if (device.type() == cv::ocl::Device::TYPE_CPU) {
return "CPU";
}
if (device.type() == cv::ocl::Device::TYPE_GPU) {
if (device.hostUnifiedMemory()) {
return "iGPU";
} else {
return "dGPU";
}
}
return "unkown";
}
} // namespace
static void dumpOpenCLInformation()
@ -80,12 +97,11 @@ static void dumpOpenCLInformation()
for (int j = 0; j < platform->deviceNumber(); j++)
{
platform->getDevice(current_device, j);
const char* deviceTypeStr = (current_device.type() == Device::TYPE_CPU) ? "CPU" :
(current_device.type() == Device::TYPE_GPU ? current_device.hostUnifiedMemory() ? "iGPU" : "dGPU" : "unknown");
String deviceTypeStr = getDeviceTypeString(current_device);
DUMP_MESSAGE_STDOUT( " " << deviceTypeStr << ": " << current_device.name() << " (" << current_device.version() << ")");
DUMP_CONFIG_PROPERTY( cv::format("cv_ocl_platform_%d_device_%d", (int)i, j ),
cv::format("(Platform=%s)(Type=%s)(Name=%s)(Version=%s)",
platform->name().c_str(), deviceTypeStr, current_device.name().c_str(), current_device.version().c_str()) );
platform->name().c_str(), deviceTypeStr.c_str(), current_device.name().c_str(), current_device.version().c_str()) );
}
}
const Device& device = Device::getDefault();
@ -94,13 +110,7 @@ static void dumpOpenCLInformation()
DUMP_MESSAGE_STDOUT("Current OpenCL device: ");
#if 0
DUMP_MESSAGE_STDOUT(" Platform = " << device.getPlatform().name());
DUMP_CONFIG_PROPERTY("cv_ocl_current_platformName", device.getPlatform().name());
#endif
const char* deviceTypeStr = (device.type() == Device::TYPE_CPU) ? "CPU" :
(device.type() == Device::TYPE_GPU ? device.hostUnifiedMemory() ? "iGPU" : "dGPU" : "unknown");
String deviceTypeStr = getDeviceTypeString(device);
DUMP_MESSAGE_STDOUT(" Type = " << deviceTypeStr);
DUMP_CONFIG_PROPERTY("cv_ocl_current_deviceType", deviceTypeStr);