opencv
diff --git a/‎cmake/OpenCVCompilerOptions.cmake
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎cmake/OpenCVCompilerOptions.cmake
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎cmake/OpenCVDetectTBB.cmake
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎cmake/OpenCVDetectTBB.cmake
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎cmake/OpenCVPluginStandalone.cmake
Copy file name to clipboard
+127Lines changed: 127 additions & 0 deletions b/‎cmake/OpenCVPluginStandalone.cmake
Copy file name to clipboard
+127Lines changed: 127 additions & 0 deletions
diff --git a/‎cmake/OpenCVUtils.cmake
Copy file name to clipboard
+27-1Lines changed: 27 additions & 1 deletion b/‎cmake/OpenCVUtils.cmake
Copy file name to clipboard
+27-1Lines changed: 27 additions & 1 deletion
diff --git a/‎modules/core/CMakeLists.txt
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎modules/core/CMakeLists.txt
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎modules/core/cmake/parallel/detect_openmp.cmake
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎modules/core/cmake/parallel/detect_openmp.cmake
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎modules/core/cmake/parallel/detect_tbb.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎modules/core/cmake/parallel/detect_tbb.cmake
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎modules/core/cmake/parallel/init.cmake
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎modules/core/cmake/parallel/init.cmake
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎modules/core/include/opencv2/core/llapi/llapi.h
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎modules/core/include/opencv2/core/llapi/llapi.h
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎modules/core/include/opencv2/core/parallel/parallel_backend.hpp
Copy file name to clipboard
+19-3Lines changed: 19 additions & 3 deletions b/‎modules/core/include/opencv2/core/parallel/parallel_backend.hpp
Copy file name to clipboard
+19-3Lines changed: 19 additions & 3 deletions
@@ -304,7 +304,9 @@ if(MSVC)
   endif()
 endif()
 
-include(cmake/OpenCVCompilerOptimizations.cmake)
+if(PROJECT_NAME STREQUAL "OpenCV")
+  include("${OpenCV_SOURCE_DIR}/cmake/OpenCVCompilerOptimizations.cmake")
+endif()
 if(COMMAND ocv_compiler_optimization_options)
   ocv_compiler_optimization_options()
 endif()
 
@@ -1,4 +1,4 @@
-# Search TBB library (4.1 - 4.4, 2017)
+# Search TBB library: 4.1 - 4.4, 2017-2020, 2021+ (oneTBB)
 #
 # Own TBB (3rdparty/tbb):
 # - set cmake option BUILD_TBB to ON
 
