From 631126c77ade2428cc82aced42bdc4166ac2e817 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 24 Dec 2021 16:39:15 +0000 Subject: [PATCH 1/3] release: OpenCV 3.4.17 --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index b62d6ed00d..5e06354e10 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 17 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From a47952146adab4051095b5d5e4c67ac716172290 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 28 Dec 2021 11:49:55 +0000 Subject: [PATCH 2/3] samples: query for Python 3.10 setup --- samples/_winpack_run_python_sample.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/_winpack_run_python_sample.cmd b/samples/_winpack_run_python_sample.cmd index 476bbf6e3e..ca0d38e21a 100644 --- a/samples/_winpack_run_python_sample.cmd +++ b/samples/_winpack_run_python_sample.cmd @@ -23,6 +23,8 @@ IF %ERRORLEVEL% EQU 0 ( GOTO :PYTHON_FOUND ) +CALL :QUERY_PYTHON 3.10 +IF %ERRORLEVEL% EQU 0 GOTO :PYTHON_FOUND CALL :QUERY_PYTHON 3.9 IF %ERRORLEVEL% EQU 0 GOTO :PYTHON_FOUND CALL :QUERY_PYTHON 3.8 From c5a86c22a4b5035e270bdb0df917977fb5b08e63 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 28 Dec 2021 12:43:42 +0000 Subject: [PATCH 3/3] core(ocl): add option to abort on OpenCL kernel build failure - exceptions are catched by fallback CPU path - OPENCV_OPENCL_ABORT_ON_BUILD_ERROR (disabled by default) --- modules/core/src/ocl.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp index e93e3094be..91661270a2 100644 --- a/modules/core/src/ocl.cpp +++ b/modules/core/src/ocl.cpp @@ -153,6 +153,17 @@ static bool isRaiseError() } #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 static inline void traceOpenCLCheck(cl_int status, const char* message) @@ -3881,6 +3892,12 @@ struct Program::Impl CV_OCL_DBG_CHECK(clReleaseProgram(handle)); handle = NULL; } + if (retval != CL_SUCCESS && + sourceName_ != "dummy" // used for testing of compilation flags + ) + { + onOpenCLKernelBuildError(); + } } #if CV_OPENCL_VALIDATE_BINARY_PROGRAMS if (handle && CV_OPENCL_VALIDATE_BINARY_PROGRAMS_VALUE)