fix missing "opencv2/core/opencl" headers from core module (updated install list)
#include <opencv2/core.hpp>
#include <opencv2/core/utils/trace.hpp>
+#include <opencv2/core/opencl/opencl_info.hpp>
+
int main(int argc, const char** argv)
{
CV_TRACE_FUNCTION();
cv::CommandLineParser parser(argc, argv,
"{ help h usage ? | | show this help message }"
"{ verbose v | | show build configuration log }"
+ "{ opencl | | show information about OpenCL (available platforms/devices, default selected device) }"
);
+
if (parser.has("help"))
{
parser.printMessage();
+ return 0;
}
- else if (parser.has("verbose"))
+
+ if (parser.has("verbose"))
{
std::cout << cv::getBuildInformation().c_str() << std::endl;
}
{
std::cout << CV_VERSION << std::endl;
}
+
+ if (parser.has("opencl"))
+ {
+ cv::dumpOpenCLInformation();
+ }
+
return 0;
}
<skip_headers>
opencv2/core/hal/intrin*
opencv2/core/cuda*
+ opencv2/core/opencl*
opencv2/core/private*
opencv/cxeigen.hpp
opencv2/core/eigen.hpp
file(GLOB lib_cuda_hdrs "include/opencv2/${name}/cuda/*.hpp" "include/opencv2/${name}/cuda/*.h")
file(GLOB lib_cuda_hdrs_detail "include/opencv2/${name}/cuda/detail/*.hpp" "include/opencv2/${name}/cuda/detail/*.h")
+file(GLOB_RECURSE module_opencl_hdrs "include/opencv2/${name}/opencl/*")
source_group("Include\\Cuda Headers" FILES ${lib_cuda_hdrs})
source_group("Include\\Cuda Headers\\Detail" FILES ${lib_cuda_hdrs_detail})
source_group("Src" FILES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version_string.inc")
ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version_string.inc"
- HEADERS ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
+ HEADERS ${module_opencl_hdrs} ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS})
if(ANDROID AND HAVE_CPUFEATURES)
--- /dev/null
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#include <iostream>
+
+#include <opencv2/core.hpp>
+#include <opencv2/core/ocl.hpp>
+
+#ifndef DUMP_CONFIG_PROPERTY
+#define DUMP_CONFIG_PROPERTY(...)
+#endif
+
+#ifndef DUMP_MESSAGE_STDOUT
+#define DUMP_MESSAGE_STDOUT(...) do { std::cout << __VA_ARGS__ << std::endl; } while (false)
+#endif
+
+namespace cv {
+
+namespace {
+static std::string bytesToStringRepr(size_t value)
+{
+ size_t b = value % 1024;
+ value /= 1024;
+
+ size_t kb = value % 1024;
+ value /= 1024;
+
+ size_t mb = value % 1024;
+ value /= 1024;
+
+ size_t gb = value;
+
+ std::ostringstream stream;
+
+ if (gb > 0)
+ stream << gb << " GB ";
+ if (mb > 0)
+ stream << mb << " MB ";
+ if (kb > 0)
+ stream << kb << " KB ";
+ if (b > 0)
+ stream << b << " B";
+
+ std::string s = stream.str();
+ if (s[s.size() - 1] == ' ')
+ s = s.substr(0, s.size() - 1);
+ return s;
+}
+} // namespace
+
+static void dumpOpenCLInformation()
+{
+ using namespace cv::ocl;
+
+ try
+ {
+ if (!haveOpenCL() || !useOpenCL())
+ {
+ DUMP_MESSAGE_STDOUT("OpenCL is disabled");
+ DUMP_CONFIG_PROPERTY("cv_ocl", "disabled");
+ return;
+ }
+
+ std::vector<PlatformInfo> platforms;
+ cv::ocl::getPlatfomsInfo(platforms);
+ if (platforms.size() > 0)
+ {
+ DUMP_MESSAGE_STDOUT("OpenCL Platforms: ");
+ for (size_t i = 0; i < platforms.size(); i++)
+ {
+ const PlatformInfo* platform = &platforms[i];
+ DUMP_MESSAGE_STDOUT(" " << platform->name().c_str());
+ Device current_device;
+ 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");
+ DUMP_MESSAGE_STDOUT( " " << deviceTypeStr << ": " << current_device.name().c_str() << " (" << current_device.version().c_str() << ")");
+ DUMP_CONFIG_PROPERTY( cv::format("cv_ocl_platform_%d_device_%d", (int)i, (int)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()) );
+ }
+ }
+ }
+ else
+ {
+ DUMP_MESSAGE_STDOUT("OpenCL is not available");
+ DUMP_CONFIG_PROPERTY("cv_ocl", "not available");
+ return;
+ }
+
+ const Device& device = Device::getDefault();
+ if (!device.available())
+ CV_ErrorNoReturn(Error::OpenCLInitError, "OpenCL device is not available");
+
+ 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");
+ DUMP_MESSAGE_STDOUT(" Type = " << deviceTypeStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_deviceType", deviceTypeStr);
+
+ DUMP_MESSAGE_STDOUT(" Name = " << device.name());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_deviceName", device.name());
+
+ DUMP_MESSAGE_STDOUT(" Version = " << device.version());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_deviceVersion", device.version());
+
+ DUMP_MESSAGE_STDOUT(" Driver version = " << device.driverVersion());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_driverVersion", device.driverVersion());
+
+ DUMP_MESSAGE_STDOUT(" Address bits = " << device.addressBits());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_addressBits", device.addressBits());
+
+ DUMP_MESSAGE_STDOUT(" Compute units = " << device.maxComputeUnits());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_maxComputeUnits", device.maxComputeUnits());
+
+ DUMP_MESSAGE_STDOUT(" Max work group size = " << device.maxWorkGroupSize());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_maxWorkGroupSize", device.maxWorkGroupSize());
+
+ std::string localMemorySizeStr = bytesToStringRepr(device.localMemSize());
+ DUMP_MESSAGE_STDOUT(" Local memory size = " << localMemorySizeStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_localMemSize", device.localMemSize());
+
+ std::string maxMemAllocSizeStr = bytesToStringRepr(device.maxMemAllocSize());
+ DUMP_MESSAGE_STDOUT(" Max memory allocation size = " << maxMemAllocSizeStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_maxMemAllocSize", device.maxMemAllocSize());
+
+ const char* doubleSupportStr = device.doubleFPConfig() > 0 ? "Yes" : "No";
+ DUMP_MESSAGE_STDOUT(" Double support = " << doubleSupportStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_haveDoubleSupport", device.doubleFPConfig() > 0);
+
+ const char* isUnifiedMemoryStr = device.hostUnifiedMemory() ? "Yes" : "No";
+ DUMP_MESSAGE_STDOUT(" Host unified memory = " << isUnifiedMemoryStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_hostUnifiedMemory", device.hostUnifiedMemory());
+
+ DUMP_MESSAGE_STDOUT(" Device extensions:");
+ String extensionsStr = device.extensions();
+ size_t pos = 0;
+ while (pos < extensionsStr.size())
+ {
+ size_t pos2 = extensionsStr.find(' ', pos);
+ if (pos2 == String::npos)
+ pos2 = extensionsStr.size();
+ if (pos2 > pos)
+ {
+ String extensionName = extensionsStr.substr(pos, pos2 - pos);
+ DUMP_MESSAGE_STDOUT(" " << extensionName);
+ }
+ pos = pos2 + 1;
+ }
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_extensions", extensionsStr.c_str());
+
+ const char* haveAmdBlasStr = haveAmdBlas() ? "Yes" : "No";
+ DUMP_MESSAGE_STDOUT(" Has AMD Blas = " << haveAmdBlasStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_AmdBlas", haveAmdBlas());
+
+ const char* haveAmdFftStr = haveAmdFft() ? "Yes" : "No";
+ DUMP_MESSAGE_STDOUT(" Has AMD Fft = " << haveAmdFftStr);
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_AmdFft", haveAmdFft());
+
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width char = " << device.preferredVectorWidthChar());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthChar", device.preferredVectorWidthChar());
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width short = " << device.preferredVectorWidthShort());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthShort", device.preferredVectorWidthShort());
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width int = " << device.preferredVectorWidthInt());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthInt", device.preferredVectorWidthInt());
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width long = " << device.preferredVectorWidthLong());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthLong", device.preferredVectorWidthLong());
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width float = " << device.preferredVectorWidthFloat());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthFloat", device.preferredVectorWidthFloat());
+
+ DUMP_MESSAGE_STDOUT(" Preferred vector width double = " << device.preferredVectorWidthDouble());
+ DUMP_CONFIG_PROPERTY("cv_ocl_current_preferredVectorWidthDouble", device.preferredVectorWidthDouble());
+ }
+ catch (...)
+ {
+ DUMP_MESSAGE_STDOUT("Exception. Can't dump OpenCL info");
+ DUMP_MESSAGE_STDOUT("OpenCL device not available");
+ DUMP_CONFIG_PROPERTY("cv_ocl", "not available");
+ }
+}
+#undef DUMP_MESSAGE_STDOUT
+#undef DUMP_CONFIG_PROPERTY
+
+} // namespace
ocv_list_filterout(opencv_hdrs "modules/cuda.*")
ocv_list_filterout(opencv_hdrs "modules/cudev")
ocv_list_filterout(opencv_hdrs "modules/core/.*/hal/")
+ocv_list_filterout(opencv_hdrs "modules/core/.*/opencl/")
ocv_list_filterout(opencv_hdrs "modules/.+/utils/.*")
ocv_list_filterout(opencv_hdrs "modules/.*\\\\.inl\\\\.h*")
ocv_list_filterout(opencv_hdrs "modules/.*_inl\\\\.h*")
#include "opencv2/ts/ocl_test.hpp"
-namespace cvtest {
-namespace ocl {
-
-using namespace cv;
-
-int test_loop_times = 1; // TODO Read from command line / environment
-
#ifdef HAVE_OPENCL
-#define DUMP_PROPERTY_XML(propertyName, propertyValue) \
+#define DUMP_CONFIG_PROPERTY(propertyName, propertyValue) \
do { \
std::stringstream ssName, ssValue;\
ssName << propertyName;\
std::cout << msg << std::endl; \
} while (false)
-static std::string bytesToStringRepr(size_t value)
-{
- size_t b = value % 1024;
- value /= 1024;
+#include <opencv2/core/opencl/opencl_info.hpp>
- size_t kb = value % 1024;
- value /= 1024;
+#endif // HAVE_OPENCL
- size_t mb = value % 1024;
- value /= 1024;
-
- size_t gb = value;
-
- std::ostringstream stream;
+namespace cvtest {
+namespace ocl {
- if (gb > 0)
- stream << gb << " GB ";
- if (mb > 0)
- stream << mb << " MB ";
- if (kb > 0)
- stream << kb << " kB ";
- if (b > 0)
- stream << b << " B";
+using namespace cv;
- return stream.str();
-}
+int test_loop_times = 1; // TODO Read from command line / environment
+#ifdef HAVE_OPENCL
void dumpOpenCLDevice()
{
- using namespace cv::ocl;
-
- try
- {
- if (!useOpenCL())
- {
- DUMP_MESSAGE_STDOUT("OpenCL is disabled");
- DUMP_PROPERTY_XML("cv_ocl", "disabled");
- return;
- }
-
- std::vector<PlatformInfo> platforms;
- cv::ocl::getPlatfomsInfo(platforms);
- if (platforms.size() > 0)
- {
- DUMP_MESSAGE_STDOUT("OpenCL Platforms: ");
- for (size_t i = 0; i < platforms.size(); i++)
- {
- const PlatformInfo* platform = &platforms[i];
- DUMP_MESSAGE_STDOUT(" " << platform->name().c_str());
- Device current_device;
- 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");
- DUMP_MESSAGE_STDOUT( " " << deviceTypeStr << ": " << current_device.name().c_str() << " (" << current_device.version().c_str() << ")");
- DUMP_PROPERTY_XML( cv::format("cv_ocl_platform_%d_device_%d", (int)i, (int)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()) );
- }
- }
- }
- else
- {
- DUMP_MESSAGE_STDOUT("OpenCL is not available");
- DUMP_PROPERTY_XML("cv_ocl", "not available");
- return;
- }
-
- const Device& device = Device::getDefault();
- if (!device.available())
- CV_ErrorNoReturn(CV_OpenCLInitError, "OpenCL device is not available");
-
- DUMP_MESSAGE_STDOUT("Current OpenCL device: ");
-
-#if 0
- DUMP_MESSAGE_STDOUT(" Platform = "<< device.getPlatform().name());
- DUMP_PROPERTY_XML("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");
- DUMP_MESSAGE_STDOUT(" Type = "<< deviceTypeStr);
- DUMP_PROPERTY_XML("cv_ocl_current_deviceType", deviceTypeStr);
-
- DUMP_MESSAGE_STDOUT(" Name = "<< device.name());
- DUMP_PROPERTY_XML("cv_ocl_current_deviceName", device.name());
-
- DUMP_MESSAGE_STDOUT(" Version = " << device.version());
- DUMP_PROPERTY_XML("cv_ocl_current_deviceVersion", device.version());
-
- DUMP_MESSAGE_STDOUT(" Driver version = " << device.driverVersion());
- DUMP_PROPERTY_XML("cv_ocl_current_driverVersion", device.driverVersion());
-
- DUMP_MESSAGE_STDOUT(" Address bits = " << device.addressBits());
- DUMP_PROPERTY_XML("cv_ocl_current_addressBits", device.addressBits());
-
- DUMP_MESSAGE_STDOUT(" Compute units = "<< device.maxComputeUnits());
- DUMP_PROPERTY_XML("cv_ocl_current_maxComputeUnits", device.maxComputeUnits());
-
- DUMP_MESSAGE_STDOUT(" Max work group size = "<< device.maxWorkGroupSize());
- DUMP_PROPERTY_XML("cv_ocl_current_maxWorkGroupSize", device.maxWorkGroupSize());
-
- std::string localMemorySizeStr = bytesToStringRepr(device.localMemSize());
- DUMP_MESSAGE_STDOUT(" Local memory size = " << localMemorySizeStr);
- DUMP_PROPERTY_XML("cv_ocl_current_localMemSize", device.localMemSize());
-
- std::string maxMemAllocSizeStr = bytesToStringRepr(device.maxMemAllocSize());
- DUMP_MESSAGE_STDOUT(" Max memory allocation size = "<< maxMemAllocSizeStr);
- DUMP_PROPERTY_XML("cv_ocl_current_maxMemAllocSize", device.maxMemAllocSize());
-
- const char* doubleSupportStr = device.doubleFPConfig() > 0 ? "Yes" : "No";
- DUMP_MESSAGE_STDOUT(" Double support = "<< doubleSupportStr);
- DUMP_PROPERTY_XML("cv_ocl_current_haveDoubleSupport", device.doubleFPConfig() > 0);
-
- const char* isUnifiedMemoryStr = device.hostUnifiedMemory() ? "Yes" : "No";
- DUMP_MESSAGE_STDOUT(" Host unified memory = "<< isUnifiedMemoryStr);
- DUMP_PROPERTY_XML("cv_ocl_current_hostUnifiedMemory", device.hostUnifiedMemory());
-
- DUMP_MESSAGE_STDOUT(" Device extensions:");
- String extensionsStr = device.extensions();
- size_t pos = 0;
- while (pos < extensionsStr.size())
- {
- size_t pos2 = extensionsStr.find(' ', pos);
- if (pos2 == String::npos)
- pos2 = extensionsStr.size();
- if (pos2 > pos)
- {
- String extensionName = extensionsStr.substr(pos, pos2 - pos);
- DUMP_MESSAGE_STDOUT(" " << extensionName);
- }
- pos = pos2 + 1;
- }
- DUMP_PROPERTY_XML("cv_ocl_current_extensions", extensionsStr.c_str());
-
- const char* haveAmdBlasStr = haveAmdBlas() ? "Yes" : "No";
- DUMP_MESSAGE_STDOUT(" Has AMD Blas = "<< haveAmdBlasStr);
- DUMP_PROPERTY_XML("cv_ocl_current_AmdBlas", haveAmdBlas());
-
- const char* haveAmdFftStr = haveAmdFft() ? "Yes" : "No";
- DUMP_MESSAGE_STDOUT(" Has AMD Fft = "<< haveAmdFftStr);
- DUMP_PROPERTY_XML("cv_ocl_current_AmdFft", haveAmdFft());
-
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width char = "<< device.preferredVectorWidthChar());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthChar", device.preferredVectorWidthChar());
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width short = "<< device.preferredVectorWidthShort());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthShort", device.preferredVectorWidthShort());
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width int = "<< device.preferredVectorWidthInt());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthInt", device.preferredVectorWidthInt());
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width long = "<< device.preferredVectorWidthLong());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthLong", device.preferredVectorWidthLong());
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width float = "<< device.preferredVectorWidthFloat());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthFloat", device.preferredVectorWidthFloat());
-
- DUMP_MESSAGE_STDOUT(" Preferred vector width double = "<< device.preferredVectorWidthDouble());
- DUMP_PROPERTY_XML("cv_ocl_current_preferredVectorWidthDouble", device.preferredVectorWidthDouble());
- }
- catch (...)
- {
- DUMP_MESSAGE_STDOUT("Exception. Can't dump OpenCL info");
- DUMP_MESSAGE_STDOUT("OpenCL device not available");
- DUMP_PROPERTY_XML("cv_ocl", "not available");
- }
+ cv::dumpOpenCLInformation();
}
-#undef DUMP_MESSAGE_STDOUT
-#undef DUMP_PROPERTY_XML
-
-#endif
+#endif // HAVE_OPENCL
Mat TestUtils::readImage(const String &fileName, int flags)
{