diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-25 16:10:36 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-27 09:55:39 +0800 |
commit | 011b2d6c1922d99ac90827cd894616943e592d4f (patch) | |
tree | 90e704a61764d5ce288148973f33201bd68897cc /dynamic-layers/openembedded-layer/recipes-support/opencv/files | |
parent | 036ca44cbb943f1bf46ad060d6f2e58ff276dfa7 (diff) | |
download | meta-intel-011b2d6c1922d99ac90827cd894616943e592d4f.tar.gz |
openvino-inference-engine: upgrade 2021.3 -> 2021.4
Refresh patches and add zlib to DEPENDS. Also fetch pybind11 as it's
needed by ngraph.
Release notes:
https://software.intel.com/content/www/us/en/develop/articles/openvino-2021-4-lts-relnotes.html
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch | 50 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch | 32 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch | 206 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch | 36 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch) | 25 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch | 215 |
6 files changed, 349 insertions, 215 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch deleted file mode 100644 index 31a7f7ff..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 13a9e6fbe3e62720d088e750de73483f2b74a855 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 14 Jul 2021 00:55:31 +0800 | ||
4 | Subject: [PATCH] InferenceEngineConfig.cmake: set the right paths | ||
5 | |||
6 | Make sure that the projects using cmake to locate the libraries | ||
7 | are able to do so. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | .../cmake/templates/InferenceEngineConfig.cmake.in | 8 ++++---- | ||
14 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
17 | index 5ede817bbf..83d258834b 100644 | ||
18 | --- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
19 | +++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
20 | @@ -74,7 +74,7 @@ else() | ||
21 | ext_message(FATAL_ERROR "inference_engine root directory is not found") | ||
22 | endif() | ||
23 | |||
24 | - find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include" NO_DEFAULT_PATH) | ||
25 | + find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include") | ||
26 | |||
27 | set(IE_LIB_DIR "${IE_ROOT_DIR}/lib/${_ARCH}") | ||
28 | set(IE_LIB_REL_DIR "${IE_LIB_DIR}/Release") | ||
29 | @@ -89,8 +89,8 @@ else() | ||
30 | find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
31 | find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
32 | else() | ||
33 | - find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
34 | - find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
35 | + find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") | ||
36 | + find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") | ||
37 | endif() | ||
38 | |||
39 | find_package_handle_standard_args( InferenceEngine | ||
40 | @@ -163,6 +163,6 @@ else() | ||
41 | IE::inference_engine_c_api) | ||
42 | |||
43 | set(IE_EXTERNAL_DIR "${IE_ROOT_DIR}/external") | ||
44 | - include("${IE_ROOT_DIR}/share/ie_parallel.cmake") | ||
45 | + include("$ENV{PKG_CONFIG_SYSROOT_DIR}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/InferenceEngine/ie_parallel.cmake") | ||
46 | endif() | ||
47 | endif() | ||
48 | -- | ||
49 | 2.32.0 | ||
50 | |||
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 3130fb88..3c265652 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 c6fa6f32077ab554839d6e1e5b46d0778c17b8b1 Mon Sep 17 00:00:00 2001 | 1 | From 419070322898381885b0ffa286905a3b08a23aa6 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,48 +7,50 @@ 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 | ngraph/CMakeLists.txt | 6 ++---- | 10 | ngraph/CMakeLists.txt | 8 ++------ |
11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ | 11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ |
12 | 2 files changed, 4 insertions(+), 4 deletions(-) | 12 | 2 files changed, 4 insertions(+), 6 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 6163c01e4a..74c479c071 100644 | 15 | index a05ca3b15c..9bc507b4c7 100644 |
16 | --- a/ngraph/CMakeLists.txt | 16 | --- a/ngraph/CMakeLists.txt |
17 | +++ b/ngraph/CMakeLists.txt | 17 | +++ b/ngraph/CMakeLists.txt |
18 | @@ -353,7 +353,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | 18 | @@ -272,7 +272,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 "deployment_tools/ngraph/cmake" |
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | 23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph |
24 | COMPONENT ngraph) | 24 | COMPONENT ngraph_dev) |
25 | endif() | 25 | endif() |
26 | 26 | ||
27 | @@ -367,7 +367,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | 27 | @@ -286,7 +286,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 |
31 | - DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake | 31 | - DESTINATION "deployment_tools/ngraph/cmake" |
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | 32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph |
33 | COMPONENT ngraph) | 33 | COMPONENT ngraph_dev) |
34 | endif() | 34 | endif() |
35 | 35 | ||
36 | @@ -386,5 +386,3 @@ add_subdirectory(test) | 36 | @@ -337,7 +337,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 |
42 | - DESTINATION "deployment_tools/ngraph" | ||
43 | - COMPONENT ngraph) | ||
42 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt | 44 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt |
43 | index 2943722acc..a2ccdd11de 100644 | 45 | index be84499ee0..f65357b751 100644 |
44 | --- a/ngraph/test/runtime/CMakeLists.txt | 46 | --- a/ngraph/test/runtime/CMakeLists.txt |
45 | +++ b/ngraph/test/runtime/CMakeLists.txt | 47 | +++ b/ngraph/test/runtime/CMakeLists.txt |
46 | @@ -79,3 +79,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | 48 | @@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
47 | 49 | ||
48 | add_subdirectory(interpreter) | 50 | add_subdirectory(interpreter) |
49 | add_subdirectory(ie) | 51 | add_subdirectory(ie) |
50 | + | 52 | + |
51 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) | 53 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) |
52 | -- | 54 | -- |
53 | 2.30.2 | 55 | 2.32.0 |
54 | 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 822ab1cc..b16135ee 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,26 +1,35 @@ | |||
1 | From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001 | 1 | From 47ff7f056d219a8a9f02a8b533e1d32972b84589 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, 8 Apr 2021 14:19:51 +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, zlib and tbb. |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Don't fetch pybind11 at runtime and use the one that we have fetched while |
9 | running do_fetch. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
9 | 12 | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
11 | --- | 14 | --- |
12 | cmake/dependencies.cmake | 19 ----------- | 15 | cmake/dependencies.cmake | 19 -------- |
13 | inference-engine/CMakeLists.txt | 2 +- | 16 | inference-engine/CMakeLists.txt | 6 +-- |
14 | inference-engine/cmake/dependencies.cmake | 34 ------------------- | 17 | inference-engine/cmake/dependencies.cmake | 45 ------------------- |
15 | inference-engine/cmake/ie_parallel.cmake | 2 +- | 18 | inference-engine/cmake/ie_parallel.cmake | 2 +- |
16 | inference-engine/samples/CMakeLists.txt | 2 +- | 19 | .../templates/InferenceEngineConfig.cmake.in | 10 ----- |
17 | .../common_test_utils/CMakeLists.txt | 4 +-- | 20 | inference-engine/samples/CMakeLists.txt | 3 +- |
21 | .../src/inference_engine/CMakeLists.txt | 4 +- | ||
22 | .../common_test_utils/CMakeLists.txt | 4 +- | ||
18 | .../unit_test_utils/CMakeLists.txt | 3 +- | 23 | .../unit_test_utils/CMakeLists.txt | 3 +- |
19 | inference-engine/thirdparty/CMakeLists.txt | 5 ++- | 24 | inference-engine/thirdparty/CMakeLists.txt | 5 +-- |
20 | 8 files changed, 7 insertions(+), 64 deletions(-) | 25 | ngraph/python/CMakeLists.txt | 12 +---- |
26 | tests/fuzz/src/CMakeLists.txt | 1 - | ||
27 | thirdparty/CMakeLists.txt | 1 - | ||
28 | thirdparty/cnpy/CMakeLists.txt | 4 +- | ||
29 | 14 files changed, 14 insertions(+), 105 deletions(-) | ||
21 | 30 | ||
22 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 31 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
23 | index aed7614734..f5baa6f86b 100644 | 32 | index 6cb15a077e..74d4ac4124 100644 |
24 | --- a/cmake/dependencies.cmake | 33 | --- a/cmake/dependencies.cmake |
25 | +++ b/cmake/dependencies.cmake | 34 | +++ b/cmake/dependencies.cmake |
26 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") | 35 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") |
@@ -48,10 +57,10 @@ index aed7614734..f5baa6f86b 100644 | |||
48 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 57 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
49 | endif() | 58 | endif() |
50 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 59 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
51 | index 95c657222e..20cbd5000b 100644 | 60 | index 1ac7fd8bf6..0615873110 100644 |
52 | --- a/inference-engine/CMakeLists.txt | 61 | --- a/inference-engine/CMakeLists.txt |
53 | +++ b/inference-engine/CMakeLists.txt | 62 | +++ b/inference-engine/CMakeLists.txt |
54 | @@ -20,7 +20,7 @@ function(ie_developer_export_targets) | 63 | @@ -18,7 +18,7 @@ function(ie_developer_export_targets) |
55 | endfunction() | 64 | endfunction() |
56 | 65 | ||
57 | function(ie_developer_export) | 66 | function(ie_developer_export) |
@@ -59,12 +68,30 @@ index 95c657222e..20cbd5000b 100644 | |||
59 | + set(all_dev_targets ie_libraries) | 68 | + set(all_dev_targets ie_libraries) |
60 | foreach(component IN LISTS openvino_export_components) | 69 | foreach(component IN LISTS openvino_export_components) |
61 | export(TARGETS ${${component}} NAMESPACE IE:: | 70 | export(TARGETS ${${component}} NAMESPACE IE:: |
62 | APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") | 71 | APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") |
72 | @@ -142,7 +142,7 @@ endif() | ||
73 | # Developer package | ||
74 | # | ||
75 | |||
76 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils) | ||
77 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) | ||
78 | |||
79 | # for Template plugin | ||
80 | if(NGRAPH_INTERPRETER_ENABLE) | ||
81 | @@ -158,7 +158,7 @@ function(ie_generate_dev_package_config) | ||
82 | configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" | ||
83 | "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" | ||
84 | INSTALL_DESTINATION share # not used | ||
85 | - PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR" | ||
86 | + PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR" | ||
87 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
88 | |||
89 | configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | ||
63 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | 90 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake |
64 | index 6fdfc6f3cd..c07bf0f3c8 100644 | 91 | index b270c46f2d..5f85197a85 100644 |
65 | --- a/inference-engine/cmake/dependencies.cmake | 92 | --- a/inference-engine/cmake/dependencies.cmake |
66 | +++ b/inference-engine/cmake/dependencies.cmake | 93 | +++ b/inference-engine/cmake/dependencies.cmake |
67 | @@ -138,40 +138,6 @@ endif () | 94 | @@ -81,51 +81,6 @@ endif () |
68 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 95 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
69 | reset_deps_cache(TBBROOT TBB_DIR) | 96 | reset_deps_cache(TBBROOT TBB_DIR) |
70 | 97 | ||
@@ -75,6 +102,11 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
75 | - TARGET_PATH "${TEMP}/tbb" | 102 | - TARGET_PATH "${TEMP}/tbb" |
76 | - ENVIRONMENT "TBBROOT" | 103 | - ENVIRONMENT "TBBROOT" |
77 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | 104 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") |
105 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
106 | - ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" | ||
107 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
108 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
109 | - SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") | ||
78 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | 110 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well |
79 | - RESOLVE_DEPENDENCY(TBB | 111 | - RESOLVE_DEPENDENCY(TBB |
80 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | 112 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" |
@@ -85,7 +117,13 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
85 | - RESOLVE_DEPENDENCY(TBB | 117 | - RESOLVE_DEPENDENCY(TBB |
86 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" | 118 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" |
87 | - TARGET_PATH "${TEMP}/tbb" | 119 | - TARGET_PATH "${TEMP}/tbb" |
120 | - ENVIRONMENT "TBBROOT" | ||
88 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | 121 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") |
122 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
123 | - ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" | ||
124 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
125 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
126 | - SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") | ||
89 | - elseif(LINUX AND AARCH64) | 127 | - elseif(LINUX AND AARCH64) |
90 | - RESOLVE_DEPENDENCY(TBB | 128 | - RESOLVE_DEPENDENCY(TBB |
91 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | 129 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" |
@@ -106,23 +144,44 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
106 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") | 144 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") |
107 | 145 | ||
108 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 146 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
109 | index f8988aa105..42fedd10c5 100644 | 147 | index edf3d2f2b2..6579d0f7ea 100644 |
110 | --- a/inference-engine/cmake/ie_parallel.cmake | 148 | --- a/inference-engine/cmake/ie_parallel.cmake |
111 | +++ b/inference-engine/cmake/ie_parallel.cmake | 149 | +++ b/inference-engine/cmake/ie_parallel.cmake |
112 | @@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME) | 150 | @@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) |
113 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | 151 | find_dependency(TBB COMPONENTS tbb tbbmalloc) |
114 | find_package(TBB COMPONENTS tbb tbbmalloc) | 152 | endif() |
115 | set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE) | 153 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) |
116 | - set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) | 154 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) |
117 | + set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE) | 155 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) |
118 | set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE) | 156 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) |
119 | if (TBB_FOUND) | 157 | if (NOT TBB_FOUND) |
120 | if (TBB_VERSION VERSION_LESS 2020) | 158 | ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ |
159 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
160 | index 261edbf3d7..bf217a789a 100644 | ||
161 | --- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
162 | +++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
163 | @@ -86,16 +86,6 @@ endfunction() | ||
164 | set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}") | ||
165 | |||
166 | set(THREADING "@THREADING@") | ||
167 | -if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | ||
168 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") | ||
169 | - _ie_find_dependency(TBB | ||
170 | - COMPONENTS tbb tbbmalloc | ||
171 | - CONFIG | ||
172 | - PATHS ${TBBROOT}/cmake | ||
173 | - ${_tbb_dir} | ||
174 | - NO_CMAKE_FIND_ROOT_PATH | ||
175 | - NO_DEFAULT_PATH) | ||
176 | -endif() | ||
177 | |||
178 | set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") | ||
179 | _ie_find_dependency(ngraph | ||
121 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 180 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
122 | index dfe9f2303d..6bc44019fe 100644 | 181 | index 7924c56779..ae93857944 100644 |
123 | --- a/inference-engine/samples/CMakeLists.txt | 182 | --- a/inference-engine/samples/CMakeLists.txt |
124 | +++ b/inference-engine/samples/CMakeLists.txt | 183 | +++ b/inference-engine/samples/CMakeLists.txt |
125 | @@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | 184 | @@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") |
126 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) | 185 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) |
127 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | 186 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) |
128 | endfunction() | 187 | endfunction() |
@@ -130,9 +189,28 @@ index dfe9f2303d..6bc44019fe 100644 | |||
130 | + #add_gflags() | 189 | + #add_gflags() |
131 | endif() | 190 | endif() |
132 | 191 | ||
133 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | 192 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") |
193 | - add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) | ||
194 | endif() | ||
195 | |||
196 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") | ||
197 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
198 | index e8ed1a5c4c..2fcb0bed4a 100644 | ||
199 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
200 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
201 | @@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf | ||
202 | INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" | ||
203 | PATH_VARS ${PATH_VARS}) | ||
204 | |||
205 | -set(IE_INCLUDE_DIR "include") | ||
206 | -set(IE_NGRAPH_DIR "../ngraph/cmake") | ||
207 | +set(IE_INCLUDE_DIR "../../include") | ||
208 | +set(IE_NGRAPH_DIR "ngraph") | ||
209 | set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") | ||
210 | set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") | ||
211 | |||
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 | 212 | 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 |
135 | index 6e09201f1e..2d2e3524a5 100644 | 213 | index 5e8643dc5d..031557efc3 100644 |
136 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 214 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
137 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 215 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
138 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) | 216 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) |
@@ -154,7 +232,7 @@ index 6e09201f1e..2d2e3524a5 100644 | |||
154 | 232 | ||
155 | set(TARGET_NAME commonTestUtils) | 233 | set(TARGET_NAME commonTestUtils) |
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 | 234 | 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 |
157 | index ab956218aa..233eb5ea46 100644 | 235 | index 7c1d89eabf..2fbd8fc324 100644 |
158 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 236 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
159 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 237 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
160 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) | 238 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) |
@@ -168,7 +246,7 @@ index ab956218aa..233eb5ea46 100644 | |||
168 | addIeTarget( | 246 | addIeTarget( |
169 | NAME ${TARGET_NAME} | 247 | NAME ${TARGET_NAME} |
170 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 248 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
171 | index 9a6a9209f1..eda6a64161 100644 | 249 | index f028ebdd8a..9c5bd53466 100644 |
172 | --- a/inference-engine/thirdparty/CMakeLists.txt | 250 | --- a/inference-engine/thirdparty/CMakeLists.txt |
173 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 251 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
174 | @@ -62,14 +62,13 @@ else() | 252 | @@ -62,14 +62,13 @@ else() |
@@ -188,6 +266,68 @@ index 9a6a9209f1..eda6a64161 100644 | |||
188 | 266 | ||
189 | if (NOT USE_SYSTEM_PUGIXML) | 267 | if (NOT USE_SYSTEM_PUGIXML) |
190 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) | 268 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) |
269 | diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt | ||
270 | index 501bfffb4b..b45612c19c 100644 | ||
271 | --- a/ngraph/python/CMakeLists.txt | ||
272 | +++ b/ngraph/python/CMakeLists.txt | ||
273 | @@ -17,17 +17,7 @@ endif() | ||
274 | |||
275 | include(FetchContent) | ||
276 | |||
277 | -FetchContent_Declare( | ||
278 | - pybind11 | ||
279 | - GIT_REPOSITORY "https://github.com/pybind/pybind11.git" | ||
280 | - GIT_TAG "v2.5.0" | ||
281 | -) | ||
282 | - | ||
283 | -FetchContent_GetProperties(pybind11) | ||
284 | -if(NOT pybind11_POPULATED) | ||
285 | - FetchContent_Populate(pybind11) | ||
286 | - add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) | ||
287 | -endif() | ||
288 | +add_subdirectory(pybind11) | ||
289 | |||
290 | # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 | ||
291 | set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) | ||
292 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | ||
293 | index b9400d9e7e..669938526c 100644 | ||
294 | --- a/tests/fuzz/src/CMakeLists.txt | ||
295 | +++ b/tests/fuzz/src/CMakeLists.txt | ||
296 | @@ -10,7 +10,6 @@ add_custom_target(fuzz) | ||
297 | FILE(GLOB tests "*-fuzzer.cc") | ||
298 | |||
299 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | ||
300 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | ||
301 | |||
302 | foreach(test_source ${tests}) | ||
303 | get_filename_component(test_name ${test_source} NAME_WE) | ||
304 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
305 | index 2c6b656408..4e86bd21ef 100644 | ||
306 | --- a/thirdparty/CMakeLists.txt | ||
307 | +++ b/thirdparty/CMakeLists.txt | ||
308 | @@ -5,6 +5,5 @@ | ||
309 | add_subdirectory(ittapi) | ||
310 | add_subdirectory(itt_collector) | ||
311 | add_subdirectory(xbyak EXCLUDE_FROM_ALL) | ||
312 | -add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
313 | add_subdirectory(cnpy EXCLUDE_FROM_ALL) | ||
314 | openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) | ||
315 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt | ||
316 | index 5571cd5f78..e30604927a 100644 | ||
317 | --- a/thirdparty/cnpy/CMakeLists.txt | ||
318 | +++ b/thirdparty/cnpy/CMakeLists.txt | ||
319 | @@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") | ||
320 | target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) | ||
321 | endif() | ||
322 | |||
323 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) | ||
324 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | ||
325 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
326 | "${CMAKE_CURRENT_SOURCE_DIR}/..") | ||
327 | |||
328 | -set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
329 | \ No newline at end of file | ||
330 | +set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
191 | -- | 331 | -- |
192 | 2.29.0 | 332 | 2.32.0 |
193 | 333 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch deleted file mode 100644 index 4b83a948..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 0ecaaf9098dc22b5503dfbce5cf629525e1dd237 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 7 May 2021 14:30:03 +0800 | ||
4 | Subject: [PATCH] plugin_api: fix build with gcc 11 | ||
5 | |||
6 | Some C++ Standard Library headers have been changed in gcc 11 to no | ||
7 | longer include other headers that they do need to depend on. | ||
8 | |||
9 | Include exception explicitly to avoid: | ||
10 | |||
11 | | inference-engine/src/plugin_api/ie_system_conf.h:21:31: error: 'exception_ptr' in namespace 'std' does not name a type; did you mean 'exception'? | ||
12 | | 21 | INFERENCE_ENGINE_API_CPP(std::exception_ptr&) CurrentException(); | ||
13 | | | ^~~~~~~~~~~~~ | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/5546] | ||
16 | |||
17 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
18 | --- | ||
19 | inference-engine/src/plugin_api/ie_system_conf.h | 1 + | ||
20 | 1 file changed, 1 insertion(+) | ||
21 | |||
22 | diff --git a/inference-engine/src/plugin_api/ie_system_conf.h b/inference-engine/src/plugin_api/ie_system_conf.h | ||
23 | index c0e4cbb8b..56d5fb488 100644 | ||
24 | --- a/inference-engine/src/plugin_api/ie_system_conf.h | ||
25 | +++ b/inference-engine/src/plugin_api/ie_system_conf.h | ||
26 | @@ -11,6 +11,7 @@ | ||
27 | |||
28 | #include "ie_api.h" | ||
29 | #include <vector> | ||
30 | +#include <exception> | ||
31 | |||
32 | namespace InferenceEngine { | ||
33 | |||
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch index a4e58b8e..5e7cfb38 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001 | 1 | From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 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:45:48 +0800 | 3 | Date: Wed, 10 Jun 2020 09:45:48 +0800 |
4 | Subject: [PATCH 2/5] cldNN: disable Werror | 4 | Subject: [PATCH] Disable Werror |
5 | 5 | ||
6 | Don't treat warnings as errors. This just leads to failures every time | 6 | Don't treat warnings as errors. This just leads to failures every time |
7 | we upgrade the compiler. | 7 | we upgrade the compiler. |
@@ -11,13 +11,14 @@ Upstream-Status: Inappropriate | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
12 | --- | 12 | --- |
13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - | 13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - |
14 | 1 file changed, 1 deletion(-) | 14 | ngraph/CMakeLists.txt | 1 - |
15 | 2 files changed, 2 deletions(-) | ||
15 | 16 | ||
16 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | 17 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt |
17 | index 4b444eca..8610b9b8 100644 | 18 | index d14da47860..08ed695c0d 100644 |
18 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | 19 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt |
19 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | 20 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt |
20 | @@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | 21 | @@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") |
21 | MultiProcessorCompilation | 22 | MultiProcessorCompilation |
22 | DeadCodeEliminate | 23 | DeadCodeEliminate |
23 | ExtensionsEnabled | 24 | ExtensionsEnabled |
@@ -25,6 +26,18 @@ index 4b444eca..8610b9b8 100644 | |||
25 | WarnLevel4 | 26 | WarnLevel4 |
26 | NoFastMath | 27 | NoFastMath |
27 | StackProtector | 28 | StackProtector |
29 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
30 | index a05ca3b15c..ae888c4cb2 100644 | ||
31 | --- a/ngraph/CMakeLists.txt | ||
32 | +++ b/ngraph/CMakeLists.txt | ||
33 | @@ -197,7 +197,6 @@ if (WIN32) | ||
34 | endif() | ||
35 | |||
36 | if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") | ||
37 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") | ||
38 | endif() | ||
39 | |||
40 | if(WIN32) | ||
28 | -- | 41 | -- |
29 | 2.25.4 | 42 | 2.32.0 |
30 | 43 | ||
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 631b1839..145f2585 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 21453439cd6d89058710e868f05727502e556f99 Mon Sep 17 00:00:00 2001 | 1 | From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee 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,41 +7,34 @@ 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 | 15 --------------- | 10 | CMakeLists.txt | 15 -------- |
11 | cmake/developer_package/IEDevScriptsConfig.cmake | 2 +- | 11 | .../IEDevScriptsConfig.cmake | 2 +- |
12 | cmake/developer_package/packaging.cmake | 8 +++++--- | 12 | cmake/developer_package/packaging.cmake | 8 +++-- |
13 | cmake/developer_package/plugins/plugins.cmake | 2 +- | 13 | cmake/developer_package/plugins/plugins.cmake | 2 +- |
14 | .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ | 14 | .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ |
15 | inference-engine/samples/CMakeLists.txt | 4 +++- | 15 | inference-engine/samples/CMakeLists.txt | 4 ++- |
16 | .../samples/common/format_reader/CMakeLists.txt | 2 ++ | 16 | .../common/format_reader/CMakeLists.txt | 4 ++- |
17 | .../src/inference_engine/CMakeLists.txt | 4 ++-- | 17 | .../src/inference_engine/CMakeLists.txt | 35 ++----------------- |
18 | inference-engine/src/preprocessing/CMakeLists.txt | 2 +- | 18 | .../src/preprocessing/CMakeLists.txt | 2 +- |
19 | .../src/readers/ir_reader/CMakeLists.txt | 2 +- | 19 | .../src/readers/ir_reader/CMakeLists.txt | 2 +- |
20 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | 20 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- |
21 | inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ | 21 | .../tests/unit/cpu/CMakeLists.txt | 2 ++ |
22 | .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ | 22 | .../unit/inference_engine/CMakeLists.txt | 2 ++ |
23 | inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ | 23 | .../tests/unit/vpu/CMakeLists.txt | 2 ++ |
24 | .../tools/compile_tool/CMakeLists.txt | 2 +- | 24 | .../tools/compile_tool/CMakeLists.txt | 2 +- |
25 | 15 files changed, 26 insertions(+), 27 deletions(-) | 25 | ngraph/CMakeLists.txt | 8 ++--- |
26 | 16 files changed, 32 insertions(+), 62 deletions(-) | ||
26 | 27 | ||
27 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 28 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
28 | index e72f2b61f1..2c22827e2d 100644 | 29 | index e0706a72e8..7920de9a42 100644 |
29 | --- a/CMakeLists.txt | 30 | --- a/CMakeLists.txt |
30 | +++ b/CMakeLists.txt | 31 | +++ b/CMakeLists.txt |
31 | @@ -105,7 +105,6 @@ function(build_ngraph) | 32 | @@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" |
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}" | ||
40 | 33 | ||
41 | # install setupvars | 34 | # install setupvars |
42 | 35 | ||
43 | -ie_cpack_add_component(setupvars REQUIRED) | 36 | -ie_cpack_add_component(setupvars REQUIRED) |
44 | 37 | - | |
45 | if(UNIX) | 38 | if(UNIX) |
46 | - install(PROGRAMS scripts/setupvars/setupvars.sh | 39 | - install(PROGRAMS scripts/setupvars/setupvars.sh |
47 | - DESTINATION bin | 40 | - DESTINATION bin |
@@ -49,7 +42,7 @@ index e72f2b61f1..2c22827e2d 100644 | |||
49 | elseif(WIN32) | 42 | elseif(WIN32) |
50 | install(PROGRAMS scripts/setupvars/setupvars.bat | 43 | install(PROGRAMS scripts/setupvars/setupvars.bat |
51 | DESTINATION bin | 44 | DESTINATION bin |
52 | @@ -189,22 +184,12 @@ endif() | 45 | @@ -195,22 +190,12 @@ endif() |
53 | # install install_dependencies | 46 | # install install_dependencies |
54 | 47 | ||
55 | if(UNIX) | 48 | if(UNIX) |
@@ -61,7 +54,7 @@ index e72f2b61f1..2c22827e2d 100644 | |||
61 | 54 | ||
62 | # install files for demo | 55 | # install files for demo |
63 | 56 | ||
64 | -ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) | 57 | -ie_cpack_add_component(demo_scripts DEPENDS core) |
65 | 58 | ||
66 | if(UNIX) | 59 | if(UNIX) |
67 | - install(DIRECTORY scripts/demo/ | 60 | - install(DIRECTORY scripts/demo/ |
@@ -73,10 +66,10 @@ index e72f2b61f1..2c22827e2d 100644 | |||
73 | install(DIRECTORY scripts/demo/ | 66 | install(DIRECTORY scripts/demo/ |
74 | DESTINATION deployment_tools/demo | 67 | DESTINATION deployment_tools/demo |
75 | diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake | 68 | diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake |
76 | index ed6971fd37..10817d3a75 100644 | 69 | index 0e1fe76db2..97867a24f8 100644 |
77 | --- a/cmake/developer_package/IEDevScriptsConfig.cmake | 70 | --- a/cmake/developer_package/IEDevScriptsConfig.cmake |
78 | +++ b/cmake/developer_package/IEDevScriptsConfig.cmake | 71 | +++ b/cmake/developer_package/IEDevScriptsConfig.cmake |
79 | @@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT) | 72 | @@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) |
80 | if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) | 73 | if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) |
81 | message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") | 74 | message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") |
82 | endif() | 75 | endif() |
@@ -86,10 +79,10 @@ index ed6971fd37..10817d3a75 100644 | |||
86 | 79 | ||
87 | # Enable postfixes for Debug/Release builds | 80 | # Enable postfixes for Debug/Release builds |
88 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | 81 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake |
89 | index b846bf732d..7a0022968c 100644 | 82 | index 2b5e945b17..adc4bef0bc 100644 |
90 | --- a/cmake/developer_package/packaging.cmake | 83 | --- a/cmake/developer_package/packaging.cmake |
91 | +++ b/cmake/developer_package/packaging.cmake | 84 | +++ b/cmake/developer_package/packaging.cmake |
92 | @@ -4,7 +4,9 @@ | 85 | @@ -5,7 +5,9 @@ |
93 | include(CPackComponent) | 86 | include(CPackComponent) |
94 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | 87 | unset(IE_CPACK_COMPONENTS_ALL CACHE) |
95 | 88 | ||
@@ -100,7 +93,7 @@ index b846bf732d..7a0022968c 100644 | |||
100 | 93 | ||
101 | # | 94 | # |
102 | # ie_cpack_set_library_dir() | 95 | # ie_cpack_set_library_dir() |
103 | @@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir) | 96 | @@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) |
104 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) | 97 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${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) | 98 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) |
106 | else() | 99 | else() |
@@ -112,10 +105,10 @@ index b846bf732d..7a0022968c 100644 | |||
112 | endif() | 105 | endif() |
113 | endfunction() | 106 | endfunction() |
114 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | 107 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake |
115 | index a66d2568d9..c3aad14bab 100644 | 108 | index aae1dbb7fb..e6dac2a478 100644 |
116 | --- a/cmake/developer_package/plugins/plugins.cmake | 109 | --- a/cmake/developer_package/plugins/plugins.cmake |
117 | +++ b/cmake/developer_package/plugins/plugins.cmake | 110 | +++ b/cmake/developer_package/plugins/plugins.cmake |
118 | @@ -106,7 +106,7 @@ function(ie_add_plugin) | 111 | @@ -124,7 +124,7 @@ function(ie_add_plugin) |
119 | 112 | ||
120 | install(TARGETS ${IE_PLUGIN_NAME} | 113 | install(TARGETS ${IE_PLUGIN_NAME} |
121 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} | 114 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} |
@@ -124,18 +117,18 @@ index a66d2568d9..c3aad14bab 100644 | |||
124 | endif() | 117 | endif() |
125 | endfunction() | 118 | endfunction() |
126 | 119 | ||
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 | 120 | diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt |
128 | index aff7229c9f..f45a215f68 100644 | 121 | index 45b2b3e9ed..55f7dfd214 100644 |
129 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | 122 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt |
130 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt | 123 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt |
131 | @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | 124 | @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) |
132 | if(COMMAND add_cpplint_target) | 125 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) |
133 | add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | 126 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) |
134 | endif() | 127 | endif() |
135 | + | 128 | + |
136 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 129 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
137 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 130 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
138 | index 6bc44019fe..ca5ab34704 100644 | 131 | index ae93857944..fba24c6fed 100644 |
139 | --- a/inference-engine/samples/CMakeLists.txt | 132 | --- a/inference-engine/samples/CMakeLists.txt |
140 | +++ b/inference-engine/samples/CMakeLists.txt | 133 | +++ b/inference-engine/samples/CMakeLists.txt |
141 | @@ -33,7 +33,7 @@ endif() | 134 | @@ -33,7 +33,7 @@ endif() |
@@ -147,9 +140,9 @@ index 6bc44019fe..ca5ab34704 100644 | |||
147 | # hint for find_package(InferenceEngine in the samples folder) | 140 | # hint for find_package(InferenceEngine in the samples folder) |
148 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | 141 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") |
149 | # hint for find_package(ngraph in the samples folder) | 142 | # hint for find_package(ngraph in the samples folder) |
150 | @@ -251,6 +251,8 @@ macro(ie_add_sample) | 143 | @@ -256,6 +256,8 @@ macro(ie_add_sample) |
151 | add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} | 144 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) |
152 | CUSTOM_FILTERS ${custom_filters}) | 145 | add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) |
153 | endif() | 146 | endif() |
154 | + | 147 | + |
155 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | 148 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) |
@@ -157,52 +150,105 @@ index 6bc44019fe..ca5ab34704 100644 | |||
157 | 150 | ||
158 | # collect all samples subdirectories | 151 | # collect all samples subdirectories |
159 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt | 152 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt |
160 | index c5c5449677..06ecab13b5 100644 | 153 | index d75061e56c..a2f8bd6397 100644 |
161 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | 154 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt |
162 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | 155 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt |
163 | @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | 156 | @@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} |
164 | 157 | ||
165 | set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} | 158 | if(COMMAND add_clang_format_target) |
166 | FOLDER cpp_samples) | 159 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) |
160 | -endif() | ||
161 | \ No newline at end of file | ||
162 | +endif() | ||
167 | + | 163 | + |
168 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 164 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
169 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 165 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt |
170 | index 1ea3227631..aa64718940 100644 | 166 | index 5d044e097c..103c187913 100644 |
171 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 167 | --- a/inference-engine/src/inference_engine/CMakeLists.txt |
172 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 168 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt |
173 | @@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME} | 169 | @@ -227,35 +227,6 @@ list(APPEND core_components ngraph) |
174 | install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" | 170 | list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" |
175 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" | 171 | "IE_PARALLEL_CMAKE") |
176 | "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" | 172 | |
177 | - DESTINATION ${IE_CPACK_IE_DIR}/share | 173 | -if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) |
178 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | 174 | - ie_cpack_add_component(tbb REQUIRED) |
179 | COMPONENT core) | 175 | - list(APPEND core_components tbb) |
176 | - | ||
177 | - install(DIRECTORY "${TBB}/include" | ||
178 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
179 | - COMPONENT tbb) | ||
180 | - install(DIRECTORY "${TBB}/lib" | ||
181 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
182 | - COMPONENT tbb) | ||
183 | - if(EXISTS "${TBB}/bin") | ||
184 | - install(DIRECTORY "${TBB}/bin" | ||
185 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
186 | - COMPONENT tbb) | ||
187 | - endif() | ||
188 | - install(FILES "${TBB}/LICENSE" | ||
189 | - DESTINATION ${IE_CPACK_IE_DIR}/external/tbb | ||
190 | - COMPONENT tbb) | ||
191 | - | ||
192 | - set(IE_TBB_DIR_INSTALL "external/tbb/cmake") | ||
193 | - set(IE_TBB_DIR "${TBB_DIR}") | ||
194 | - list(APPEND PATH_VARS "IE_TBB_DIR") | ||
195 | - | ||
196 | - install(FILES "${TBB}/cmake/TBBConfig.cmake" | ||
197 | - "${TBB}/cmake/TBBConfigVersion.cmake" | ||
198 | - DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} | ||
199 | - COMPONENT tbb) | ||
200 | -endif() | ||
201 | - | ||
202 | # Install Inference Engine | ||
203 | |||
204 | ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) | ||
205 | @@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets | ||
206 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
207 | |||
180 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | 208 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml |
181 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | 209 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} |
182 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | 210 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} |
183 | COMPONENT core) | 211 | COMPONENT core) |
212 | |||
213 | # Install cmake scripts | ||
214 | @@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
215 | install(EXPORT InferenceEngineTargets | ||
216 | FILE InferenceEngineTargets.cmake | ||
217 | NAMESPACE IE:: | ||
218 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
219 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
220 | COMPONENT core_dev) | ||
221 | |||
222 | set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") | ||
223 | @@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers | ||
224 | install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
225 | "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" | ||
226 | "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" | ||
227 | - DESTINATION ${IE_CPACK_IE_DIR}/share | ||
228 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
229 | COMPONENT core_dev) | ||
184 | diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt | 230 | diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt |
185 | index 973fafcbf5..81aea3471a 100644 | 231 | index f9548339d1..2670a04b60 100644 |
186 | --- a/inference-engine/src/preprocessing/CMakeLists.txt | 232 | --- a/inference-engine/src/preprocessing/CMakeLists.txt |
187 | +++ b/inference-engine/src/preprocessing/CMakeLists.txt | 233 | +++ b/inference-engine/src/preprocessing/CMakeLists.txt |
188 | @@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) | 234 | @@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) |
235 | |||
189 | install(TARGETS ${TARGET_NAME} | 236 | install(TARGETS ${TARGET_NAME} |
190 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | 237 | 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) | 238 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) |
193 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | 239 | + 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 | 240 | 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 | 241 | index 6d2bd39f3c..0722702055 100644 |
196 | --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt | 242 | --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt |
197 | +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt | 243 | +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt |
198 | @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | 244 | @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) |
245 | |||
199 | install(TARGETS ${TARGET_NAME} | 246 | install(TARGETS ${TARGET_NAME} |
200 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | 247 | 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) | 248 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) |
203 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | 249 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) |
204 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 250 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
205 | index d8a5f2ec1d..2db7ddea6f 100644 | 251 | index a3e0182ed9..1b0e241485 100644 |
206 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 252 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
207 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | 253 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt |
208 | @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | 254 | @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL |
@@ -214,7 +260,7 @@ index d8a5f2ec1d..2db7ddea6f 100644 | |||
214 | COMPONENT myriad) | 260 | COMPONENT myriad) |
215 | endif() | 261 | endif() |
216 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | 262 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt |
217 | index c9a92b4857..2b4fcc4d01 100644 | 263 | index dfa8ce9d3f..88e7fbf67f 100644 |
218 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | 264 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt |
219 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | 265 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt |
220 | @@ -25,3 +25,5 @@ addIeTargetTest( | 266 | @@ -25,3 +25,5 @@ addIeTargetTest( |
@@ -224,7 +270,7 @@ index c9a92b4857..2b4fcc4d01 100644 | |||
224 | + | 270 | + |
225 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 271 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
226 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 272 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
227 | index 1d9515f540..c81cb2ed79 100644 | 273 | index 5c38c77b9b..927f93484f 100644 |
228 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 274 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
229 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | 275 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt |
230 | @@ -26,3 +26,5 @@ addIeTargetTest( | 276 | @@ -26,3 +26,5 @@ addIeTargetTest( |
@@ -234,28 +280,47 @@ index 1d9515f540..c81cb2ed79 100644 | |||
234 | + | 280 | + |
235 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 281 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
236 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | 282 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt |
237 | index 5be30a3092..6a01e280ae 100644 | 283 | index fcb9f567bb..d4ac1952b8 100644 |
238 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | 284 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt |
239 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | 285 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt |
240 | @@ -35,3 +35,5 @@ addIeTargetTest( | 286 | @@ -33,3 +33,5 @@ addIeTargetTest( |
241 | VPU | 287 | VPU |
242 | MYRIAD | 288 | MYRIAD |
243 | ) | 289 | ) |
244 | + | 290 | + |
245 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | 291 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
246 | diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt | 292 | diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt |
247 | index 58614d3ced..9dfa068e4d 100644 | 293 | index 6e6f384289..a76ba55e64 100644 |
248 | --- a/inference-engine/tools/compile_tool/CMakeLists.txt | 294 | --- a/inference-engine/tools/compile_tool/CMakeLists.txt |
249 | +++ b/inference-engine/tools/compile_tool/CMakeLists.txt | 295 | +++ b/inference-engine/tools/compile_tool/CMakeLists.txt |
250 | @@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | 296 | @@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) |
251 | # install | 297 | ie_cpack_add_component(core_tools DEPENDS core) |
252 | 298 | ||
253 | install(TARGETS compile_tool | 299 | install(TARGETS compile_tool |
254 | - RUNTIME DESTINATION deployment_tools/tools/compile_tool | 300 | - RUNTIME DESTINATION deployment_tools/tools/compile_tool |
255 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 301 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
256 | COMPONENT core) | 302 | COMPONENT core_tools) |
257 | 303 | ||
258 | install(FILES README.md | 304 | install(FILES README.md |
305 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
306 | index 830fb3eb36..3093596e4a 100644 | ||
307 | --- a/ngraph/CMakeLists.txt | ||
308 | +++ b/ngraph/CMakeLists.txt | ||
309 | @@ -183,10 +183,10 @@ endif() | ||
310 | message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") | ||
311 | |||
312 | # Destinations | ||
313 | -set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") | ||
314 | -set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") | ||
315 | -set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") | ||
316 | -set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") | ||
317 | +set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") | ||
318 | +set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") | ||
319 | +set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") | ||
320 | +set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") | ||
321 | |||
322 | #----------------------------------------------------------------------------------------------- | ||
323 | # Compile Flags for nGraph... | ||
259 | -- | 324 | -- |
260 | 2.29.0 | 325 | 2.32.0 |
261 | 326 | ||