@@ -0,0 +1,127 @@
+# Standalone OpenCV plugins build scripts
+#
+# Useful OpenCV common build variables:
+# - CMAKE_BUILD_TYPE=Release/Debug
+# - BUILD_WITH_DEBUG_INFO=ON
+# - ENABLE_BUILD_HARDENING=ON
+#
+# Plugin configuration variables:
+# - OPENCV_PLUGIN_DEPS - set of extra dependencies (modules), used for include dirs, target_link_libraries
+# - OPENCV_PLUGIN_SUFFIX
+# - OPENCV_PLUGIN_NAME
+# - OPENCV_PLUGIN_OUTPUT_NAME_FULL (overrides both OPENCV_PLUGIN_NAME / OPENCV_PLUGIN_SUFFIX)
+#
+#=============================================
+
+if(NOT OpenCV_SOURCE_DIR)
+  message(FATAL_ERROR "OpenCV_SOURCE_DIR must be set to build the plugin!")
+endif()
+
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+
+set(BUILD_SHARED_LIBS ON CACHE BOOL "")
+if(NOT BUILD_SHARED_LIBS)
+  message(FATAL_ERROR "Static plugin build does not make sense")
+endif()
+
+# re-use OpenCV build scripts
+include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")
+include("${OpenCV_SOURCE_DIR}/cmake/OpenCVDetectCXXCompiler.cmake")
+include("${OpenCV_SOURCE_DIR}/cmake/OpenCVCompilerOptions.cmake")
+
+function(ocv_create_plugin module default_name dependency_target dependency_target_desc)
+
+  set(OPENCV_PLUGIN_NAME ${default_name} CACHE STRING "")
+  set(OPENCV_PLUGIN_DESTINATION "" CACHE PATH "")
+  project(${OPENCV_PLUGIN_NAME} LANGUAGES CXX)
+
+  if(NOT TARGET ${dependency_target})
+    message(FATAL_ERROR "${dependency_target_desc} was not found! (missing target ${dependency_target})")
+  endif()
+
+  set(modules_ROOT "${OpenCV_SOURCE_DIR}/modules")
+  set(module_ROOT "${modules_ROOT}/${module}")
+
+  foreach(src ${ARGN})
+    list(APPEND sources "${module_ROOT}/${src}")
+  endforeach()
+
+  add_library(${OPENCV_PLUGIN_NAME} MODULE
+      "${sources}"
+      ${OPENCV_PLUGIN_EXTRA_SRC_FILES}
+  )
+
+  if(OPENCV_PLUGIN_DEPS)
+    foreach(d ${OPENCV_PLUGIN_DEPS})
+      list(APPEND OPENCV_PLUGIN_EXTRA_INCLUDES "${modules_ROOT}/${d}/include")
+    endforeach()
+  endif()
+
+  target_include_directories(${OPENCV_PLUGIN_NAME} PRIVATE
+      "${CMAKE_CURRENT_BINARY_DIR}"
+      "${module_ROOT}/src"
+      "${module_ROOT}/include"
+      ${OPENCV_PLUGIN_EXTRA_INCLUDES}
+  )
+  target_compile_definitions(${OPENCV_PLUGIN_NAME} PRIVATE "BUILD_PLUGIN=1")
+
+  target_link_libraries(${OPENCV_PLUGIN_NAME} PRIVATE ${dependency_target})
+  set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES
+    CXX_STANDARD 11
+    CXX_VISIBILITY_PRESET hidden
+  )
+
+  if(DEFINED OPENCV_PLUGIN_MODULE_PREFIX)
+    set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES PREFIX "${OPENCV_PLUGIN_MODULE_PREFIX}")
+  endif()
+
+  # Hack for Windows only, Linux/MacOS uses global symbol table (without exact .so binding)
+  if(WIN32)
+    find_package(OpenCV REQUIRED ${module} ${OPENCV_PLUGIN_DEPS})
+    target_link_libraries(${OPENCV_PLUGIN_NAME} PRIVATE ${OpenCV_LIBRARIES})
+  endif()
+
+  if(NOT OpenCV_FOUND)  # build against sources (Linux)
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/opencv2/opencv_modules.hpp" "#pragma once")
+  endif()
+
+  if(WIN32)
+    ocv_update(OPENCV_DEBUG_POSTFIX d)
+  endif()
+  set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}")
+
+  if(DEFINED OPENCV_PLUGIN_SUFFIX)
+    # custom value
+  else()
+    if(WIN32)
+      ocv_update(OPENCV_PLUGIN_VERSION "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+      if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
+        ocv_update(OPENCV_PLUGIN_ARCH "_64")
+      else()
+        ocv_update(OPENCV_PLUGIN_ARCH "")
+      endif()
+    else()
+      # empty
+    endif()
+    ocv_update(OPENCV_PLUGIN_SUFFIX "${OPENCV_PLUGIN_VERSION}${OPENCV_PLUGIN_ARCH}")
+  endif()
+
+  if(OPENCV_PLUGIN_DESTINATION)
+    set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${OPENCV_PLUGIN_DESTINATION}")
+    message(STATUS "Output destination: ${OPENCV_PLUGIN_DESTINATION}")
+  endif()
+
+  if(OPENCV_PLUGIN_OUTPUT_NAME_FULL)
+    set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES OUTPUT_NAME "${OPENCV_PLUGIN_OUTPUT_NAME_FULL}")
+  elseif(OPENCV_PLUGIN_OUTPUT_NAME)
+    set_target_properties(${OPENCV_PLUGIN_NAME} PROPERTIES OUTPUT_NAME "${OPENCV_PLUGIN_OUTPUT_NAME}${OPENCV_PLUGIN_SUFFIX}")
+  endif()
+
+  install(TARGETS ${OPENCV_PLUGIN_NAME} LIBRARY DESTINATION . COMPONENT plugins)
+
+  message(STATUS "Library name: ${OPENCV_PLUGIN_NAME}")
+
+endfunction()
@@ -573,7 +573,9 @@ macro(ocv_check_flag_support lang flag varname base_options)
   string(REGEX REPLACE "^(/|-)" "HAVE_${_lang}_" ${varname} "${${varname}}")
   string(REGEX REPLACE " -|-|=| |\\.|," "_" ${varname} "${${varname}}")
 
