opencv: added openvino support

conan-io · Jan 26, 2024 · 5296222 · 5296222
1 parent 65499b3
commit 5296222
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 3 deletions.
diff --git a/recipes/opencv/4.x/conandata.yml b/recipes/opencv/4.x/conandata.yml
@@ -49,6 +49,14 @@ patches:
       patch_description: "MinGW: disable obsensor to avoid build issue"
       patch_type: "portability"
       patch_source: "https://github.com/opencv/opencv/pull/24478"
+    - patch_file: "patches/4.8.1-0003-openvino-cmake-fix.patch"
+      patch_description: "Fixed issue with OpenVINO and static build"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/23963"
+    - patch_file: "patches/4.8.1-0004-use-openvino-2-0-only.patch"
+      patch_description: "Use only OpenVINO 2.0 API"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/24878"
   "4.5.5":
     - patch_file: "patches/4.5.5-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"

diff --git a/recipes/opencv/4.x/conanfile.py b/recipes/opencv/4.x/conanfile.py
@@ -122,6 +122,7 @@ class OpenCVConan(ConanFile):
         "with_flatbuffers": [True, False],
         "with_protobuf": [True, False],
         "with_vulkan": [True, False],
+        "with_openvino": [True, False],
         "dnn_cuda": [True, False],
         # highgui module options
         "with_gtk": [True, False],
@@ -181,6 +182,7 @@ class OpenCVConan(ConanFile):
         "with_flatbuffers": True,
         "with_protobuf": True,
         "with_vulkan": False,
+        "with_openvino": True,
         "dnn_cuda": False,
         # highgui module options
         "with_gtk": False,
@@ -276,6 +278,10 @@ def _has_wechat_qrcode_option(self):
     def _has_barcode_option(self):
         return Version(self.version) >= "4.5.3" and Version(self.version) < "4.8.0"
 
+    @property
+    def _has_openvino_option(self):
+        return Version(self.version) >= "4.6.0"
+
     @property
     def _has_with_wayland_option(self):
         return Version(self.version) >= "4.7.0" and self.settings.os in ["Linux", "FreeBSD"]
@@ -422,6 +428,9 @@ def wayland():
         def xkbcommon():
             return ["xkbcommon::libxkbcommon"] if self.options.get_safe("with_wayland") else []
 
+        def openvino():
+            return ["openvino::Runtime"] if self.options.get_safe("with_openvino") else []
+
         def opencv_calib3d():
             return ["opencv_calib3d"] if self.options.calib3d else []
 
