diff options
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch | 30 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | 195 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch | 154 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch | 53 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb) | 26 |
5 files changed, 232 insertions, 226 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 2a2c8b87..3130fb88 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 a60710c910e6c995aef9dd36757bf040bf24acf5 Mon Sep 17 00:00:00 2001 | 1 | From c6fa6f32077ab554839d6e1e5b46d0778c17b8b1 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 |
@@ -12,19 +12,19 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
12 | 2 files changed, 4 insertions(+), 4 deletions(-) | 12 | 2 files changed, 4 insertions(+), 4 deletions(-) |
13 | 13 | ||
14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | 14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt |
15 | index 99f32a6181..b90aa382b9 100644 | 15 | index 6163c01e4a..74c479c071 100644 |
16 | --- a/ngraph/CMakeLists.txt | 16 | --- a/ngraph/CMakeLists.txt |
17 | +++ b/ngraph/CMakeLists.txt | 17 | +++ b/ngraph/CMakeLists.txt |
18 | @@ -490,7 +490,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | 18 | @@ -353,7 +353,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) |
19 | install(EXPORT ngraphTargets | 19 | install(EXPORT ngraphTargets |
20 | FILE ngraphTargets.cmake | 20 | FILE ngraphTargets.cmake |
21 | NAMESPACE ngraph:: | 21 | NAMESPACE ngraph:: |
22 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | 22 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake |
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | 23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph |
24 | COMPONENT ngraph) | 24 | COMPONENT ngraph) |
25 | endif() | ||
25 | 26 | ||
26 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | 27 | @@ -367,7 +367,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) |
27 | @@ -503,7 +503,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
28 | 28 | ||
29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | 29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake |
30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | 30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake |
@@ -33,22 +33,22 @@ index 99f32a6181..b90aa382b9 100644 | |||
33 | COMPONENT ngraph) | 33 | COMPONENT ngraph) |
34 | endif() | 34 | endif() |
35 | 35 | ||
36 | @@ -518,5 +518,3 @@ add_subdirectory(test) | 36 | @@ -386,5 +386,3 @@ add_subdirectory(test) |
37 | if (NGRAPH_PYTHON_BUILD_ENABLE) | 37 | if (NGRAPH_PYTHON_BUILD_ENABLE) |
38 | add_subdirectory(python) | 38 | add_subdirectory(python) |
39 | endif() | 39 | endif() |
40 | - | 40 | - |
41 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) | 41 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) |
42 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt | 42 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt |
43 | index d27ea8090c..17a3843f7d 100644 | 43 | index 2943722acc..a2ccdd11de 100644 |
44 | --- a/ngraph/test/runtime/CMakeLists.txt | 44 | --- a/ngraph/test/runtime/CMakeLists.txt |
45 | +++ b/ngraph/test/runtime/CMakeLists.txt | 45 | +++ b/ngraph/test/runtime/CMakeLists.txt |
46 | @@ -80,3 +80,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | 46 | @@ -79,3 +79,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
47 | 47 | ||
48 | add_subdirectory(interpreter) | 48 | add_subdirectory(interpreter) |
49 | add_subdirectory(ie) | 49 | add_subdirectory(ie) |
50 | + | 50 | + |
51 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) | 51 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) |
52 | -- | 52 | -- |
53 | 2.29.2 | 53 | 2.30.2 |
54 | 54 | ||
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 1f64ce21..822ab1cc 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,6 +1,6 @@ | |||
1 | From a8b6a2e251c42a393218174c6737208760d2e1c1 Mon Sep 17 00:00:00 2001 | 1 | From ca4a2b824de61c182b46e28fce875370ce46d4e1 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: Thu, 8 Apr 2021 14:19:51 +0800 |
4 | Subject: [PATCH] inference-engine: use system installed packages | 4 | Subject: [PATCH] inference-engine: use system installed packages |
5 | 5 | ||
6 | Use installed versions of ade, protobuf and tbb. | 6 | Use installed versions of ade, protobuf and tbb. |
@@ -9,34 +9,33 @@ Upstream-Status: Pending | |||
9 | 9 | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
11 | --- | 11 | --- |
12 | cmake/dependencies.cmake | 18 ------------------ | 12 | cmake/dependencies.cmake | 19 ----------- |
13 | inference-engine/CMakeLists.txt | 2 +- | 13 | inference-engine/CMakeLists.txt | 2 +- |
14 | inference-engine/cmake/ie_parallel.cmake | 7 +------ | 14 | inference-engine/cmake/dependencies.cmake | 34 ------------------- |
15 | .../src/inference_engine/CMakeLists.txt | 19 ------------------- | 15 | inference-engine/cmake/ie_parallel.cmake | 2 +- |
16 | .../common_test_utils/CMakeLists.txt | 4 +--- | 16 | inference-engine/samples/CMakeLists.txt | 2 +- |
17 | .../unit_test_utils/CMakeLists.txt | 3 +-- | 17 | .../common_test_utils/CMakeLists.txt | 4 +-- |
18 | inference-engine/thirdparty/CMakeLists.txt | 5 ++--- | 18 | .../unit_test_utils/CMakeLists.txt | 3 +- |
19 | 7 files changed, 6 insertions(+), 52 deletions(-) | 19 | inference-engine/thirdparty/CMakeLists.txt | 5 ++- |
20 | 8 files changed, 7 insertions(+), 64 deletions(-) | ||
20 | 21 | ||
21 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 22 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
22 | index 6a44c8769e..a128eb63a1 100644 | 23 | index aed7614734..f5baa6f86b 100644 |
23 | --- a/cmake/dependencies.cmake | 24 | --- a/cmake/dependencies.cmake |
24 | +++ b/cmake/dependencies.cmake | 25 | +++ b/cmake/dependencies.cmake |
25 | @@ -13,25 +13,7 @@ if(CMAKE_CROSSCOMPILING AND NGRAPH_ONNX_IMPORT_ENABLE) | 26 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") |
26 | 27 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | |
27 | set(protoc_version "3.7.1") | 28 | set(protoc_version "3.7.1") |
28 | if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) | 29 | |
29 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | 30 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT |
30 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | 31 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" |
31 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") | 32 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" |
32 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | 33 | - SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" |
33 | else() | 34 | - ) |
34 | message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") | 35 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) |
35 | endif() | ||
36 | - | 36 | - |
37 | - reset_deps_cache(SYSTEM_PROTOC) | 37 | - reset_deps_cache(SYSTEM_PROTOC) |
38 | - | 38 | - |
39 | - message("${SYSTEM_PROTOC_ROOT}/bin") | ||
40 | - find_program( | 39 | - find_program( |
41 | - SYSTEM_PROTOC | 40 | - SYSTEM_PROTOC |
42 | - NAMES protoc | 41 | - NAMES protoc |
@@ -49,72 +48,94 @@ index 6a44c8769e..a128eb63a1 100644 | |||
49 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 48 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
50 | endif() | 49 | endif() |
51 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 50 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
52 | index a3e4f74c40..76b09683dd 100644 | 51 | index 95c657222e..20cbd5000b 100644 |
53 | --- a/inference-engine/CMakeLists.txt | 52 | --- a/inference-engine/CMakeLists.txt |
54 | +++ b/inference-engine/CMakeLists.txt | 53 | +++ b/inference-engine/CMakeLists.txt |
55 | @@ -56,7 +56,7 @@ function(ie_developer_export) | 54 | @@ -20,7 +20,7 @@ function(ie_developer_export_targets) |
56 | APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") | ||
57 | |||
58 | # Custom target to build only Inference Engine Developer Package targets | ||
59 | - add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags | ||
60 | + add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} | ||
61 | inference_engine_ir_reader inference_engine_ir_v7_reader) | ||
62 | endfunction() | 55 | endfunction() |
63 | 56 | ||
57 | function(ie_developer_export) | ||
58 | - set(all_dev_targets gflags ie_libraries) | ||
59 | + set(all_dev_targets ie_libraries) | ||
60 | foreach(component IN LISTS openvino_export_components) | ||
61 | export(TARGETS ${${component}} NAMESPACE IE:: | ||
62 | APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") | ||
63 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | ||
64 | index 6fdfc6f3cd..c07bf0f3c8 100644 | ||
65 | --- a/inference-engine/cmake/dependencies.cmake | ||
66 | +++ b/inference-engine/cmake/dependencies.cmake | ||
67 | @@ -138,40 +138,6 @@ endif () | ||
68 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
69 | reset_deps_cache(TBBROOT TBB_DIR) | ||
70 | |||
71 | - if (WIN32 AND X86_64) | ||
72 | - #TODO: add target_path to be platform specific as well, to avoid following if | ||
73 | - RESOLVE_DEPENDENCY(TBB | ||
74 | - ARCHIVE_WIN "tbb2020_20200415_win.zip" | ||
75 | - TARGET_PATH "${TEMP}/tbb" | ||
76 | - ENVIRONMENT "TBBROOT" | ||
77 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | ||
78 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | ||
79 | - RESOLVE_DEPENDENCY(TBB | ||
80 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | ||
81 | - TARGET_PATH "${TEMP}/tbb" | ||
82 | - ENVIRONMENT "TBBROOT" | ||
83 | - SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce") | ||
84 | - elseif(LINUX AND X86_64) | ||
85 | - RESOLVE_DEPENDENCY(TBB | ||
86 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" | ||
87 | - TARGET_PATH "${TEMP}/tbb" | ||
88 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | ||
89 | - elseif(LINUX AND AARCH64) | ||
90 | - RESOLVE_DEPENDENCY(TBB | ||
91 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | ||
92 | - TARGET_PATH "${TEMP}/tbb_yocto" | ||
93 | - ENVIRONMENT "TBBROOT" | ||
94 | - SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b") | ||
95 | - elseif(APPLE AND X86_64) | ||
96 | - RESOLVE_DEPENDENCY(TBB | ||
97 | - ARCHIVE_MAC "tbb2020_20200404_mac.tgz" | ||
98 | - TARGET_PATH "${TEMP}/tbb" | ||
99 | - ENVIRONMENT "TBBROOT" | ||
100 | - SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6") | ||
101 | - else() | ||
102 | - message(FATAL_ERROR "TBB is not available on current platform") | ||
103 | - endif() | ||
104 | - | ||
105 | update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") | ||
106 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") | ||
107 | |||
64 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 108 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
65 | index f8988aa105..28e79417f4 100644 | 109 | index f8988aa105..42fedd10c5 100644 |
66 | --- a/inference-engine/cmake/ie_parallel.cmake | 110 | --- a/inference-engine/cmake/ie_parallel.cmake |
67 | +++ b/inference-engine/cmake/ie_parallel.cmake | 111 | +++ b/inference-engine/cmake/ie_parallel.cmake |
68 | @@ -67,13 +67,8 @@ function(set_ie_threading_interface_for TARGET_NAME) | 112 | @@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME) |
69 | set(IE_THREAD_DEFINE "IE_THREAD_SEQ") | 113 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) |
70 | 114 | find_package(TBB COMPONENTS tbb tbbmalloc) | |
71 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 115 | set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE) |
72 | - if (TBB_FOUND) | 116 | - set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) |
73 | set(IE_THREAD_DEFINE "IE_THREAD_TBB") | 117 | + set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE) |
74 | - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) | 118 | set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE) |
75 | - else () | 119 | if (TBB_FOUND) |
76 | - ext_message(WARNING "TBB was not found by the configured TBB_DIR path.\ | 120 | if (TBB_VERSION VERSION_LESS 2020) |
77 | - SEQ method will be used for ${TARGET_NAME}") | 121 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
78 | - endif () | 122 | index dfe9f2303d..6bc44019fe 100644 |
79 | + target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) | 123 | --- a/inference-engine/samples/CMakeLists.txt |
80 | elseif (THREADING STREQUAL "OMP") | 124 | +++ b/inference-engine/samples/CMakeLists.txt |
81 | if (WIN32) | 125 | @@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") |
82 | set(omp_lib_name libiomp5md) | 126 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) |
83 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 127 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) |
84 | index f012a038a2..3bba22215e 100644 | 128 | endfunction() |
85 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 129 | - add_gflags() |
86 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 130 | + #add_gflags() |
87 | @@ -216,25 +216,6 @@ list(APPEND core_components ngraph) | ||
88 | if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) | ||
89 | ie_cpack_add_component(tbb REQUIRED) | ||
90 | list(APPEND core_components tbb) | ||
91 | - | ||
92 | - install(DIRECTORY "${TBB}/include" | ||
93 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
94 | - COMPONENT tbb) | ||
95 | - install(DIRECTORY "${TBB}/lib" | ||
96 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
97 | - COMPONENT tbb) | ||
98 | - if(EXISTS "${TBB}/bin") | ||
99 | - install(DIRECTORY "${TBB}/bin" | ||
100 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
101 | - COMPONENT tbb) | ||
102 | - endif() | ||
103 | - install(FILES "${TBB}/LICENSE" | ||
104 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
105 | - COMPONENT tbb) | ||
106 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
107 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
108 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake | ||
109 | - COMPONENT tbb) | ||
110 | endif() | 131 | endif() |
111 | 132 | ||
112 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | 133 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
113 | 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 | 134 | 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 |
114 | index ca58264bd5..11df150845 100644 | 135 | index 6e09201f1e..2d2e3524a5 100644 |
115 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 136 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
116 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 137 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
117 | @@ -26,7 +26,7 @@ function(add_gtest_libraries) | 138 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) |
118 | PROPERTIES FOLDER thirdparty) | 139 | PROPERTIES FOLDER thirdparty) |
119 | endfunction() | 140 | endfunction() |
120 | 141 | ||
@@ -123,17 +144,17 @@ index ca58264bd5..11df150845 100644 | |||
123 | 144 | ||
124 | if (MSVC) | 145 | if (MSVC) |
125 | set(PUGI pugixml_mt) | 146 | set(PUGI pugixml_mt) |
126 | @@ -37,8 +37,6 @@ endif () | 147 | @@ -52,8 +52,6 @@ else () |
148 | endif () | ||
149 | |||
127 | list(APPEND EXPORT_DEPENDENCIES | 150 | list(APPEND EXPORT_DEPENDENCIES |
128 | ${PUGI} | ||
129 | ${NGRAPH_LIBRARIES} | ||
130 | - gtest | 151 | - gtest |
131 | - gtest_main | 152 | - gtest_main |
132 | ) | 153 | ) |
133 | 154 | ||
134 | set(TARGET_NAME commonTestUtils) | 155 | set(TARGET_NAME commonTestUtils) |
135 | 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 | 156 | 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 |
136 | index 5413d13895..3f2803750f 100644 | 157 | index ab956218aa..233eb5ea46 100644 |
137 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 158 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
138 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 159 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
139 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) | 160 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) |
@@ -147,26 +168,26 @@ index 5413d13895..3f2803750f 100644 | |||
147 | addIeTarget( | 168 | addIeTarget( |
148 | NAME ${TARGET_NAME} | 169 | NAME ${TARGET_NAME} |
149 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 170 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
150 | index fa2a4d02d8..67d3b7ad05 100644 | 171 | index 9a6a9209f1..eda6a64161 100644 |
151 | --- a/inference-engine/thirdparty/CMakeLists.txt | 172 | --- a/inference-engine/thirdparty/CMakeLists.txt |
152 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 173 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
153 | @@ -62,14 +62,13 @@ else() | 174 | @@ -62,14 +62,13 @@ else() |
175 | target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
154 | endif() | 176 | endif() |
155 | 177 | ||
156 | add_subdirectory(stb_lib) | 178 | -add_subdirectory(ade EXCLUDE_FROM_ALL) |
157 | -add_subdirectory(ade) | ||
158 | add_subdirectory(fluid/modules/gapi) | 179 | add_subdirectory(fluid/modules/gapi) |
159 | 180 | ||
160 | -set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty) | 181 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) |
161 | +set_target_properties(fluid stb_image PROPERTIES FOLDER thirdparty) | 182 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) |
162 | 183 | ||
163 | # developer package | 184 | # developer package |
164 | 185 | ||
165 | -ie_developer_export_targets(ade fluid) | 186 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) |
166 | +ie_developer_export_targets(fluid) | 187 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) |
167 | 188 | ||
168 | if (NOT USE_SYSTEM_PUGIXML) | 189 | if (NOT USE_SYSTEM_PUGIXML) |
169 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) | 190 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) |
170 | -- | 191 | -- |
171 | 2.29.2 | 192 | 2.29.0 |
172 | 193 | ||
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 52049eb0..631b1839 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 cb9a755218ff033c8c42e9dc46a845310a3331fa Mon Sep 17 00:00:00 2001 | 1 | From 21453439cd6d89058710e868f05727502e556f99 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 |
@@ -7,24 +7,36 @@ Make sure that libraries/samples/binaries are installed correctly. | |||
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 | 14 -------------- | 10 | CMakeLists.txt | 15 --------------- |
11 | cmake/developer_package.cmake | 10 ++++++---- | 11 | cmake/developer_package/IEDevScriptsConfig.cmake | 2 +- |
12 | .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ | 12 | cmake/developer_package/packaging.cmake | 8 +++++--- |
13 | inference-engine/samples/CMakeLists.txt | 9 +++------ | 13 | cmake/developer_package/plugins/plugins.cmake | 2 +- |
14 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ | 14 | .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ |
15 | .../src/inference_engine/CMakeLists.txt | 4 ++-- | 15 | inference-engine/samples/CMakeLists.txt | 4 +++- |
16 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | 16 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ |
17 | inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ | 17 | .../src/inference_engine/CMakeLists.txt | 4 ++-- |
18 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | 18 | inference-engine/src/preprocessing/CMakeLists.txt | 2 +- |
19 | inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ | 19 | .../src/readers/ir_reader/CMakeLists.txt | 2 +- |
20 | inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- | 20 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- |
21 | 11 files changed, 23 insertions(+), 28 deletions(-) | 21 | inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ |
22 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | ||
23 | inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ | ||
24 | .../tools/compile_tool/CMakeLists.txt | 2 +- | ||
25 | 15 files changed, 26 insertions(+), 27 deletions(-) | ||
22 | 26 | ||
23 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 27 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
24 | index 5c3585a3e9..2b8c99f862 100644 | 28 | index e72f2b61f1..2c22827e2d 100644 |
25 | --- a/CMakeLists.txt | 29 | --- a/CMakeLists.txt |
26 | +++ b/CMakeLists.txt | 30 | +++ b/CMakeLists.txt |
27 | @@ -176,12 +176,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" | 31 | @@ -105,7 +105,6 @@ function(build_ngraph) |
32 | ie_cpack_add_component(ngraph) | ||
33 | |||
34 | set(SDL_cmake_included ON) | ||
35 | - set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/") | ||
36 | add_subdirectory(ngraph) | ||
37 | set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) | ||
38 | set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE) | ||
39 | @@ -174,12 +173,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" | ||
28 | 40 | ||
29 | # install setupvars | 41 | # install setupvars |
30 | 42 | ||
@@ -37,7 +49,7 @@ index 5c3585a3e9..2b8c99f862 100644 | |||
37 | elseif(WIN32) | 49 | elseif(WIN32) |
38 | install(PROGRAMS scripts/setupvars/setupvars.bat | 50 | install(PROGRAMS scripts/setupvars/setupvars.bat |
39 | DESTINATION bin | 51 | DESTINATION bin |
40 | @@ -191,22 +187,12 @@ endif() | 52 | @@ -189,22 +184,12 @@ endif() |
41 | # install install_dependencies | 53 | # install install_dependencies |
42 | 54 | ||
43 | if(UNIX) | 55 | if(UNIX) |
@@ -60,11 +72,24 @@ index 5c3585a3e9..2b8c99f862 100644 | |||
60 | elseif(WIN32) | 72 | elseif(WIN32) |
61 | install(DIRECTORY scripts/demo/ | 73 | install(DIRECTORY scripts/demo/ |
62 | DESTINATION deployment_tools/demo | 74 | DESTINATION deployment_tools/demo |
63 | diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake | 75 | diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake |
64 | index cda7afd294..ec51636e96 100644 | 76 | index ed6971fd37..10817d3a75 100644 |
65 | --- a/cmake/developer_package.cmake | 77 | --- a/cmake/developer_package/IEDevScriptsConfig.cmake |
66 | +++ b/cmake/developer_package.cmake | 78 | +++ b/cmake/developer_package/IEDevScriptsConfig.cmake |
67 | @@ -29,7 +29,9 @@ list(APPEND CMAKE_MODULE_PATH | 79 | @@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT) |
80 | if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) | ||
81 | message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") | ||
82 | endif() | ||
83 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | ||
84 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | ||
85 | endif() | ||
86 | |||
87 | # Enable postfixes for Debug/Release builds | ||
88 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
89 | index b846bf732d..7a0022968c 100644 | ||
90 | --- a/cmake/developer_package/packaging.cmake | ||
91 | +++ b/cmake/developer_package/packaging.cmake | ||
92 | @@ -4,7 +4,9 @@ | ||
68 | include(CPackComponent) | 93 | include(CPackComponent) |
69 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | 94 | unset(IE_CPACK_COMPONENTS_ALL CACHE) |
70 | 95 | ||
@@ -73,9 +98,9 @@ index cda7afd294..ec51636e96 100644 | |||
73 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | 98 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) |
74 | +endif() | 99 | +endif() |
75 | 100 | ||
76 | # Search packages for the host system instead of packages for the target system | 101 | # |
77 | # in case of cross compilation these macros should be defined by the toolchain file | 102 | # ie_cpack_set_library_dir() |
78 | @@ -55,8 +57,8 @@ function(ie_cpack_set_library_dir) | 103 | @@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir) |
79 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | 104 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) |
80 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | 105 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) |
81 | else() | 106 | else() |
@@ -86,30 +111,34 @@ index cda7afd294..ec51636e96 100644 | |||
86 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | 111 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) |
87 | endif() | 112 | endif() |
88 | endfunction() | 113 | endfunction() |
89 | @@ -151,7 +153,7 @@ endif() | 114 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake |
115 | index a66d2568d9..c3aad14bab 100644 | ||
116 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
117 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
118 | @@ -106,7 +106,7 @@ function(ie_add_plugin) | ||
90 | 119 | ||
91 | # allow to override default OUTPUT_ROOT root | 120 | install(TARGETS ${IE_PLUGIN_NAME} |
92 | if(NOT DEFINED OUTPUT_ROOT) | 121 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} |
93 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | 122 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) |
94 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | 123 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) |
95 | endif() | 124 | endif() |
125 | endfunction() | ||
96 | 126 | ||
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 | 127 | 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 b8d5ddf622..d086478f6d 100644 | 128 | index aff7229c9f..f45a215f68 100644 |
100 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | 129 | --- 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 | 130 | +++ 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) | 131 | @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) |
103 | if(COMMAND add_cpplint_target) | 132 | if(COMMAND add_cpplint_target) |
104 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | 133 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) |
105 | endif() | 134 | endif() |
106 | + | 135 | + |
107 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 136 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
108 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 137 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
109 | index 236c17e6af..22f410d1fd 100644 | 138 | index 6bc44019fe..ca5ab34704 100644 |
110 | --- a/inference-engine/samples/CMakeLists.txt | 139 | --- a/inference-engine/samples/CMakeLists.txt |
111 | +++ b/inference-engine/samples/CMakeLists.txt | 140 | +++ b/inference-engine/samples/CMakeLists.txt |
112 | @@ -34,7 +34,7 @@ endif() | 141 | @@ -33,7 +33,7 @@ endif() |
113 | 142 | ||
114 | if(IE_MAIN_SOURCE_DIR) | 143 | if(IE_MAIN_SOURCE_DIR) |
115 | # in case if samples are built from IE repo | 144 | # in case if samples are built from IE repo |
@@ -118,19 +147,7 @@ index 236c17e6af..22f410d1fd 100644 | |||
118 | # hint for find_package(InferenceEngine in the samples folder) | 147 | # hint for find_package(InferenceEngine in the samples folder) |
119 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | 148 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") |
120 | # hint for find_package(ngraph in the samples folder) | 149 | # hint for find_package(ngraph in the samples folder) |
121 | @@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) | 150 | @@ -251,6 +251,8 @@ macro(ie_add_sample) |
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 | @@ -245,6 +240,8 @@ macro(ie_add_sample) | ||
134 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} | 151 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} |
135 | CUSTOM_FILTERS ${custom_filters}) | 152 | CUSTOM_FILTERS ${custom_filters}) |
136 | endif() | 153 | endif() |
@@ -140,7 +157,7 @@ index 236c17e6af..22f410d1fd 100644 | |||
140 | 157 | ||
141 | # collect all samples subdirectories | 158 | # 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 | 159 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt |
143 | index 48dbed9f2b..76532fd047 100644 | 160 | index c5c5449677..06ecab13b5 100644 |
144 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | 161 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt |
145 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | 162 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt |
146 | @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | 163 | @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" |
@@ -150,10 +167,10 @@ index 48dbed9f2b..76532fd047 100644 | |||
150 | + | 167 | + |
151 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 168 | +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 | 169 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
153 | index 3bba22215e..b6f6b7b203 100644 | 170 | index 1ea3227631..aa64718940 100644 |
154 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 171 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
155 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 172 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
156 | @@ -229,8 +229,8 @@ install(TARGETS ${TARGET_NAME} | 173 | @@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME} |
157 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" | 174 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" |
158 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" | 175 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" |
159 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" | 176 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" |
@@ -164,17 +181,38 @@ index 3bba22215e..b6f6b7b203 100644 | |||
164 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | 181 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} |
165 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | 182 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} |
166 | COMPONENT core) | 183 | COMPONENT core) |
184 | diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt | ||
185 | index 973fafcbf5..81aea3471a 100644 | ||
186 | --- a/inference-engine/src/preprocessing/CMakeLists.txt | ||
187 | +++ b/inference-engine/src/preprocessing/CMakeLists.txt | ||
188 | @@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) | ||
189 | install(TARGETS ${TARGET_NAME} | ||
190 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
191 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core | ||
192 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
193 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
194 | diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
195 | index 7721b7df6d..bf6543efa8 100644 | ||
196 | --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
197 | +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
198 | @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
199 | install(TARGETS ${TARGET_NAME} | ||
200 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
201 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core | ||
202 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
203 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
167 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 204 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
168 | index 889f2e6e66..67de9c3a32 100644 | 205 | index d8a5f2ec1d..2db7ddea6f 100644 |
169 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 206 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
170 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 207 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
171 | @@ -50,5 +50,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | 208 | @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL |
172 | # install | 209 | # install |
173 | 210 | if (LINUX) | |
174 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules | 211 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules |
175 | - DESTINATION ${IE_CPACK_IE_DIR}/external | 212 | - DESTINATION ${IE_CPACK_IE_DIR}/external |
176 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | 213 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d |
177 | COMPONENT myriad) | 214 | COMPONENT myriad) |
215 | endif() | ||
178 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | 216 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt |
179 | index c9a92b4857..2b4fcc4d01 100644 | 217 | index c9a92b4857..2b4fcc4d01 100644 |
180 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | 218 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt |
@@ -186,7 +224,7 @@ index c9a92b4857..2b4fcc4d01 100644 | |||
186 | + | 224 | + |
187 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 225 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
188 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 226 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
189 | index 76cc67cca1..04ff11cc05 100644 | 227 | index 1d9515f540..c81cb2ed79 100644 |
190 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 228 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
191 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 229 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
192 | @@ -26,3 +26,5 @@ addIeTargetTest( | 230 | @@ -26,3 +26,5 @@ addIeTargetTest( |
@@ -196,7 +234,7 @@ index 76cc67cca1..04ff11cc05 100644 | |||
196 | + | 234 | + |
197 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 235 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
198 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | 236 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt |
199 | index 215562f2af..215ec9f4fb 100644 | 237 | index 5be30a3092..6a01e280ae 100644 |
200 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | 238 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt |
201 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | 239 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt |
202 | @@ -35,3 +35,5 @@ addIeTargetTest( | 240 | @@ -35,3 +35,5 @@ addIeTargetTest( |
@@ -219,5 +257,5 @@ index 58614d3ced..9dfa068e4d 100644 | |||
219 | 257 | ||
220 | install(FILES README.md | 258 | install(FILES README.md |
221 | -- | 259 | -- |
222 | 2.29.2 | 260 | 2.29.0 |
223 | 261 | ||
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 d4819077..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From aa515686548d74a68456b9ba7a295b6ae4be343a 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 | --- | ||
11 | inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- | ||
12 | inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + | ||
13 | .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +- | ||
14 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
17 | index 68ccf3217..c5b0ce6be 100644 | ||
18 | --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
19 | +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp | ||
20 | @@ -39,7 +39,7 @@ | ||
21 | # pragma GCC system_header | ||
22 | #endif | ||
23 | |||
24 | -#include <CL/cl2.hpp> | ||
25 | +#include <cl2.hpp> | ||
26 | |||
27 | #ifdef __GNUC__ | ||
28 | # pragma GCC diagnostic pop | ||
29 | diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
30 | index 7e15abbed..46d43e0e5 100644 | ||
31 | --- a/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
32 | +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt | ||
33 | @@ -31,6 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE | ||
34 | ${CMAKE_CURRENT_SOURCE_DIR} | ||
35 | $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> | ||
36 | ${CLDNN__IOCL_ICD_INCDIRS} | ||
37 | + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp | ||
38 | ${CLDNN_TOP_FOLDER}) | ||
39 | |||
40 | set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) | ||
41 | 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 | ||
42 | index 97608c30a..3a04096c0 100644 | ||
43 | --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
44 | +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | ||
45 | @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; | ||
46 | typedef cl_va_api_device_source_intel cl_device_source_intel; | ||
47 | typedef cl_va_api_device_set_intel cl_device_set_intel; | ||
48 | #endif | ||
49 | -#include <CL/cl_intel_planar_yuv.h> | ||
50 | +#include <CL/cl_ext_intel.h> | ||
51 | #include "cl_intel_usm_defs.h" | ||
52 | |||
53 | #include <memory> | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb index 22194467..a6f4e416 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb | |||
@@ -4,28 +4,29 @@ 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/2021/2;lfs=0 \ | 7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/3;lfs=0 \ |
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1522.zip;name=usb_ma2x8x \ | 8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1642.zip;name=usb_ma2x8x \ |
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1522.zip;name=pcie_ma2x8x \ | 9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1642.zip;name=pcie_ma2x8x \ |
10 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ | 10 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ |
11 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak \ | ||
11 | file://0001-inference-engine-use-system-installed-packages.patch \ | 12 | file://0001-inference-engine-use-system-installed-packages.patch \ |
12 | file://0002-cldNN-disable-Werror.patch \ | 13 | file://0002-cldNN-disable-Werror.patch \ |
13 | file://0003-inference-engine-installation-fixes.patch \ | 14 | file://0003-inference-engine-installation-fixes.patch \ |
14 | file://0005-cldnn-fix-inclusion-of-headers.patch \ | ||
15 | file://0001-dont-install-licenses-and-version-file.patch \ | 15 | file://0001-dont-install-licenses-and-version-file.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV = "4795391b73381660b69b4cd3986c7a0bf902e868" | 18 | SRCREV = "18e83a217702c650280c6abfc43f3285a3aadb61" |
19 | SRCREV_mkl = "5ef085d5af65e8966e03cdfcbaa65761d61a5c9a" | 19 | SRCREV_mkl = "d35c3c11f9ff0f5090f9afe16af122cda501134c" |
20 | SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" | ||
20 | 21 | ||
21 | SRC_URI[usb_ma2x8x.sha256sum] = "95a93144f0bbfe6e35d3830e93e6b63e1e109f849a6a7c307cae9030e3a662aa" | 22 | SRC_URI[usb_ma2x8x.sha256sum] = "d0f6aaaf71a595963e6013ef59045e20b07324f1a47deaa3f906419d39b2bd5a" |
22 | SRC_URI[pcie_ma2x8x.sha256sum] = "6d061d21d90f1919ef375138066ba7a20ceb663901d2729d9cb1b639169df5da" | 23 | SRC_URI[pcie_ma2x8x.sha256sum] = "18d3cd10cf6cc36ff58001812d3d215c0bbb2de09a8832128592401c8f959358" |
23 | 24 | ||
24 | LICENSE = "Apache-2.0 & ISSL & MIT" | 25 | LICENSE = "Apache-2.0 & ISSL & MIT" |
25 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 26 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |
26 | file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ | 27 | file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \ |
27 | file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | 28 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ |
28 | file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ | 29 | file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
29 | " | 30 | " |
30 | LICENSE_${PN}-vpu-firmware = "ISSL" | 31 | LICENSE_${PN}-vpu-firmware = "ISSL" |
31 | 32 | ||
@@ -39,7 +40,7 @@ EXTRA_OECMAKE += " \ | |||
39 | -DENABLE_GNA=0 \ | 40 | -DENABLE_GNA=0 \ |
40 | -DPYTHON_EXECUTABLE=${PYTHON} \ | 41 | -DPYTHON_EXECUTABLE=${PYTHON} \ |
41 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 42 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
42 | -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ | 43 | -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \ |
43 | -DENABLE_SAMPLES=1 \ | 44 | -DENABLE_SAMPLES=1 \ |
44 | -DIE_CPACK_IE_DIR=${prefix} \ | 45 | -DIE_CPACK_IE_DIR=${prefix} \ |
45 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ | 46 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ |
@@ -58,7 +59,6 @@ DEPENDS += "libusb1 \ | |||
58 | pugixml \ | 59 | pugixml \ |
59 | protobuf-native \ | 60 | protobuf-native \ |
60 | tbb \ | 61 | tbb \ |
61 | onednn \ | ||
62 | " | 62 | " |
63 | 63 | ||
64 | COMPATIBLE_HOST = '(x86_64).*-linux' | 64 | COMPATIBLE_HOST = '(x86_64).*-linux' |