diff options
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch | 31 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | 78 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch | 58 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch | 23 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch | 15 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb) | 25 |
6 files changed, 121 insertions, 109 deletions
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 index 185a475b..88aab623 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From a7ee6a27135fef24a398690d9280aca79315fa25 Mon Sep 17 00:00:00 2001 | 1 | From 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 | 3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 |
4 | Subject: [PATCH] don't install licenses and version | 4 | Subject: [PATCH] don't install licenses and version |
@@ -7,14 +7,15 @@ 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 | --- | 9 | --- |
10 | CMakeLists.txt | 13 ++----------- | 10 | ngraph/CMakeLists.txt | 13 ++----------- |
11 | 1 file changed, 2 insertions(+), 11 deletions(-) | 11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ |
12 | 2 files changed, 4 insertions(+), 11 deletions(-) | ||
12 | 13 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt |
14 | index c347cb465d..9f57a5ed9c 100644 | 15 | index 4eb969f02..c52aec2ec 100644 |
15 | --- a/CMakeLists.txt | 16 | --- a/ngraph/CMakeLists.txt |
16 | +++ b/CMakeLists.txt | 17 | +++ b/ngraph/CMakeLists.txt |
17 | @@ -641,7 +641,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | 18 | @@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) |
18 | install(EXPORT ngraphTargets | 19 | install(EXPORT ngraphTargets |
19 | FILE ngraphTargets.cmake | 20 | FILE ngraphTargets.cmake |
20 | NAMESPACE ngraph:: | 21 | NAMESPACE ngraph:: |
@@ -23,7 +24,7 @@ index c347cb465d..9f57a5ed9c 100644 | |||
23 | COMPONENT ngraph) | 24 | COMPONENT ngraph) |
24 | 25 | ||
25 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | 26 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in |
26 | @@ -654,15 +654,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | 27 | @@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) |
27 | 28 | ||
28 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | 29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake |
29 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | 30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake |
@@ -40,6 +41,16 @@ index c347cb465d..9f57a5ed9c 100644 | |||
40 | - | 41 | - |
41 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | 42 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) |
42 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION 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}) | ||
43 | -- | 54 | -- |
44 | 2.25.4 | 55 | 2.26.2 |
45 | 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 index 3fff5607..bbf186df 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001 | 1 | From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 | 3 | Date: Wed, 10 Jun 2020 09:43:55 +0800 |
4 | Subject: [PATCH] inference-engine: use system installed packages | 4 | Subject: [PATCH] inference-engine: use system installed packages |
@@ -11,15 +11,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
11 | --- | 11 | --- |
12 | cmake/dependencies.cmake | 17 -------------- | 12 | cmake/dependencies.cmake | 17 -------------- |
13 | inference-engine/CMakeLists.txt | 2 +- | 13 | inference-engine/CMakeLists.txt | 2 +- |
14 | inference-engine/cmake/ie_parallel.cmake | 10 ++------- | 14 | inference-engine/cmake/ie_parallel.cmake | 7 +----- |
15 | .../src/inference_engine/CMakeLists.txt | 22 +------------------ | 15 | .../src/inference_engine/CMakeLists.txt | 23 +------------------ |
16 | .../src/legacy_api/CMakeLists.txt | 3 +-- | 16 | .../src/legacy_api/CMakeLists.txt | 3 +-- |
17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - | 17 | .../src/vpu/graph_transformer/CMakeLists.txt | 1 - |
18 | .../common_test_utils/CMakeLists.txt | 7 ++---- | 18 | .../common_test_utils/CMakeLists.txt | 7 ++---- |
19 | .../unit_test_utils/CMakeLists.txt | 3 +-- | 19 | .../unit_test_utils/CMakeLists.txt | 3 +-- |
20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - | 20 | .../tests_deprecated/helpers/CMakeLists.txt | 1 - |
21 | inference-engine/thirdparty/CMakeLists.txt | 14 +----------- | 21 | inference-engine/thirdparty/CMakeLists.txt | 14 +---------- |
22 | 10 files changed, 9 insertions(+), 71 deletions(-) | 22 | 10 files changed, 8 insertions(+), 70 deletions(-) |
23 | 23 | ||
24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 24 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
25 | index 2a5a74db6..9cc9a6c94 100644 | 25 | index 2a5a74db6..9cc9a6c94 100644 |
@@ -52,54 +52,60 @@ index 2a5a74db6..9cc9a6c94 100644 | |||
52 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 52 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
53 | endif() | 53 | endif() |
54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 54 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
55 | index 39ff413bc..ba8ed354c 100644 | 55 | index 7f45ab021..db85e8690 100644 |
56 | --- a/inference-engine/CMakeLists.txt | 56 | --- a/inference-engine/CMakeLists.txt |
57 | +++ b/inference-engine/CMakeLists.txt | 57 | +++ b/inference-engine/CMakeLists.txt |
58 | @@ -54,7 +54,7 @@ function(ie_developer_export) | 58 | @@ -57,7 +57,7 @@ function(ie_developer_export) |
59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | 59 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") |
60 | 60 | ||
61 | # Custom target to build only Inference Engine Developer Package targets | 61 | # Custom target to build only Inference Engine Developer Package targets |
62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags) | 62 | - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags |
63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets}) | 63 | + add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} |
64 | inference_engine_ir_reader inference_engine_ir_v7_reader) | ||
64 | endfunction() | 65 | endfunction() |
65 | 66 | ||
66 | add_subdirectory(thirdparty) | ||
67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 67 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
68 | index 0f3c41e0a..b3b2dfdab 100644 | 68 | index 7fd77ccc0..143dcf669 100644 |
69 | --- a/inference-engine/cmake/ie_parallel.cmake | 69 | --- a/inference-engine/cmake/ie_parallel.cmake |
70 | +++ b/inference-engine/cmake/ie_parallel.cmake | 70 | +++ b/inference-engine/cmake/ie_parallel.cmake |
71 | @@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | 71 | @@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) |
72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | 72 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") |
73 | 73 | ||
74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 74 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
75 | - find_package(TBB COMPONENTS tbb tbbmalloc) | ||
76 | - if (TBB_FOUND) | 75 | - if (TBB_FOUND) |
77 | - set(IE_THREAD_DEFINE "IE_THREAD_TBB") | 76 | set(IE_THREAD_DEFINE "IE_THREAD_TBB") |
78 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | 77 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) |
79 | - else () | 78 | - else () |
80 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ | 79 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ |
81 | - SEQ method will be used for ${TARGET_NAME}") | 80 | - SEQ method will be used for ${TARGET_NAME}") |
82 | - endif () | 81 | - endif () |
83 | + set(IE_THREAD_DEFINE "IE_THREAD_TBB") | 82 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) |
84 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | ||
85 | elseif (THREADING STREQUAL "OMP") | 83 | elseif (THREADING STREQUAL "OMP") |
86 | if (WIN32) | 84 | if (WIN32) |
87 | set(omp_lib_name libiomp5md) | 85 | set(omp_lib_name libiomp5md) |
88 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 86 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
89 | index 4ae0d5607..4106cf8b4 100644 | 87 | index 9ab888983..105e666a3 100644 |
90 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 88 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
91 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 89 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
92 | @@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) | 90 | @@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE |
93 | target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) | 91 | $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) |
94 | endif() | 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) | ||
95 | 101 | ||
96 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> | 102 | -target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> |
97 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) | 103 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) |
98 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) | 104 | +target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) |
99 | 105 | ||
100 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" | 106 | target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" |
101 | $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES> | 107 | "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp |
102 | @@ -233,25 +232,6 @@ list(APPEND core_components ngraph) | 108 | @@ -233,25 +231,6 @@ list(APPEND core_components ngraph) |
103 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 109 | if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
104 | ie_cpack_add_component(tbb REQUIRED) | 110 | ie_cpack_add_component(tbb REQUIRED) |
105 | list(APPEND core_components tbb) | 111 | list(APPEND core_components tbb) |
@@ -126,10 +132,10 @@ index 4ae0d5607..4106cf8b4 100644 | |||
126 | 132 | ||
127 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | 133 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) |
128 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt | 134 | diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt |
129 | index 85524310b..dc25cae2f 100644 | 135 | index ed87a073a..adc970a09 100644 |
130 | --- a/inference-engine/src/legacy_api/CMakeLists.txt | 136 | --- a/inference-engine/src/legacy_api/CMakeLists.txt |
131 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt | 137 | +++ b/inference-engine/src/legacy_api/CMakeLists.txt |
132 | @@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM | 138 | @@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE |
133 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl | 139 | ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl |
134 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | 140 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
135 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> | 141 | $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> |
@@ -140,7 +146,7 @@ index 85524310b..dc25cae2f 100644 | |||
140 | # Create shared library | 146 | # Create shared library |
141 | 147 | ||
142 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 148 | diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
143 | index 982d3c7fa..db881246c 100644 | 149 | index a45437453..7a67a8226 100644 |
144 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 150 | --- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
145 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt | 151 | +++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt |
146 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) | 152 | @@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) |
@@ -192,36 +198,36 @@ index efead7271..732abee2d 100644 | |||
192 | endfunction() | 198 | endfunction() |
193 | 199 | ||
194 | 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 | 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 |
195 | index df611c700..06bd911ae 100644 | 201 | index dbb0f4e5b..9586d651d 100644 |
196 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 202 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
197 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 203 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
198 | @@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES | 204 | @@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) |
205 | list(APPEND EXPORT_DEPENDENCIES | ||
199 | commonTestUtils_s | 206 | commonTestUtils_s |
200 | inference_engine_s | 207 | inference_engine_s |
201 | inference_engine_lp_transformations | 208 | - inference_engine_lp_transformations |
202 | - inference_engine_ir_reader | ||
203 | - gmock) | 209 | - gmock) |
204 | + inference_engine_ir_reader) | 210 | + inference_engine_lp_transformations) |
205 | 211 | ||
206 | addIeTarget( | 212 | addIeTarget( |
207 | NAME ${TARGET_NAME} | 213 | NAME ${TARGET_NAME} |
208 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 214 | diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
209 | index bf915e52d..9e7173db6 100644 | 215 | index 2bc668965..e44ab9d5d 100644 |
210 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 216 | --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
211 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt | 217 | +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt |
212 | @@ -23,7 +23,6 @@ function(add_helpers target_name) | 218 | @@ -22,7 +22,6 @@ function(add_helpers target_name) |
219 | target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
213 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" | 220 | "${IE_MAIN_SOURCE_DIR}/src/inference_engine" |
214 | $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES> | ||
215 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> | 221 | $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> |
216 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> | 222 | - $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> |
217 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" | 223 | "${IE_MAIN_SOURCE_DIR}/src/vpu/" |
218 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") | 224 | PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") |
219 | 225 | ||
220 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 226 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
221 | index f94453e06..b3c25daf4 100644 | 227 | index a2550bfaa..0eb616415 100644 |
222 | --- a/inference-engine/thirdparty/CMakeLists.txt | 228 | --- a/inference-engine/thirdparty/CMakeLists.txt |
223 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 229 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
224 | @@ -38,28 +38,16 @@ function(build_with_lto) | 230 | @@ -51,28 +51,16 @@ function(build_with_lto) |
225 | function(ie_build_pugixml) | 231 | function(ie_build_pugixml) |
226 | set(BUILD_TESTS_current ${BUILD_TESTS}) | 232 | set(BUILD_TESTS_current ${BUILD_TESTS}) |
227 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) | 233 | set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) |
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 index ac34fa4f..9c91ac4d 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From d9adfdc9c802fdb880fb658085854384f90a88c2 Mon Sep 17 00:00:00 2001 | 1 | From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 | 3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 |
4 | Subject: [PATCH] cmake installation fixes | 4 | Subject: [PATCH] cmake installation fixes |
@@ -9,7 +9,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
9 | --- | 9 | --- |
10 | CMakeLists.txt | 14 -------------- | 10 | CMakeLists.txt | 14 -------------- |
11 | cmake/developer_package.cmake | 10 ++++++---- | 11 | cmake/developer_package.cmake | 10 ++++++---- |
12 | .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++ | 12 | .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ |
13 | inference-engine/samples/CMakeLists.txt | 9 +++------ | 13 | inference-engine/samples/CMakeLists.txt | 9 +++------ |
14 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ | 14 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ |
15 | .../src/inference_engine/CMakeLists.txt | 4 ++-- | 15 | .../src/inference_engine/CMakeLists.txt | 4 ++-- |
@@ -17,13 +17,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
17 | inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- | 17 | inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- |
18 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | 18 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ |
19 | inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- | 19 | inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- |
20 | 10 files changed, 24 insertions(+), 29 deletions(-) | 20 | inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- |
21 | 11 files changed, 25 insertions(+), 30 deletions(-) | ||
21 | 22 | ||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 23 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
23 | index 1f981ed25..2c014ca27 100644 | 24 | index 18ed02ee5..18f6094f3 100644 |
24 | --- a/CMakeLists.txt | 25 | --- a/CMakeLists.txt |
25 | +++ b/CMakeLists.txt | 26 | +++ b/CMakeLists.txt |
26 | @@ -121,12 +121,8 @@ add_subdirectory(docs) | 27 | @@ -143,12 +143,8 @@ add_subdirectory(docs) |
27 | 28 | ||
28 | # install setupvars | 29 | # install setupvars |
29 | 30 | ||
@@ -36,7 +37,7 @@ index 1f981ed25..2c014ca27 100644 | |||
36 | elseif(WIN32) | 37 | elseif(WIN32) |
37 | install(PROGRAMS scripts/setupvars/setupvars.bat | 38 | install(PROGRAMS scripts/setupvars/setupvars.bat |
38 | DESTINATION bin | 39 | DESTINATION bin |
39 | @@ -136,22 +132,12 @@ endif() | 40 | @@ -158,22 +154,12 @@ endif() |
40 | # install install_dependencies | 41 | # install install_dependencies |
41 | 42 | ||
42 | if(UNIX) | 43 | if(UNIX) |
@@ -60,7 +61,7 @@ index 1f981ed25..2c014ca27 100644 | |||
60 | install(DIRECTORY scripts/demo/ | 61 | install(DIRECTORY scripts/demo/ |
61 | DESTINATION deployment_tools/demo | 62 | DESTINATION deployment_tools/demo |
62 | diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake | 63 | diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake |
63 | index 5e022244b..6e2cbf44e 100644 | 64 | index 86137c384..af011c361 100644 |
64 | --- a/cmake/developer_package.cmake | 65 | --- a/cmake/developer_package.cmake |
65 | +++ b/cmake/developer_package.cmake | 66 | +++ b/cmake/developer_package.cmake |
66 | @@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH | 67 | @@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH |
@@ -94,10 +95,10 @@ index 5e022244b..6e2cbf44e 100644 | |||
94 | endif() | 95 | endif() |
95 | 96 | ||
96 | # Enable postfixes for Debug/Release builds | 97 | # Enable postfixes for Debug/Release builds |
97 | diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | 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 |
98 | index b8d5ddf62..d086478f6 100644 | 99 | index b8d5ddf62..d086478f6 100644 |
99 | --- a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | 100 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt |
100 | +++ b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt | 101 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt |
101 | @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | 102 | @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) |
102 | if(COMMAND add_cpplint_target) | 103 | if(COMMAND add_cpplint_target) |
103 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | 104 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) |
@@ -105,7 +106,7 @@ index b8d5ddf62..d086478f6 100644 | |||
105 | + | 106 | + |
106 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 107 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
107 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 108 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
108 | index 594e581b1..4e95a7808 100644 | 109 | index 4dda7eecd..04e1b9c3e 100644 |
109 | --- a/inference-engine/samples/CMakeLists.txt | 110 | --- a/inference-engine/samples/CMakeLists.txt |
110 | +++ b/inference-engine/samples/CMakeLists.txt | 111 | +++ b/inference-engine/samples/CMakeLists.txt |
111 | @@ -34,7 +34,7 @@ endif() | 112 | @@ -34,7 +34,7 @@ endif() |
@@ -117,7 +118,7 @@ index 594e581b1..4e95a7808 100644 | |||
117 | # hint for find_package(InferenceEngine in the samples folder) | 118 | # hint for find_package(InferenceEngine in the samples folder) |
118 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | 119 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") |
119 | # hint for find_package(ngraph in the samples folder) | 120 | # hint for find_package(ngraph in the samples folder) |
120 | @@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) | 121 | @@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1) |
121 | set (INTTYPES_FORMAT C99) | 122 | set (INTTYPES_FORMAT C99) |
122 | set (BUILD_TESTING OFF) | 123 | set (BUILD_TESTING OFF) |
123 | 124 | ||
@@ -129,7 +130,7 @@ index 594e581b1..4e95a7808 100644 | |||
129 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | 130 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
130 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | 131 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") |
131 | endif() | 132 | endif() |
132 | @@ -239,6 +234,8 @@ macro(ie_add_sample) | 133 | @@ -250,6 +245,8 @@ macro(ie_add_sample) |
133 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} | 134 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} |
134 | CUSTOM_FILTERS ${custom_filters}) | 135 | CUSTOM_FILTERS ${custom_filters}) |
135 | endif() | 136 | endif() |
@@ -149,10 +150,10 @@ index 48dbed9f2..76532fd04 100644 | |||
149 | + | 150 | + |
150 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 151 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
151 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 152 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
152 | index 4ae0d5607..b9ee12498 100644 | 153 | index 105e666a3..5c2f70575 100644 |
153 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 154 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
154 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 155 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
155 | @@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME} | 156 | @@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME} |
156 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" | 157 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" |
157 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" | 158 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" |
158 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" | 159 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" |
@@ -164,7 +165,7 @@ index 4ae0d5607..b9ee12498 100644 | |||
164 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | 165 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} |
165 | COMPONENT core) | 166 | COMPONENT core) |
166 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 167 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
167 | index bf30d127c..6ed8c4081 100644 | 168 | index aeebe4e04..310eb6231 100644 |
168 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 169 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
169 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 170 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
170 | @@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} | 171 | @@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} |
@@ -175,10 +176,10 @@ index bf30d127c..6ed8c4081 100644 | |||
175 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | 176 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d |
176 | COMPONENT myriad) | 177 | COMPONENT myriad) |
177 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | 178 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt |
178 | index 9ec5ad025..45c62571a 100644 | 179 | index d7acf8908..be4ae4a76 100644 |
179 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | 180 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt |
180 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | 181 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt |
181 | @@ -22,4 +22,6 @@ addIeTargetTest( | 182 | @@ -24,4 +24,6 @@ addIeTargetTest( |
182 | ADD_CPPLINT | 183 | ADD_CPPLINT |
183 | LABELS | 184 | LABELS |
184 | CPU | 185 | CPU |
@@ -188,20 +189,20 @@ index 9ec5ad025..45c62571a 100644 | |||
188 | + | 189 | + |
189 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 190 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
190 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 191 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
191 | index 3eb21a434..09ba9225a 100644 | 192 | index e4613f032..5fe9e7089 100644 |
192 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 193 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
193 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 194 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
194 | @@ -15,3 +15,5 @@ addIeTargetTest( | 195 | @@ -26,3 +26,5 @@ addIeTargetTest( |
195 | LABELS | 196 | LABELS |
196 | IE | 197 | IE |
197 | ) | 198 | ) |
198 | + | 199 | + |
199 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 200 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
200 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | 201 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt |
201 | index 072103292..117cc9ee1 100644 | 202 | index a4106753d..091339e17 100644 |
202 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | 203 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt |
203 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | 204 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt |
204 | @@ -26,4 +26,6 @@ addIeTargetTest( | 205 | @@ -27,4 +27,6 @@ addIeTargetTest( |
205 | LABELS | 206 | LABELS |
206 | VPU | 207 | VPU |
207 | MYRIAD | 208 | MYRIAD |
@@ -210,6 +211,19 @@ index 072103292..117cc9ee1 100644 | |||
210 | +) | 211 | +) |
211 | + | 212 | + |
212 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 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 | ||
213 | -- | 227 | -- |
214 | 2.26.2 | 228 | 2.26.2 |
215 | 229 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch deleted file mode 100644 index 1a54a124..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vladimir Zinoviev <vladimir.zinoviev@intel.com> | ||
3 | Date: Sun, 14 Jun 2020 18:54:36 +0300 | ||
4 | Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55] | ||
7 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
8 | --- | ||
9 | .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
13 | index 3dbdfd0b22..2226f1a874 100644 | ||
14 | --- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
15 | +++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h | ||
16 | @@ -25,6 +25,7 @@ | ||
17 | #include <array> | ||
18 | #include <string> | ||
19 | #include <utility> | ||
20 | +#include <stdexcept> | ||
21 | |||
22 | namespace kernel_selector { | ||
23 | #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9 | ||
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 index d47d273c..ad4d8e8a 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001 | 1 | From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 | 3 | Date: Wed, 10 Jun 2020 09:50:19 +0800 |
4 | Subject: [PATCH] cldnn: fix inclusion of headers | 4 | Subject: [PATCH] cldnn: fix inclusion of headers |
@@ -13,17 +13,20 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
13 | 3 files changed, 3 insertions(+), 2 deletions(-) | 13 | 3 files changed, 3 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 15 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
16 | index fce7d8f17..827e5764a 100644 | 16 | index 282dcd844..0d5d4084c 100644 |
17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 17 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 18 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp |
19 | @@ -21,4 +21,4 @@ | 19 | @@ -22,7 +22,7 @@ |
20 | # pragma GCC system_header | 20 | # pragma GCC system_header |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | -#include <CL/cl2.hpp> | 23 | -#include <CL/cl2.hpp> |
24 | +#include <cl2.hpp> | 24 | +#include <cl2.hpp> |
25 | |||
26 | #if defined __GNUC__ | ||
27 | # pragma GCC diagnostic pop | ||
25 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt | 28 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt |
26 | index eeb9b5c80..32a283ba4 100644 | 29 | index cdc0de406..70883465b 100644 |
27 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt | 30 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt |
28 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt | 31 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt |
29 | @@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE | 32 | @@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE |
@@ -35,7 +38,7 @@ index eeb9b5c80..32a283ba4 100644 | |||
35 | 38 | ||
36 | # install | 39 | # install |
37 | 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 | 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 |
38 | index c67c81726..5ca48c597 100644 | 41 | index 97608c30a..3a04096c0 100644 |
39 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 42 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp |
40 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 43 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp |
41 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; | 44 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; |
@@ -48,5 +51,5 @@ index c67c81726..5ca48c597 100644 | |||
48 | 51 | ||
49 | #include <memory> | 52 | #include <memory> |
50 | -- | 53 | -- |
51 | 2.25.4 | 54 | 2.26.2 |
52 | 55 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb index c2863e65..a2cc2467 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb | |||
@@ -4,25 +4,24 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | |||
4 | deep learning models through a high-level C++ Inference Engine API \ | 4 | deep learning models through a high-level C++ Inference Engine API \ |
5 | integrated with application logic." | 5 | integrated with application logic." |
6 | 6 | ||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/4;lfs=0 \ | 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_1223.zip;name=ma2450 \ | 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_1223.zip;name=ma248x \ | 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_1223.zip;name=ma2x8x \ | 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 \ | 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 \ | 12 | file://0001-inference-engine-use-system-installed-packages.patch \ |
13 | file://0002-cldNN-disable-Werror.patch \ | 13 | file://0002-cldNN-disable-Werror.patch \ |
14 | file://0003-inference-engine-installation-fixes.patch \ | 14 | file://0003-inference-engine-installation-fixes.patch \ |
15 | file://0004-fix-compilation-errors.patch \ | ||
16 | file://0005-cldnn-fix-inclusion-of-headers.patch \ | 15 | file://0005-cldnn-fix-inclusion-of-headers.patch \ |
17 | file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \ | 16 | file://0001-dont-install-licenses-and-version-file.patch \ |
18 | " | 17 | " |
19 | 18 | ||
20 | SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6" | 19 | SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c" |
21 | SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab" | 20 | SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51" |
22 | 21 | ||
23 | SRC_URI[ma2450.sha256sum] = "4dc246bd12d7a21c1b10ac3e090b30043777c4ea862e1e4119536ba03c5878ef" | 22 | SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745" |
24 | SRC_URI[ma248x.sha256sum] = "64dd77ecd2f7172421414a388a87be4e6271894a982a58b3829f9de1a1869abd" | 23 | SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204" |
25 | SRC_URI[ma2x8x.sha256sum] = "d1d209221c1389a9a04e14ffeeaff1c3308f6ab105c7bd22f0e300df01cce4d8" | 24 | SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a" |
26 | 25 | ||
27 | LICENSE = "Apache-2.0 & ISSL & MIT" | 26 | LICENSE = "Apache-2.0 & ISSL & MIT" |
28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 27 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |
@@ -86,11 +85,13 @@ do_install_append() { | |||
86 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 85 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
87 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | 86 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ |
88 | mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | 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 | 89 | ||
90 | rm -rf ${D}${prefix}/python | 90 | rm -rf ${D}${prefix}/python |
91 | rm -rf ${D}${prefix}/deployment_tools | ||
92 | fi | 91 | fi |
93 | 92 | ||
93 | rm -rf ${D}${prefix}/deployment_tools | ||
94 | |||
94 | # Remove the samples source directory. We install the built samples. | 95 | # Remove the samples source directory. We install the built samples. |
95 | rm -rf ${D}/usr/samples | 96 | rm -rf ${D}/usr/samples |
96 | } | 97 | } |