diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv')
13 files changed, 377 insertions, 838 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch new file mode 100644 index 00000000..7f5b46c6 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 | ||
4 | Subject: [PATCH] cmake: yocto specific tweaks to the build process | ||
5 | |||
6 | * Dont try to detect glibc version as that doesn't work when cross compiling. | ||
7 | * Dont try to detect CXX11_ABI | ||
8 | * Install sample binaries as well. | ||
9 | * Dont try to write triggers for CPack. We package ourselves. | ||
10 | * Fix the installation path for Python modules when baselib = lib64. | ||
11 | |||
12 | Upstream-Status: Inappropriate | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | ||
17 | cmake/developer_package/target_flags.cmake | 4 ++-- | ||
18 | samples/cpp/CMakeLists.txt | 6 +++--- | ||
19 | src/bindings/python/CMakeLists.txt | 2 +- | ||
20 | 4 files changed, 7 insertions(+), 7 deletions(-) | ||
21 | |||
22 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
23 | index 99f11730983..1a1f61fcd3d 100644 | ||
24 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake | ||
25 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
26 | @@ -156,7 +156,7 @@ ov_rpm_specific_settings() | ||
27 | # needed to add triggers for packages with libraries | ||
28 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") | ||
29 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") | ||
30 | -file(WRITE "${def_triggers}" "${triggers_content}") | ||
31 | +#file(WRITE "${def_triggers}" "${triggers_content}") | ||
32 | |||
33 | # | ||
34 | # Functions helpful for packaging your modules with RPM cpack | ||
35 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | ||
36 | index d047a1aebd9..4e8ca68c60f 100644 | ||
37 | --- a/cmake/developer_package/target_flags.cmake | ||
38 | +++ b/cmake/developer_package/target_flags.cmake | ||
39 | @@ -149,7 +149,7 @@ function(ov_glibc_version) | ||
40 | endif() | ||
41 | endfunction() | ||
42 | |||
43 | -ov_glibc_version() | ||
44 | +#ov_glibc_version() | ||
45 | |||
46 | # | ||
47 | # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler | ||
48 | @@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi) | ||
49 | endif() | ||
50 | endmacro() | ||
51 | |||
52 | -ov_get_glibcxx_use_cxx11_abi() | ||
53 | +#ov_get_glibcxx_use_cxx11_abi() | ||
54 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
55 | index 4d33bff944e..3e7f1458578 100644 | ||
56 | --- a/samples/cpp/CMakeLists.txt | ||
57 | +++ b/samples/cpp/CMakeLists.txt | ||
58 | @@ -206,9 +206,9 @@ macro(ov_add_sample) | ||
59 | target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) | ||
60 | |||
61 | install(TARGETS ${SAMPLE_NAME} | ||
62 | - RUNTIME DESTINATION samples_bin/ | ||
63 | - COMPONENT samples_bin | ||
64 | - EXCLUDE_FROM_ALL) | ||
65 | + DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
66 | + COMPONENT samples_bin) | ||
67 | + | ||
68 | |||
69 | # create global target with all samples / demo apps | ||
70 | if(NOT TARGET ov_samples) | ||
71 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | ||
72 | index 6cf43ec3fed..d539b9d003f 100644 | ||
73 | --- a/src/bindings/python/CMakeLists.txt | ||
74 | +++ b/src/bindings/python/CMakeLists.txt | ||
75 | @@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING) | ||
76 | # install OpenVINO Python API | ||
77 | |||
78 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | ||
79 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | ||
80 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | ||
81 | set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | ||
82 | set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO") | ||
83 | |||
84 | -- | ||
85 | 2.34.1 | ||
86 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch deleted file mode 100644 index 88aab623..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 | ||
4 | Subject: [PATCH] don't install licenses and version | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | ngraph/CMakeLists.txt | 13 ++----------- | ||
11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ | ||
12 | 2 files changed, 4 insertions(+), 11 deletions(-) | ||
13 | |||
14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
15 | index 4eb969f02..c52aec2ec 100644 | ||
16 | --- a/ngraph/CMakeLists.txt | ||
17 | +++ b/ngraph/CMakeLists.txt | ||
18 | @@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
19 | install(EXPORT ngraphTargets | ||
20 | FILE ngraphTargets.cmake | ||
21 | NAMESPACE ngraph:: | ||
22 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | ||
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
24 | COMPONENT ngraph) | ||
25 | |||
26 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | ||
27 | @@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
28 | |||
29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
31 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | ||
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
33 | COMPONENT ngraph) | ||
34 | endif() | ||
35 | - | ||
36 | -install(DIRECTORY | ||
37 | - ${CMAKE_CURRENT_SOURCE_DIR}/licenses | ||
38 | - DESTINATION "${NGRAPH_COMPONENT_PREFIX}." | ||
39 | - COMPONENT ngraph | ||
40 | -) | ||
41 | - | ||
42 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | ||
43 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | ||
44 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt | ||
45 | index e37aba8b7..83ed2efbd 100644 | ||
46 | --- a/ngraph/test/runtime/CMakeLists.txt | ||
47 | +++ b/ngraph/test/runtime/CMakeLists.txt | ||
48 | @@ -68,3 +68,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | ||
49 | |||
50 | add_subdirectory(interpreter) | ||
51 | add_subdirectory(ie) | ||
52 | + | ||
53 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) | ||
54 | -- | ||
55 | 2.26.2 | ||
56 | |||
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 bbf186df..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ /dev/null | |||
@@ -1,262 +0,0 @@ | |||
1 | From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 | ||
4 | Subject: [PATCH] inference-engine: use system installed packages | ||
5 | |||
6 | Use installed versions of pugixml, ade, protobuf and tbb. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | cmake/dependencies.cmake | 17 -------------- | ||
13 | inference-engine/CMakeLists.txt | 2 +- | ||
14 | inference-engine/cmake/ie_parallel.cmake | 7 +----- | ||
15 | .../src/inference_engine/CMakeLists.txt | 23 +------------------ | ||
16 | .../src/legacy_api/CMakeLists.txt | 3 +-- | ||
17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - | ||
18 | .../common_test_utils/CMakeLists.txt | 7 ++---- | ||
19 | .../unit_test_utils/CMakeLists.txt | 3 +-- | ||
20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - | ||
21 | inference-engine/thirdparty/CMakeLists.txt | 14 +---------- | ||
22 | 10 files changed, 8 insertions(+), 70 deletions(-) | ||
23 | |||
24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
25 | index 2a5a74db6..9cc9a6c94 100644 | ||
26 | --- a/cmake/dependencies.cmake | ||
27 | +++ b/cmake/dependencies.cmake | ||
28 | @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) | ||
29 | |||
30 | set(protoc_version "3.7.1") | ||
31 | if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) | ||
32 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | ||
33 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | ||
34 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") | ||
35 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | ||
36 | else() | ||
37 | message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") | ||
38 | endif() | ||
39 | |||
40 | - reset_deps_cache(SYSTEM_PROTOC) | ||
41 | - | ||
42 | - message("${SYSTEM_PROTOC_ROOT}/bin") | ||
43 | - find_program( | ||
44 | - SYSTEM_PROTOC | ||
45 | - NAMES protoc | ||
46 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | ||
47 | - NO_DEFAULT_PATH) | ||
48 | - if(NOT SYSTEM_PROTOC) | ||
49 | - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") | ||
50 | - endif() | ||
51 | - | ||
52 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | ||
53 | endif() | ||
54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | ||
55 | index 7f45ab021..db85e8690 100644 | ||
56 | --- a/inference-engine/CMakeLists.txt | ||
57 | +++ b/inference-engine/CMakeLists.txt | ||
58 | @@ -57,7 +57,7 @@ function(ie_developer_export) | ||
59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
60 | |||
61 | # Custom target to build only Inference Engine Developer Package targets | ||
62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags | ||
63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} | ||
64 | inference_engine_ir_reader inference_engine_ir_v7_reader) | ||
65 | endfunction() | ||
66 | |||
67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | ||
68 | index 7fd77ccc0..143dcf669 100644 | ||
69 | --- a/inference-engine/cmake/ie_parallel.cmake | ||
70 | +++ b/inference-engine/cmake/ie_parallel.cmake | ||
71 | @@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | ||
73 | |||
74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
75 | - if (TBB_FOUND) | ||
76 | set(IE_THREAD_DEFINE "IE_THREAD_TBB") | ||
77 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | ||
78 | - else () | ||
79 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ | ||
80 | - SEQ method will be used for ${TARGET_NAME}") | ||
81 | - endif () | ||
82 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | ||
83 | elseif (THREADING STREQUAL "OMP") | ||
84 | if (WIN32) | ||
85 | set(omp_lib_name libiomp5md) | ||
86 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
87 | index 9ab888983..105e666a3 100644 | ||
88 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
89 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
90 | @@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE | ||
91 | $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) | ||
92 | |||
93 | target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE | ||
94 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
95 | $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
96 | |||
97 | # Create object library | ||
98 | @@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT | ||
99 | |||
100 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) | ||
101 | |||
102 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
103 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
104 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
105 | |||
106 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | ||
107 | "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp | ||
108 | @@ -233,25 +231,6 @@ list(APPEND core_components ngraph) | ||
109 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
110 | ie_cpack_add_component(tbb REQUIRED) | ||
111 | list(APPEND core_components tbb) | ||
112 | - | ||
113 | - install(DIRECTORY "${TBB}/include" | ||
114 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
115 | - COMPONENT tbb) | ||
116 | - install(DIRECTORY "${TBB}/lib" | ||
117 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
118 | - COMPONENT tbb) | ||
119 | - if(EXISTS "${TBB}/bin") | ||
120 | - install(DIRECTORY "${TBB}/bin" | ||
121 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
122 | - COMPONENT tbb) | ||
123 | - endif() | ||
124 | - install(FILES "${TBB}/LICENSE" | ||
125 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
126 | - COMPONENT tbb) | ||
127 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
128 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
129 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake | ||
130 | - COMPONENT tbb) | ||
131 | endif() | ||
132 | |||
133 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | ||
134 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt | ||
135 | index ed87a073a..adc970a09 100644 | ||
136 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | ||
137 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | ||
138 | @@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE | ||
139 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl | ||
140 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
141 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
142 | - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | ||
143 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | ||
144 | + $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | ||
145 | |||
146 | # Create shared library | ||
147 | |||
148 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
149 | index a45437453..7a67a8226 100644 | ||
150 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
151 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | ||
152 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | ||
153 | |||
154 | target_include_directories(${TARGET_NAME} | ||
155 | SYSTEM PUBLIC | ||
156 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
157 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
158 | "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") | ||
159 | |||
160 | diff --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 | ||
161 | index efead7271..732abee2d 100644 | ||
162 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
163 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
164 | @@ -23,7 +23,7 @@ function(add_gtest_libraries) | ||
165 | PROPERTIES FOLDER thirdparty) | ||
166 | endfunction() | ||
167 | |||
168 | -add_gtest_libraries() | ||
169 | +#add_gtest_libraries() | ||
170 | |||
171 | if (MSVC) | ||
172 | set(PUGI pugixml_mt) | ||
173 | @@ -32,10 +32,7 @@ else () | ||
174 | endif () | ||
175 | |||
176 | list(APPEND EXPORT_DEPENDENCIES | ||
177 | - ${PUGI} | ||
178 | ${NGRAPH_LIBRARIES} | ||
179 | - gtest | ||
180 | - gtest_main | ||
181 | ) | ||
182 | |||
183 | set(TARGET_NAME commonTestUtils) | ||
184 | @@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME) | ||
185 | PUBLIC | ||
186 | ${IE_TESTS_ROOT}/ie_test_utils | ||
187 | $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> | ||
188 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
189 | PRIVATE | ||
190 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | ||
191 | ) | ||
192 | @@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) | ||
193 | target_link_libraries(${ADD_TARGET_NAME} | ||
194 | PUBLIC | ||
195 | ${EXPORT_DEPENDENCIES} | ||
196 | + pugixml | ||
197 | ) | ||
198 | endfunction() | ||
199 | |||
200 | diff --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 | ||
201 | index dbb0f4e5b..9586d651d 100644 | ||
202 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
203 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
204 | @@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) | ||
205 | list(APPEND EXPORT_DEPENDENCIES | ||
206 | commonTestUtils_s | ||
207 | inference_engine_s | ||
208 | - inference_engine_lp_transformations | ||
209 | - gmock) | ||
210 | + inference_engine_lp_transformations) | ||
211 | |||
212 | addIeTarget( | ||
213 | NAME ${TARGET_NAME} | ||
214 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
215 | index 2bc668965..e44ab9d5d 100644 | ||
216 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
217 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | ||
218 | @@ -22,7 +22,6 @@ function(add_helpers target_name) | ||
219 | target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
220 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" | ||
221 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
222 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | ||
223 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | ||
224 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | ||
225 | |||
226 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | ||
227 | index a2550bfaa..0eb616415 100644 | ||
228 | --- a/inference-engine/thirdparty/CMakeLists.txt | ||
229 | +++ b/inference-engine/thirdparty/CMakeLists.txt | ||
230 | @@ -51,28 +51,16 @@ function(build_with_lto) | ||
231 | function(ie_build_pugixml) | ||
232 | set(BUILD_TESTS_current ${BUILD_TESTS}) | ||
233 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) | ||
234 | - add_subdirectory(pugixml) | ||
235 | set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) | ||
236 | endfunction() | ||
237 | |||
238 | ie_build_pugixml() | ||
239 | add_subdirectory(stb_lib) | ||
240 | - add_subdirectory(ade) | ||
241 | add_subdirectory(fluid/modules/gapi) | ||
242 | |||
243 | - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
244 | - | ||
245 | - set_target_properties(pugixml ade fluid stb_image | ||
246 | + set_target_properties(fluid stb_image | ||
247 | PROPERTIES FOLDER thirdparty) | ||
248 | |||
249 | - # developer package | ||
250 | - | ||
251 | - ie_developer_export_targets(ade fluid pugixml) | ||
252 | - if(TARGET pugixml_mt) | ||
253 | - ie_developer_export_targets(pugixml_mt) | ||
254 | - set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) | ||
255 | - endif() | ||
256 | - | ||
257 | if(ENABLE_MKL_DNN) | ||
258 | set(SDL_cmake_included ON) | ||
259 | include(mkldnn.cmake) | ||
260 | -- | ||
261 | 2.26.2 | ||
262 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch deleted file mode 100644 index a4e58b8e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:45:48 +0800 | ||
4 | Subject: [PATCH 2/5] cldNN: disable Werror | ||
5 | |||
6 | Don't treat warnings as errors. This just leads to failures every time | ||
7 | we upgrade the compiler. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
17 | index 4b444eca..8610b9b8 100644 | ||
18 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
19 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
20 | @@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | ||
21 | MultiProcessorCompilation | ||
22 | DeadCodeEliminate | ||
23 | ExtensionsEnabled | ||
24 | - TreatWarnAsErrorEnabled | ||
25 | WarnLevel4 | ||
26 | NoFastMath | ||
27 | StackProtector | ||
28 | -- | ||
29 | 2.25.4 | ||
30 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch new file mode 100644 index 00000000..8a1464d5 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:49:35 +0530 | ||
4 | Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error | ||
5 | |||
6 | * Remove -Werror for: | ||
7 | |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] | ||
8 | | 129 | virtual JitDefinitions GetDefinitions() const = 0; | ||
9 | | | | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | src/plugins/intel_gpu/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt | ||
19 | index 2f3d9127dde..2fd4f5c1b3c 100644 | ||
20 | --- a/src/plugins/intel_gpu/CMakeLists.txt | ||
21 | +++ b/src/plugins/intel_gpu/CMakeLists.txt | ||
22 | @@ -47,7 +47,7 @@ add_subdirectory(thirdparty) | ||
23 | include(thirdparty/cmake/rapidjson.cmake) | ||
24 | |||
25 | if(CMAKE_COMPILER_IS_GNUCXX) | ||
26 | - ov_add_compiler_flags(-Werror) | ||
27 | + #ov_add_compiler_flags(-Werror) | ||
28 | endif() | ||
29 | |||
30 | add_subdirectory(src/runtime) | ||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch deleted file mode 100644 index 9c91ac4d..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch +++ /dev/null | |||
@@ -1,229 +0,0 @@ | |||
1 | From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 | ||
4 | Subject: [PATCH] cmake installation fixes | ||
5 | |||
6 | Make sure that libraries/samples/binaries are installed correctly. | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 14 -------------- | ||
11 | cmake/developer_package.cmake | 10 ++++++---- | ||
12 | .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ | ||
13 | inference-engine/samples/CMakeLists.txt | 9 +++------ | ||
14 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ | ||
15 | .../src/inference_engine/CMakeLists.txt | 4 ++-- | ||
16 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | ||
17 | inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- | ||
18 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | ||
19 | inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- | ||
20 | inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- | ||
21 | 11 files changed, 25 insertions(+), 30 deletions(-) | ||
22 | |||
23 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
24 | index 18ed02ee5..18f6094f3 100644 | ||
25 | --- a/CMakeLists.txt | ||
26 | +++ b/CMakeLists.txt | ||
27 | @@ -143,12 +143,8 @@ add_subdirectory(docs) | ||
28 | |||
29 | # install setupvars | ||
30 | |||
31 | -ie_cpack_add_component(setupvars REQUIRED) | ||
32 | |||
33 | if(UNIX) | ||
34 | - install(PROGRAMS scripts/setupvars/setupvars.sh | ||
35 | - DESTINATION bin | ||
36 | - COMPONENT setupvars) | ||
37 | elseif(WIN32) | ||
38 | install(PROGRAMS scripts/setupvars/setupvars.bat | ||
39 | DESTINATION bin | ||
40 | @@ -158,22 +154,12 @@ endif() | ||
41 | # install install_dependencies | ||
42 | |||
43 | if(UNIX) | ||
44 | - ie_cpack_add_component(install_dependencies REQUIRED) | ||
45 | - install(DIRECTORY scripts/install_dependencies/ | ||
46 | - DESTINATION install_dependencies | ||
47 | - COMPONENT install_dependencies) | ||
48 | endif() | ||
49 | |||
50 | # install files for demo | ||
51 | |||
52 | -ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) | ||
53 | |||
54 | if(UNIX) | ||
55 | - install(DIRECTORY scripts/demo/ | ||
56 | - DESTINATION deployment_tools/demo | ||
57 | - COMPONENT demo_scripts | ||
58 | - USE_SOURCE_PERMISSIONS | ||
59 | - PATTERN *.bat EXCLUDE) | ||
60 | elseif(WIN32) | ||
61 | install(DIRECTORY scripts/demo/ | ||
62 | DESTINATION deployment_tools/demo | ||
63 | diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake | ||
64 | index 86137c384..af011c361 100644 | ||
65 | --- a/cmake/developer_package.cmake | ||
66 | +++ b/cmake/developer_package.cmake | ||
67 | @@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH | ||
68 | include(CPackComponent) | ||
69 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | ||
70 | |||
71 | -set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
72 | +if (NOT DEFINED IE_CPACK_IE_DIR) | ||
73 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
74 | +endif() | ||
75 | |||
76 | # Search packages for the host system instead of packages for the target system | ||
77 | # in case of cross compilation these macros should be defined by the toolchain file | ||
78 | @@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir) | ||
79 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
80 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | ||
81 | else() | ||
82 | - set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
83 | - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
84 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
85 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
86 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) | ||
87 | endif() | ||
88 | endfunction() | ||
89 | @@ -147,7 +149,7 @@ endif() | ||
90 | |||
91 | # allow to override default OUTPUT_ROOT root | ||
92 | if(NOT DEFINED OUTPUT_ROOT) | ||
93 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | ||
94 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | ||
95 | endif() | ||
96 | |||
97 | # Enable postfixes for Debug/Release builds | ||
98 | diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | ||
99 | index b8d5ddf62..d086478f6 100644 | ||
100 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | ||
101 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | ||
102 | @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | ||
103 | if(COMMAND add_cpplint_target) | ||
104 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
105 | endif() | ||
106 | + | ||
107 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
108 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
109 | index 4dda7eecd..04e1b9c3e 100644 | ||
110 | --- a/inference-engine/samples/CMakeLists.txt | ||
111 | +++ b/inference-engine/samples/CMakeLists.txt | ||
112 | @@ -34,7 +34,7 @@ endif() | ||
113 | |||
114 | if(IE_MAIN_SOURCE_DIR) | ||
115 | # in case if samples are built from IE repo | ||
116 | - set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) | ||
117 | + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) | ||
118 | # hint for find_package(InferenceEngine in the samples folder) | ||
119 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | ||
120 | # hint for find_package(ngraph in the samples folder) | ||
121 | @@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1) | ||
122 | set (INTTYPES_FORMAT C99) | ||
123 | set (BUILD_TESTING OFF) | ||
124 | |||
125 | -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | ||
126 | - add_subdirectory(thirdparty/gflags) | ||
127 | - set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | ||
128 | -endif() | ||
129 | - | ||
130 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
131 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
132 | endif() | ||
133 | @@ -250,6 +245,8 @@ macro(ie_add_sample) | ||
134 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} | ||
135 | CUSTOM_FILTERS ${custom_filters}) | ||
136 | endif() | ||
137 | + | ||
138 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
139 | endmacro() | ||
140 | |||
141 | # collect all samples subdirectories | ||
142 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
143 | index 48dbed9f2..76532fd04 100644 | ||
144 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
145 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
146 | @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
147 | |||
148 | set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} | ||
149 | FOLDER cpp_samples) | ||
150 | + | ||
151 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
152 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
153 | index 105e666a3..5c2f70575 100644 | ||
154 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
155 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
156 | @@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME} | ||
157 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" | ||
158 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
159 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" | ||
160 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
161 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
162 | COMPONENT core) | ||
163 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
164 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
165 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
166 | COMPONENT core) | ||
167 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
168 | index aeebe4e04..310eb6231 100644 | ||
169 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
170 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
171 | @@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} | ||
172 | # install | ||
173 | |||
174 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules | ||
175 | - DESTINATION ${IE_CPACK_IE_DIR}/external | ||
176 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
177 | COMPONENT myriad) | ||
178 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
179 | index d7acf8908..be4ae4a76 100644 | ||
180 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
181 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
182 | @@ -24,4 +24,6 @@ addIeTargetTest( | ||
183 | ADD_CPPLINT | ||
184 | LABELS | ||
185 | CPU | ||
186 | -) | ||
187 | \ No newline at end of file | ||
188 | +) | ||
189 | + | ||
190 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
191 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
192 | index e4613f032..5fe9e7089 100644 | ||
193 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
194 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
195 | @@ -26,3 +26,5 @@ addIeTargetTest( | ||
196 | LABELS | ||
197 | IE | ||
198 | ) | ||
199 | + | ||
200 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
201 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
202 | index a4106753d..091339e17 100644 | ||
203 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
204 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
205 | @@ -27,4 +27,6 @@ addIeTargetTest( | ||
206 | LABELS | ||
207 | VPU | ||
208 | MYRIAD | ||
209 | -) | ||
210 | \ No newline at end of file | ||
211 | +) | ||
212 | + | ||
213 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
214 | diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
215 | index 58614d3ce..9dfa068e4 100644 | ||
216 | --- a/inference-engine/tools/compile_tool/CMakeLists.txt | ||
217 | +++ b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
218 | @@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
219 | # install | ||
220 | |||
221 | install(TARGETS compile_tool | ||
222 | - RUNTIME DESTINATION deployment_tools/tools/compile_tool | ||
223 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
224 | COMPONENT core) | ||
225 | |||
226 | install(FILES README.md | ||
227 | -- | ||
228 | 2.26.2 | ||
229 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch new file mode 100644 index 00000000..bbdeaa2a --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 | ||
4 | Subject: [PATCH 3/3] protobuf: allow target protoc to be built | ||
5 | |||
6 | We can run target binaries using a qemu wrapper so allow these to be | ||
7 | built and run. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | thirdparty/protobuf/CMakeLists.txt | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
18 | index f3b5520d6d2..7579f638c5a 100644 | ||
19 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
20 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
21 | @@ -163,7 +163,7 @@ macro(ov_add_frontend) | ||
22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) | ||
23 | add_custom_command( | ||
24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" | ||
25 | - COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
26 | + COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
27 | DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} | ||
28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" | ||
29 | VERBATIM | ||
30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt | ||
31 | index 15f32601f23..36853caf7dc 100644 | ||
32 | --- a/thirdparty/protobuf/CMakeLists.txt | ||
33 | +++ b/thirdparty/protobuf/CMakeLists.txt | ||
34 | @@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE) | ||
35 | if(CMAKE_CROSSCOMPILING OR | ||
36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR | ||
37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) | ||
38 | - set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) | ||
39 | + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
40 | else() | ||
41 | set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
42 | endif() | ||
43 | -- | ||
44 | 2.34.1 | ||
45 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch deleted file mode 100644 index ad4d8e8a..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 | ||
4 | Subject: [PATCH] cldnn: fix inclusion of headers | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- | ||
11 | inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + | ||
12 | .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- | ||
13 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
16 | index 282dcd844..0d5d4084c 100644 | ||
17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
19 | @@ -22,7 +22,7 @@ | ||
20 | # pragma GCC system_header | ||
21 | #endif | ||
22 | |||
23 | -#include <CL/cl2.hpp> | ||
24 | +#include <cl2.hpp> | ||
25 | |||
26 | #if defined __GNUC__ | ||
27 | # pragma GCC diagnostic pop | ||
28 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
29 | index cdc0de406..70883465b 100644 | ||
30 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
31 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
32 | @@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE | ||
33 | ${CMAKE_CURRENT_SOURCE_DIR} | ||
34 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
35 | ${CLDNN__IOCL_ICD_INCDIRS} | ||
36 | + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp | ||
37 | ${CLDNN_TOP_FOLDER}) | ||
38 | |||
39 | # install | ||
40 | diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
41 | index 97608c30a..3a04096c0 100644 | ||
42 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
43 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
44 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; | ||
45 | typedef cl_va_api_device_source_intel cl_device_source_intel; | ||
46 | typedef cl_va_api_device_set_intel cl_device_set_intel; | ||
47 | #endif | ||
48 | -#include <CL/cl_intel_planar_yuv.h> | ||
49 | +#include <CL/cl_ext_intel.h> | ||
50 | #include "cl_intel_usm_defs.h" | ||
51 | |||
52 | #include <memory> | ||
53 | -- | ||
54 | 2.26.2 | ||
55 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index 864c735e..816a98a3 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch | |||
@@ -1,33 +1,27 @@ | |||
1 | From 56078933a8397b7fae146156743408319eac1ae0 Mon Sep 17 00:00:00 2001 | 1 | From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Mon, 19 Oct 2020 23:29:23 +0800 | 3 | Date: Fri, 21 Oct 2022 11:38:23 +0800 |
4 | Subject: [PATCH] demos: use gflags from meta-oe | 4 | Subject: [PATCH] demos: use gflags from meta-oe |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
9 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
10 | |||
9 | --- | 11 | --- |
10 | demos/CMakeLists.txt | 4 ++-- | 12 | demos/CMakeLists.txt | 2 +- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 14 | ||
13 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt | 15 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt |
14 | index e5f17231..08d4e4e6 100644 | 16 | index 51767051c..fb7e3d22f 100644 |
15 | --- a/demos/CMakeLists.txt | 17 | --- a/demos/CMakeLists.txt |
16 | +++ b/demos/CMakeLists.txt | 18 | +++ b/demos/CMakeLists.txt |
17 | @@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) | 19 | @@ -141,7 +141,7 @@ endmacro() |
18 | endif() | 20 | find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) |
19 | #################################### | 21 | find_package(OpenVINO REQUIRED COMPONENTS Runtime) |
20 | |||
21 | -set (GFLAGS_IS_SUBPROJECT TRUE) | ||
22 | +set (GFLAGS_IS_SUBPROJECT FALSE) | ||
23 | set (HAVE_SYS_STAT_H 1) | ||
24 | set (HAVE_INTTYPES_H 1) | ||
25 | 22 | ||
26 | -add_subdirectory(thirdparty/gflags) | 23 | -add_subdirectory(thirdparty/gflags) |
27 | +#add_subdirectory(thirdparty/gflags) | 24 | +#add_subdirectory(thirdparty/gflags) |
25 | add_subdirectory(common/cpp) | ||
28 | 26 | ||
29 | if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) | 27 | find_package(OpenCV QUIET COMPONENTS gapi) |
30 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
31 | -- | ||
32 | 2.26.2 | ||
33 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb deleted file mode 100644 index 82ca4af8..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" | ||
2 | HOMEPAGE = "https://github.com/opencv/open_model_zoo" | ||
3 | DESCRIPTION = "This repository includes optimized deep learning \ | ||
4 | models and a set of demos to expedite development of high-performance \ | ||
5 | deep learning inference applications." | ||
6 | |||
7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ | ||
8 | " | ||
9 | |||
10 | SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de" | ||
11 | |||
12 | LICENSE = "Apache-2.0" | ||
13 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
14 | " | ||
15 | |||
16 | inherit cmake | ||
17 | |||
18 | S = "${WORKDIR}/git/demos" | ||
19 | |||
20 | DEPENDS += "openvino-inference-engine opencv gflags" | ||
21 | |||
22 | RDEPENDS_${PN} += " \ | ||
23 | python3-decorator \ | ||
24 | python3-defusedxml \ | ||
25 | python3-networkx \ | ||
26 | python3-protobuf \ | ||
27 | python3-test-generator \ | ||
28 | python3-requests \ | ||
29 | python3-pyyaml \ | ||
30 | " | ||
31 | |||
32 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
33 | |||
34 | EXTRA_OECMAKE += " \ | ||
35 | -DIE_MAIN_SOURCE_DIR=${B} \ | ||
36 | -DENABLE_SAMPLES=ON \ | ||
37 | -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \ | ||
38 | -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \ | ||
39 | -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \ | ||
40 | -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \ | ||
41 | -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \ | ||
42 | -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ | ||
43 | " | ||
44 | |||
45 | do_configure_prepend(){ | ||
46 | mkdir -p ${WORKDIR}/InferenceEngine/share | ||
47 | cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ | ||
48 | } | ||
49 | |||
50 | do_install(){ | ||
51 | install -d ${D}${libdir} | ||
52 | install -d ${D}${bindir} | ||
53 | install -d ${D}${datadir}/openvino/open-model-zoo/tools | ||
54 | install -d ${D}${datadir}/openvino/open-model-zoo/demos/python_demos | ||
55 | cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir} | ||
56 | cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} | ||
57 | cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo | ||
58 | cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools | ||
59 | cp -rf ${WORKDIR}/git/demos/python_demos ${D}${datadir}/openvino/open-model-zoo/demos | ||
60 | } | ||
61 | |||
62 | FILES_${PN} += "${datadir}/openvino" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb new file mode 100644 index 00000000..a9422e70 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb | |||
@@ -0,0 +1,54 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository" | ||
2 | HOMEPAGE = "https://github.com/opencv/open_model_zoo" | ||
3 | DESCRIPTION = "This repository includes optimized deep learning \ | ||
4 | models and a set of demos to expedite development of high-performance \ | ||
5 | deep learning inference applications." | ||
6 | |||
7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \ | ||
8 | file://0001-use-oe-gflags.patch \ | ||
9 | " | ||
10 | |||
11 | SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf" | ||
12 | |||
13 | LICENSE = "Apache-2.0" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
15 | " | ||
16 | |||
17 | inherit cmake | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | OECMAKE_SOURCEPATH = "${S}/demos" | ||
21 | |||
22 | DEPENDS += "openvino-inference-engine opencv gflags" | ||
23 | |||
24 | RDEPENDS:${PN} += " \ | ||
25 | python3-decorator \ | ||
26 | python3-defusedxml \ | ||
27 | python3-networkx \ | ||
28 | python3-protobuf \ | ||
29 | python3-requests \ | ||
30 | python3-pyyaml \ | ||
31 | python3-numpy \ | ||
32 | bash \ | ||
33 | " | ||
34 | |||
35 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
36 | COMPATIBLE_HOST:libc-musl = "null" | ||
37 | |||
38 | EXTRA_OECMAKE += " \ | ||
39 | -DENABLE_SAMPLES=ON \ | ||
40 | " | ||
41 | |||
42 | do_install(){ | ||
43 | install -d ${D}${libdir} | ||
44 | install -d ${D}${bindir} | ||
45 | install -d ${D}${datadir}/openvino/open-model-zoo/tools | ||
46 | install -d ${D}${datadir}/openvino/open-model-zoo/demos | ||
47 | cp -rf ${B}/intel64/Release/*.a ${D}${libdir} | ||
48 | cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir} | ||
49 | cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo | ||
50 | cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo | ||
51 | cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools | ||
52 | } | ||
53 | |||
54 | FILES:${PN} += "${datadir}/openvino" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb deleted file mode 100644 index a2cc2467..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/1;lfs=0 \ | ||
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1381.zip;name=ma2450 \ | ||
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1381.zip;name=ma248x \ | ||
10 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1381.zip;name=ma2x8x \ | ||
11 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ | ||
12 | file://0001-inference-engine-use-system-installed-packages.patch \ | ||
13 | file://0002-cldNN-disable-Werror.patch \ | ||
14 | file://0003-inference-engine-installation-fixes.patch \ | ||
15 | file://0005-cldnn-fix-inclusion-of-headers.patch \ | ||
16 | file://0001-dont-install-licenses-and-version-file.patch \ | ||
17 | " | ||
18 | |||
19 | SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c" | ||
20 | SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51" | ||
21 | |||
22 | SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745" | ||
23 | SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204" | ||
24 | SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a" | ||
25 | |||
26 | LICENSE = "Apache-2.0 & ISSL & MIT" | ||
27 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
28 | file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ | ||
29 | file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | ||
30 | file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ | ||
31 | " | ||
32 | LICENSE_${PN}-vpu-firmware = "ISSL" | ||
33 | |||
34 | inherit cmake python3native | ||
35 | |||
36 | S = "${WORKDIR}/git" | ||
37 | |||
38 | EXTRA_OECMAKE += " \ | ||
39 | -DENABLE_OPENCV=0 \ | ||
40 | -DENABLE_PLUGIN_RPATH=0 \ | ||
41 | -DENABLE_GNA=0 \ | ||
42 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
43 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
44 | -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ | ||
45 | -DENABLE_SAMPLES=1 \ | ||
46 | -DIE_CPACK_IE_DIR=${prefix} \ | ||
47 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ | ||
48 | -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ | ||
49 | -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ | ||
50 | -DNGRAPH_JSON_ENABLE=FALSE \ | ||
51 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
52 | -DENABLE_SPEECH_DEMO=FALSE \ | ||
53 | -DENABLE_DATA=FALSE \ | ||
54 | " | ||
55 | |||
56 | DEPENDS += "libusb1 \ | ||
57 | ade \ | ||
58 | opencv \ | ||
59 | pugixml \ | ||
60 | protobuf-native \ | ||
61 | tbb \ | ||
62 | onednn \ | ||
63 | " | ||
64 | |||
65 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
66 | COMPATIBLE_HOST_libc-musl = "null" | ||
67 | |||
68 | PACKAGECONFIG ?= "vpu" | ||
69 | PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime" | ||
70 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython" | ||
71 | PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" | ||
72 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
73 | |||
74 | do_install_append() { | ||
75 | if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then | ||
76 | install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/ | ||
77 | install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ | ||
78 | install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ | ||
79 | fi | ||
80 | |||
81 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
82 | install -d ${D}${datadir}/inference_engine | ||
83 | mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ | ||
84 | |||
85 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
86 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
87 | mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
88 | mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
89 | |||
90 | rm -rf ${D}${prefix}/python | ||
91 | fi | ||
92 | |||
93 | rm -rf ${D}${prefix}/deployment_tools | ||
94 | |||
95 | # Remove the samples source directory. We install the built samples. | ||
96 | rm -rf ${D}/usr/samples | ||
97 | } | ||
98 | |||
99 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
100 | # instead of RSS | ||
101 | SSTATE_SCAN_FILES_append = " *.cmake" | ||
102 | |||
103 | FILES_${PN}-dev = "${includedir} \ | ||
104 | ${libdir}/cmake \ | ||
105 | " | ||
106 | |||
107 | FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ | ||
108 | ${datadir}/openvino \ | ||
109 | ${libdir}/custom_kernels \ | ||
110 | ${libdir}/plugins.xml \ | ||
111 | ${libdir}/cache.json \ | ||
112 | " | ||
113 | |||
114 | # Move inference engine samples into a separate package | ||
115 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | ||
116 | |||
117 | FILES_${PN}-samples = "${datadir}/inference_engine \ | ||
118 | ${bindir} \ | ||
119 | " | ||
120 | FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" | ||
121 | |||
122 | # Package for inference engine python API | ||
123 | PACKAGES =+ "${PN}-${PYTHON_PN}" | ||
124 | |||
125 | FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb new file mode 100644 index 00000000..675d9920 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb | |||
@@ -0,0 +1,146 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \ | ||
8 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ | ||
9 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ | ||
10 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ | ||
11 | git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ | ||
12 | git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ | ||
13 | git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ | ||
14 | git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \ | ||
15 | git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \ | ||
16 | git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ | ||
17 | git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ | ||
18 | git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ | ||
19 | git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \ | ||
20 | file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ | ||
21 | file://0002-cmake-Fix-overloaded-virtual-error.patch \ | ||
22 | file://0003-protobuf-allow-target-protoc-to-be-built.patch \ | ||
23 | " | ||
24 | |||
25 | SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78" | ||
26 | SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3" | ||
27 | SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c" | ||
28 | SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" | ||
29 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" | ||
30 | SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" | ||
31 | SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" | ||
32 | SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" | ||
33 | SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851" | ||
34 | SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" | ||
35 | SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" | ||
36 | SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" | ||
37 | SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b" | ||
38 | SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry" | ||
39 | |||
40 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" | ||
41 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
42 | file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ | ||
43 | file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ | ||
44 | file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ | ||
45 | file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
46 | file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \ | ||
47 | file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \ | ||
48 | file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
49 | file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ | ||
50 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ | ||
51 | file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ | ||
52 | file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \ | ||
53 | file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
54 | " | ||
55 | |||
56 | inherit cmake python3native pkgconfig qemu | ||
57 | |||
58 | S = "${WORKDIR}/git" | ||
59 | EXTRA_OECMAKE += " \ | ||
60 | -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ | ||
61 | -DENABLE_OPENCV=OFF \ | ||
62 | -DENABLE_INTEL_GNA=OFF \ | ||
63 | -DENABLE_SYSTEM_TBB=ON \ | ||
64 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
65 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
66 | -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ | ||
67 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
68 | -DENABLE_DATA=FALSE \ | ||
69 | -DENABLE_SYSTEM_PUGIXML=TRUE \ | ||
70 | -DENABLE_OV_ONNX_FRONTEND=FALSE \ | ||
71 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ | ||
72 | -DENABLE_FUZZING=OFF \ | ||
73 | -DENABLE_TBBBIND_2_5=OFF \ | ||
74 | -DCPACK_GENERATOR=RPM \ | ||
75 | -DENABLE_SYSTEM_FLATBUFFERS=ON \ | ||
76 | -DENABLE_SYSTEM_SNAPPY=ON \ | ||
77 | -DFETCHCONTENT_BASE_DIR="${S}" \ | ||
78 | -DENABLE_INTEL_NPU=OFF \ | ||
79 | " | ||
80 | |||
81 | DEPENDS += "\ | ||
82 | flatbuffers-native \ | ||
83 | pugixml \ | ||
84 | python3-pybind11 \ | ||
85 | python3-pybind11-native \ | ||
86 | qemu-native \ | ||
87 | snappy \ | ||
88 | tbb \ | ||
89 | " | ||
90 | |||
91 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
92 | COMPATIBLE_HOST:libc-musl = "null" | ||
93 | |||
94 | PACKAGECONFIG ?= "opencl samples" | ||
95 | PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," | ||
96 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress" | ||
97 | PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" | ||
98 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
99 | |||
100 | do_configure:prepend() { | ||
101 | # Dont set PROJECT_ROOT_DIR | ||
102 | sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt | ||
103 | |||
104 | # qemu wrapper that can be used by cmake to run target binaries. | ||
105 | qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" | ||
106 | cat > ${WORKDIR}/qemuwrapper << EOF | ||
107 | #!/bin/sh | ||
108 | $qemu_binary "\$@" | ||
109 | EOF | ||
110 | chmod +x ${WORKDIR}/qemuwrapper | ||
111 | } | ||
112 | |||
113 | do_install:append() { | ||
114 | rm -rf ${D}${prefix}/install_dependencies | ||
115 | rm -rf ${D}${prefix}/setupvars.sh | ||
116 | |||
117 | find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} + | ||
118 | } | ||
119 | |||
120 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
121 | # instead of RSS | ||
122 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
123 | |||
124 | FILES:${PN} += "\ | ||
125 | ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ | ||
126 | ${libdir}/openvino-${PV}/plugins.xml \ | ||
127 | ${libdir}/openvino-${PV}/cache.json \ | ||
128 | " | ||
129 | |||
130 | # Move inference engine samples into a separate package | ||
131 | PACKAGES =+ "${PN}-samples" | ||
132 | |||
133 | FILES:${PN}-samples = "${datadir}/openvino \ | ||
134 | ${bindir} \ | ||
135 | ${libdir}/libformat_reader.a \ | ||
136 | ${libdir}/libopencv_c_wrapper.a \ | ||
137 | " | ||
138 | |||
139 | RDEPENDS:${PN}-samples += "python3-core" | ||
140 | |||
141 | # Package for inference engine python API | ||
142 | PACKAGES =+ "${PN}-python3" | ||
143 | |||
144 | FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" | ||
145 | |||
146 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$" | ||