generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2208 from alalek:ocl_dynload_warn

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-01-27 18:24:13 +04:00 committed by OpenCV Buildbot
commit d9b24457fa
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/opencl/runtime/opencl_clamdblas.cpp
View File

@ -87,6 +87,11 @@
#endif #endif
#ifndef CV_CL_GET_PROC_ADDRESS #ifndef CV_CL_GET_PROC_ADDRESS
#ifdef __GNUC__
#warning("OPENCV: OpenCL BLAS dynamic library loader: check configuration")
#else
#pragma message("WARNING: OPENCV: OpenCL BLAS dynamic library loader: check configuration")
#endif
#define CV_CL_GET_PROC_ADDRESS(name) NULL #define CV_CL_GET_PROC_ADDRESS(name) NULL
#endif #endif

5
modules/core/src/opencl/runtime/opencl_clamdfft.cpp
View File

@ -87,6 +87,11 @@
#endif #endif
#ifndef CV_CL_GET_PROC_ADDRESS #ifndef CV_CL_GET_PROC_ADDRESS
#ifdef __GNUC__
#warning("OPENCV: OpenCL FFT dynamic library loader: check configuration")
#else
#pragma message("WARNING: OPENCV: OpenCL FFT dynamic library loader: check configuration")
#endif
#define CV_CL_GET_PROC_ADDRESS(name) NULL #define CV_CL_GET_PROC_ADDRESS(name) NULL
#endif #endif

13
modules/core/src/opencl/runtime/opencl_core.cpp
View File

@ -47,7 +47,7 @@
#include "opencv2/core/opencl/runtime/opencl_core.hpp" #include "opencv2/core/opencl/runtime/opencl_core.hpp"
static const char* funcToCheckOpenCL1_1 = "clEnqueueReadBufferRect"; #define OPENCL_FUNC_TO_CHECK_1_1 "clEnqueueReadBufferRect"
#define ERROR_MSG_CANT_LOAD "Failed to load OpenCL runtime\n" #define ERROR_MSG_CANT_LOAD "Failed to load OpenCL runtime\n"
#define ERROR_MSG_INVALID_VERSION "Failed to load OpenCL runtime (expected version 1.1+)\n" #define ERROR_MSG_INVALID_VERSION "Failed to load OpenCL runtime (expected version 1.1+)\n"
@ -72,7 +72,7 @@ static void* AppleCLGetProcAddress(const char* name)
{ {
fprintf(stderr, ERROR_MSG_CANT_LOAD); fprintf(stderr, ERROR_MSG_CANT_LOAD);
} }
else if (dlsym(handle, funcToCheckOpenCL1_1) == NULL) else if (dlsym(handle, OPENCL_FUNC_TO_CHECK_1_1) == NULL)
{ {
fprintf(stderr, ERROR_MSG_INVALID_VERSION); fprintf(stderr, ERROR_MSG_INVALID_VERSION);
handle = NULL; handle = NULL;
@ -110,7 +110,7 @@ static void* WinGetProcAddress(const char* name)
{ {
fprintf(stderr, ERROR_MSG_CANT_LOAD); fprintf(stderr, ERROR_MSG_CANT_LOAD);
} }
else if (GetProcAddress(handle, funcToCheckOpenCL1_1) == NULL) else if (GetProcAddress(handle, OPENCL_FUNC_TO_CHECK_1_1) == NULL)
{ {
fprintf(stderr, ERROR_MSG_INVALID_VERSION); fprintf(stderr, ERROR_MSG_INVALID_VERSION);
handle = NULL; handle = NULL;
@ -147,7 +147,7 @@ static void* GetProcAddress(const char* name)
{ {
fprintf(stderr, ERROR_MSG_CANT_LOAD); fprintf(stderr, ERROR_MSG_CANT_LOAD);
} }
else if (dlsym(handle, funcToCheckOpenCL1_1) == NULL) else if (dlsym(handle, OPENCL_FUNC_TO_CHECK_1_1) == NULL)
{ {
fprintf(stderr, ERROR_MSG_INVALID_VERSION); fprintf(stderr, ERROR_MSG_INVALID_VERSION);
handle = NULL; handle = NULL;
@ -162,6 +162,11 @@ static void* GetProcAddress(const char* name)
#endif #endif
#ifndef CV_CL_GET_PROC_ADDRESS #ifndef CV_CL_GET_PROC_ADDRESS
#ifdef __GNUC__
#warning("OPENCV: OpenCL dynamic library loader: check configuration")
#else
#pragma message("WARNING: OPENCV: OpenCL dynamic library loader: check configuration")
#endif
#define CV_CL_GET_PROC_ADDRESS(name) NULL #define CV_CL_GET_PROC_ADDRESS(name) NULL
#endif #endif