-  ocv_check_compiler_flag("${_lang}" "${base_options} ${flag}" ${${varname}} ${ARGN})
+  if(DEFINED CMAKE_${_lang}_COMPILER)
+    ocv_check_compiler_flag("${_lang}" "${base_options} ${flag}" ${${varname}} ${ARGN})
+  endif()
 endmacro()
 
 macro(ocv_check_runtime_flag flag result)
@@ -1571,6 +1573,30 @@ function(ocv_add_library target)
 endfunction()
 
 
+function(ocv_add_external_target name inc link def)
+  if(BUILD_SHARED_LIBS)
+    set(imp IMPORTED)
+  endif()
+  add_library(ocv.3rdparty.${name} INTERFACE ${imp})
+  set_target_properties(ocv.3rdparty.${name} PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${inc}"
+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${inc}"
+    INTERFACE_COMPILE_DEFINITIONS "${def}")
+  # When cmake version is greater than or equal to 3.11, INTERFACE_LINK_LIBRARIES no longer applies to interface library
+  # See https://github.com/opencv/opencv/pull/18658
+  if (CMAKE_VERSION VERSION_LESS 3.11)
+    set_target_properties(ocv.3rdparty.${name} PROPERTIES
+      INTERFACE_LINK_LIBRARIES "${link}")
+  else()
+    target_link_libraries(ocv.3rdparty.${name} INTERFACE ${link})
+  endif()
+  #
+  if(NOT BUILD_SHARED_LIBS)
+    install(TARGETS ocv.3rdparty.${name} EXPORT OpenCVModules)
+  endif()
+endfunction()
+
+
 macro(ocv_get_libname var_name)
   get_filename_component(__libname "${ARGN}" NAME)
   # libopencv_core.so.3.3 -> opencv_core
 
