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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2021-12-29 15:22:13 +00:00
commit 92925e846d
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/core/src/ocl.cpp
View File

@ -153,6 +153,17 @@ static bool isRaiseError()
} }
#endif #endif
static void onOpenCLKernelBuildError()
{
// NB: no need to cache this value
bool value = cv::utils::getConfigurationParameterBool("OPENCV_OPENCL_ABORT_ON_BUILD_ERROR", false);
if (value)
{
fprintf(stderr, "Abort on OpenCL kernel build failure!\n");
abort();
}
}
#if CV_OPENCL_TRACE_CHECK #if CV_OPENCL_TRACE_CHECK
static inline static inline
void traceOpenCLCheck(cl_int status, const char* message) void traceOpenCLCheck(cl_int status, const char* message)
@ -4593,6 +4604,12 @@ struct Program::Impl
CV_OCL_DBG_CHECK(clReleaseProgram(handle)); CV_OCL_DBG_CHECK(clReleaseProgram(handle));
handle = NULL; handle = NULL;
} }
if (retval != CL_SUCCESS &&
sourceName_ != "dummy" // used for testing of compilation flags
)
{
onOpenCLKernelBuildError();
}
} }
#if CV_OPENCL_VALIDATE_BINARY_PROGRAMS #if CV_OPENCL_VALIDATE_BINARY_PROGRAMS
if (handle && CV_OPENCL_VALIDATE_BINARY_PROGRAMS_VALUE) if (handle && CV_OPENCL_VALIDATE_BINARY_PROGRAMS_VALUE)

2
samples/_winpack_run_python_sample.cmd
View File

@ -23,6 +23,8 @@ IF %ERRORLEVEL% EQU 0 (
GOTO :PYTHON_FOUND GOTO :PYTHON_FOUND
) )
CALL :QUERY_PYTHON 3.10
IF %ERRORLEVEL% EQU 0 GOTO :PYTHON_FOUND
CALL :QUERY_PYTHON 3.9 CALL :QUERY_PYTHON 3.9
IF %ERRORLEVEL% EQU 0 GOTO :PYTHON_FOUND IF %ERRORLEVEL% EQU 0 GOTO :PYTHON_FOUND
CALL :QUERY_PYTHON 3.8 CALL :QUERY_PYTHON 3.8