summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch193
1 files changed, 0 insertions, 193 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
deleted file mode 100644
index 822ab1cc..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,193 +0,0 @@
1From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 8 Apr 2021 14:19:51 +0800
4Subject: [PATCH] inference-engine: use system installed packages
5
6Use installed versions of ade, protobuf and tbb.
7
8Upstream-Status: Pending
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 cmake/dependencies.cmake | 19 -----------
13 inference-engine/CMakeLists.txt | 2 +-
14 inference-engine/cmake/dependencies.cmake | 34 -------------------
15 inference-engine/cmake/ie_parallel.cmake | 2 +-
16 inference-engine/samples/CMakeLists.txt | 2 +-
17 .../common_test_utils/CMakeLists.txt | 4 +--
18 .../unit_test_utils/CMakeLists.txt | 3 +-
19 inference-engine/thirdparty/CMakeLists.txt | 5 ++-
20 8 files changed, 7 insertions(+), 64 deletions(-)
21
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index aed7614734..f5baa6f86b 100644
24--- a/cmake/dependencies.cmake
25+++ b/cmake/dependencies.cmake
26@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
27 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
28 set(protoc_version "3.7.1")
29
30- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
31- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
32- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
33- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
34- )
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36-
37- reset_deps_cache(SYSTEM_PROTOC)
38-
39- find_program(
40- SYSTEM_PROTOC
41- NAMES protoc
42- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
43- NO_DEFAULT_PATH)
44- if(NOT SYSTEM_PROTOC)
45- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
46- endif()
47-
48- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
49 endif()
50diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
51index 95c657222e..20cbd5000b 100644
52--- a/inference-engine/CMakeLists.txt
53+++ b/inference-engine/CMakeLists.txt
54@@ -20,7 +20,7 @@ function(ie_developer_export_targets)
55 endfunction()
56
57 function(ie_developer_export)
58- set(all_dev_targets gflags ie_libraries)
59+ set(all_dev_targets ie_libraries)
60 foreach(component IN LISTS openvino_export_components)
61 export(TARGETS ${${component}} NAMESPACE IE::
62 APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
63diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
64index 6fdfc6f3cd..c07bf0f3c8 100644
65--- a/inference-engine/cmake/dependencies.cmake
66+++ b/inference-engine/cmake/dependencies.cmake
67@@ -138,40 +138,6 @@ endif ()
68 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
69 reset_deps_cache(TBBROOT TBB_DIR)
70
71- if (WIN32 AND X86_64)
72- #TODO: add target_path to be platform specific as well, to avoid following if
73- RESOLVE_DEPENDENCY(TBB
74- ARCHIVE_WIN "tbb2020_20200415_win.zip"
75- TARGET_PATH "${TEMP}/tbb"
76- ENVIRONMENT "TBBROOT"
77- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
78- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
79- RESOLVE_DEPENDENCY(TBB
80- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
81- TARGET_PATH "${TEMP}/tbb"
82- ENVIRONMENT "TBBROOT"
83- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
84- elseif(LINUX AND X86_64)
85- RESOLVE_DEPENDENCY(TBB
86- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
87- TARGET_PATH "${TEMP}/tbb"
88- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
89- elseif(LINUX AND AARCH64)
90- RESOLVE_DEPENDENCY(TBB
91- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
92- TARGET_PATH "${TEMP}/tbb_yocto"
93- ENVIRONMENT "TBBROOT"
94- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
95- elseif(APPLE AND X86_64)
96- RESOLVE_DEPENDENCY(TBB
97- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
98- TARGET_PATH "${TEMP}/tbb"
99- ENVIRONMENT "TBBROOT"
100- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
101- else()
102- message(FATAL_ERROR "TBB is not available on current platform")
103- endif()
104-
105 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
106 update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
107
108diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
109index f8988aa105..42fedd10c5 100644
110--- a/inference-engine/cmake/ie_parallel.cmake
111+++ b/inference-engine/cmake/ie_parallel.cmake
112@@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
113 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
114 find_package(TBB COMPONENTS tbb tbbmalloc)
115 set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
116- set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
117+ set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE)
118 set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
119 if (TBB_FOUND)
120 if (TBB_VERSION VERSION_LESS 2020)
121diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
122index dfe9f2303d..6bc44019fe 100644
123--- a/inference-engine/samples/CMakeLists.txt
124+++ b/inference-engine/samples/CMakeLists.txt
125@@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
126 add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
127 set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
128 endfunction()
129- add_gflags()
130+ #add_gflags()
131 endif()
132
133 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
134diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
135index 6e09201f1e..2d2e3524a5 100644
136--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
137+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
138@@ -43,7 +43,7 @@ function(add_gtest_libraries)
139 PROPERTIES FOLDER thirdparty)
140 endfunction()
141
142-add_gtest_libraries()
143+#add_gtest_libraries()
144
145 if (MSVC)
146 set(PUGI pugixml_mt)
147@@ -52,8 +52,6 @@ else ()
148 endif ()
149
150 list(APPEND EXPORT_DEPENDENCIES
151- gtest
152- gtest_main
153 )
154
155 set(TARGET_NAME commonTestUtils)
156diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
157index ab956218aa..233eb5ea46 100644
158--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
159+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
160@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
161
162 list(APPEND EXPORT_DEPENDENCIES
163 commonTestUtils_s
164- inference_engine_s
165- gmock)
166+ inference_engine_s)
167
168 addIeTarget(
169 NAME ${TARGET_NAME}
170diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
171index 9a6a9209f1..eda6a64161 100644
172--- a/inference-engine/thirdparty/CMakeLists.txt
173+++ b/inference-engine/thirdparty/CMakeLists.txt
174@@ -62,14 +62,13 @@ else()
175 target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
176 endif()
177
178-add_subdirectory(ade EXCLUDE_FROM_ALL)
179 add_subdirectory(fluid/modules/gapi)
180
181-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
182+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
183
184 # developer package
185
186-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
187+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
188
189 if (NOT USE_SYSTEM_PUGIXML)
190 set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
191--
1922.29.0
193
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-17 23:21:18 +0000