@@ -496,7 +505,7 @@ def opencv_xfeatures2d():
             "dnn": {
                 "is_built": self.options.dnn,
                 "mandatory_options": ["imgproc"],
-                "requires": ["opencv_core", "opencv_imgproc"] + protobuf() + vulkan() + ipp(),
+                "requires": ["opencv_core", "opencv_imgproc"] + protobuf() + vulkan() + ipp() + openvino(),
             },
             "features2d": {
                 "is_built": self.options.features2d,
@@ -510,7 +519,7 @@ def opencv_xfeatures2d():
             "gapi": {
                 "is_built": self.options.gapi,
                 "mandatory_options": ["imgproc"],
-                "requires": ["opencv_imgproc", "ade::ade"],
+                "requires": ["opencv_imgproc", "ade::ade"] + openvino(),
                 "system_libs": [
                     (self.settings.os == "Windows", ["ws2_32", "wsock32"]),
                 ],
@@ -1030,11 +1039,15 @@ def configure(self):
         # Call this first before any further manipulation of options based on other options
         self._solve_internal_dependency_graph(self._opencv_modules)
 
+        if not self._has_openvino_option:
+            self.options.rm_safe("with_openvino")
+
         if not self.options.dnn:
             self.options.rm_safe("dnn_cuda")
             self.options.rm_safe("with_flatbuffers")
             self.options.rm_safe("with_protobuf")
             self.options.rm_safe("with_vulkan")
+            self.options.rm_safe("with_openvino")
         if not self.options.highgui:
             self.options.rm_safe("with_gtk")
             self.options.rm_safe("with_wayland")
@@ -1094,6 +1107,8 @@ def requirements(self):
             self.requires("protobuf/3.21.12", transitive_libs=True)
         if self.options.get_safe("with_vulkan"):
             self.requires("vulkan-headers/1.3.268.0")
+        if self.options.get_safe("with_openvino"):
+            self.requires("openvino/2023.2.0")
         # gapi module dependencies
         if self.options.gapi:
             self.requires("ade/0.1.2d")
@@ -1472,8 +1487,10 @@ def generate(self):
 
         tc.variables["OPENCV_DNN_CUDA"] = self.options.get_safe("dnn_cuda", False)
 
+        if self._has_openvino_option:
+            tc.variables["WITH_OPENVINO"] = self.options.get_safe("with_openvino", False)
+
         if Version(self.version) >= "4.6.0":
-            tc.variables["WITH_OPENVINO"] = False
             tc.variables["WITH_TIMVX"] = False
         else:
             tc.variables["WITH_INF_ENGINE"] = False

diff --git a/recipes/opencv/4.x/patches/4.8.1-0003-openvino-cmake-fix.patch b/recipes/opencv/4.x/patches/4.8.1-0003-openvino-cmake-fix.patch
@@ -0,0 +1,23 @@
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -1632,13 +1632,19 @@ function(ocv_add_external_target name inc link def)
+   endif()
+ endfunction()
+
++set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "" CACHE INTERNAL "")
+ function(ocv_install_used_external_targets)
+   if(NOT BUILD_SHARED_LIBS
+       AND NOT (CMAKE_VERSION VERSION_LESS "3.13.0")  # upgrade CMake: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2152
+   )
+     foreach(tgt in ${ARGN})
+       if(tgt MATCHES "^ocv\.3rdparty\.")
+-        install(TARGETS ${tgt} EXPORT OpenCVModules)
++        list(FIND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}" _found)
++        if(_found EQUAL -1)  # don't export target twice
++          install(TARGETS ${tgt} EXPORT OpenCVModules)
++          list(APPEND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}")
++          set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "${__OPENCV_EXPORTED_EXTERNAL_TARGETS}" CACHE INTERNAL "")
++        endif()
+       endif()
+     endforeach()
+   endif()
diff --git a/recipes/opencv/4.x/patches/4.8.1-0004-use-openvino-2-0-only.patch b/recipes/opencv/4.x/patches/4.8.1-0004-use-openvino-2-0-only.patch
@@ -0,0 +1,79 @@
+commit 47686834b94fe9023e5d827dc498c43232227359
+Author: TolyaTalamanov <anatoliy.talamanov@intel.com>
+Date:   Wed Jan 17 13:28:53 2024 +0000
+
+    Ifdef OpenVINO API 1.0 usage in G-API module
+
+diff --git a/modules/gapi/src/backends/ie/giebackend.cpp b/modules/gapi/src/backends/ie/giebackend.cpp
+index 6026f29ae5..1f2d134efb 100644
+--- a/modules/gapi/src/backends/ie/giebackend.cpp
++++ b/modules/gapi/src/backends/ie/giebackend.cpp
+@@ -2,7 +2,7 @@
+ // 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.
+ //
+-// Copyright (C) 2018-2023 Intel Corporation
++// Copyright (C) 2018-2024 Intel Corporation
+
+ #include "precomp.hpp"
+
+@@ -10,7 +10,7 @@
+ // (cv::gapi::ie::backend() is still there and is defined always)
+ #include "backends/ie/giebackend.hpp"
+
+-#ifdef HAVE_INF_ENGINE
++#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
+
+ #if INF_ENGINE_RELEASE <= 2019010000
+ #   error G-API IE module supports only OpenVINO IE >= 2019 R1
+diff --git a/modules/gapi/src/backends/ie/giebackend.hpp b/modules/gapi/src/backends/ie/giebackend.hpp
+index c7d938878d..98715fc2db 100644
+--- a/modules/gapi/src/backends/ie/giebackend.hpp
++++ b/modules/gapi/src/backends/ie/giebackend.hpp
+@@ -2,7 +2,7 @@
+ // 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.
+ //
+-// Copyright (C) 2018-2020 Intel Corporation
++// Copyright (C) 2018-2024 Intel Corporation
+
+ #ifndef OPENCV_GAPI_GIEBACKEND_HPP
+ #define OPENCV_GAPI_GIEBACKEND_HPP
+@@ -10,7 +10,7 @@
+ // Include anyway - cv::gapi::ie::backend() still needs to be defined
+ #include "opencv2/gapi/infer/ie.hpp"
+
+-#ifdef HAVE_INF_ENGINE
++#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
+
+ #include <ade/util/algorithm.hpp> // type_list_index
+ #include <condition_variable>
+diff --git a/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp b/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
+index a185e7b8ce..6df8187e16 100644
+--- a/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
++++ b/modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
+@@ -2,9 +2,9 @@
+ // 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.
+ //
+-// Copyright (C) 2020 Intel Corporation
++// Copyright (C) 2020-2024 Intel Corporation
+
+-#ifdef HAVE_INF_ENGINE
++#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
+
+ #include <vector>
+ #include <string>
+diff --git a/modules/gapi/test/infer/gapi_infer_ie_test.cpp b/modules/gapi/test/infer/gapi_infer_ie_test.cpp
+index 58e37040e8..06855fdec8 100644
+--- a/modules/gapi/test/infer/gapi_infer_ie_test.cpp
++++ b/modules/gapi/test/infer/gapi_infer_ie_test.cpp
+@@ -6,7 +6,7 @@
+
+ #include "../test_precomp.hpp"
+
+-#ifdef HAVE_INF_ENGINE
++#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
+
+ #include <stdexcept>
+ #include <mutex>