@@ -17,6 +17,14 @@ ocv_add_dispatched_file_force_all(test_intrin128 TEST SSE2 SSE3 SSSE3 SSE4_1 SSE
 ocv_add_dispatched_file_force_all(test_intrin256 TEST AVX2 AVX512_SKX)
 ocv_add_dispatched_file_force_all(test_intrin512 TEST AVX512_SKX)
 
+
+# parallel backends configuration
+set(PARALLEL_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building parallel plugin support")
+# TODO building plugins with OpenCV is not supported yet
+#set(PARALLEL_PLUGIN_LIST "" CACHE STRING "List of parallel backends to be compiled as plugins (tbb, openmp or special value 'all')")
+#string(REPLACE "," ";" PARALLEL_PLUGIN_LIST "${PARALLEL_PLUGIN_LIST}")  # support comma-separated list (,) too
+
+
 ocv_add_module(core
                OPTIONAL opencv_cudev
                WRAP java objc python js)
@@ -117,6 +125,14 @@ elseif(HAVE_CXX11 OR DEFINED OPENCV_ALLOCATOR_STATS_COUNTER_TYPE)
 endif()
 
 
+if(PARALLEL_ENABLE_PLUGINS)
+  ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/parallel/parallel.cpp "PARALLEL_ENABLE_PLUGINS=1")
+  if(OPENCV_DEBUG_POSTFIX)
+    ocv_append_source_file_compile_definitions("${CMAKE_CURRENT_LIST_DIR}/src/parallel/parallel.cpp" "DEBUG_POSTFIX=${OPENCV_DEBUG_POSTFIX}")
+  endif()
+endif()
+
+
 ocv_create_module(${extra_libs})
 
 ocv_target_link_libraries(${the_module} PRIVATE
 
@@ -0,0 +1,13 @@
+if(CMAKE_VERSION VERSION_LESS "3.9")
+  message(STATUS "OpenMP detection requires CMake 3.9+")  # OpenMP::OpenMP_CXX target
+endif()
+
+find_package(OpenMP)
+if(OpenMP_FOUND)
+  if(TARGET OpenMP::OpenMP_CXX)
+    set(HAVE_OPENMP 1)
+    ocv_add_external_target(openmp "" "OpenMP::OpenMP_CXX" "HAVE_OPENMP=1")
+  else()
+    message(WARNING "OpenMP: missing OpenMP::OpenMP_CXX target")
+  endif()
+endif()
@@ -0,0 +1,5 @@
+include("${OpenCV_SOURCE_DIR}/cmake/OpenCVDetectTBB.cmake")
+
+if(HAVE_TBB)
+  ocv_add_external_target(tbb "" "tbb" "HAVE_TBB=1")
+endif()
@@ -0,0 +1,8 @@
+macro(ocv_add_core_parallel_backend backend_id cond_var)
+  if(${cond_var})
+    include("${CMAKE_CURRENT_LIST_DIR}/detect_${backend_id}.cmake")
+  endif()
+endmacro()
+
+ocv_add_core_parallel_backend("tbb" WITH_TBB)
+ocv_add_core_parallel_backend("openmp" WITH_OPENMP)
@@ -27,6 +27,14 @@ Using this approach OpenCV provides some basic low level functionality for exter
 #define CV_API_CALL
 #endif
 
+#ifndef CV_PLUGIN_EXPORTS
+#if (defined _WIN32 || defined WINCE || defined __CYGWIN__)
+#  define CV_PLUGIN_EXPORTS __declspec(dllexport)
+#elif defined __GNUC__ && __GNUC__ >= 4
+#  define CV_PLUGIN_EXPORTS __attribute__ ((visibility ("default")))
+#endif
+#endif
+
 typedef enum cvResult
 {
     CV_ERROR_FAIL = -1,                          //!< Some error occurred (TODO Require to fill exception information)
 
@@ -19,23 +19,33 @@ namespace cv { namespace parallel {
  *
  * Applications can replace OpenCV `parallel_for()` backend with own implementation (to reuse Application's thread pool).
  *
- * @note This call is not thread-safe. Consider calling this function from the `main()` before any other OpenCV processing functions (and without any other created threads).
  *
- * #### Intel TBB usage example:
+ * ### Backend API usage examples
+ *
+ * #### Intel TBB
  *
  * - include header with simple implementation of TBB backend:
  *   @snippet parallel_backend/example-tbb.cpp tbb_include
  * - execute backend replacement code:
  *   @snippet parallel_backend/example-tbb.cpp tbb_backend
  * - configuration of compiler/linker options is responsibility of Application's scripts
  *
- * #### OpenMP usage example:
+ * #### OpenMP
  *
  * - include header with simple implementation of OpenMP backend:
  *   @snippet parallel_backend/example-openmp.cpp openmp_include
  * - execute backend replacement code:
  *   @snippet parallel_backend/example-openmp.cpp openmp_backend
  * - Configuration of compiler/linker options is responsibility of Application's scripts
+ *
+ *
+ * ### Plugins support
+ *
+ * Runtime configuration options:
+ * - change backend priority: `OPENCV_PARALLEL_PRIORITY_<backend>=9999`
+ * - disable backend: `OPENCV_PARALLEL_PRIORITY_<backend>=0`
+ * - specify list of backends with high priority (>100000): `OPENCV_PARALLEL_PRIORITY_LIST=TBB,OPENMP`. Unknown backends are registered as new plugins.
+ *
  */
 
 /** Interface for parallel_for backends implementations
@@ -68,6 +78,12 @@ class CV_EXPORTS ParallelForAPI
  */
 CV_EXPORTS void setParallelForBackend(const std::shared_ptr<ParallelForAPI>& api, bool propagateNumThreads = true);
 
+/** @brief Change OpenCV parallel_for backend
+ *
+ * @note This call is not thread-safe. Consider calling this function from the `main()` before any other OpenCV processing functions (and without any other created threads).
+ */
+CV_EXPORTS_W bool setParallelForBackend(const std::string& backendName, bool propagateNumThreads = true);
+
 //! @}
 }}  // namespace
 #endif  // OPENCV_CORE_PARALLEL_BACKEND_HPP
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Search TBB library (4.1 - 4.4, 2017)`
	`1`	`+# Search TBB library: 4.1 - 4.4, 2017-2020, 2021+ (oneTBB)`
`2`	`2`	`#`
`3`	`3`	`# Own TBB (3rdparty/tbb):`
`4`	`4`	`# - set cmake option BUILD_TBB to ON`