diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2022-02-14 10:16:08 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-04-13 14:08:21 +0800 |
commit | ac72b03ce59af4e8ea08d2f1b2cb8f49b633bf4e (patch) | |
tree | 6376534826a4143a7bef9a5068a246f50674073e /dynamic-layers/openembedded-layer | |
parent | 23e680f9567be2b90bd8c607a6654644268cff51 (diff) | |
download | meta-intel-ac72b03ce59af4e8ea08d2f1b2cb8f49b633bf4e.tar.gz |
openvino-inference-engine: upgrade 2021.4.2 -> 2022.1
Refresh patches, update dependencies and licenses for the new
components.
Release notes:
https://github.com/openvinotoolkit/openvino/releases/tag/2022.1.0
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer')
7 files changed, 682 insertions, 787 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 deleted file mode 100644 index 3c265652..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 9 Jun 2020 11:35:59 +0800 | ||
4 | Subject: [PATCH] don't install licenses and version | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | ngraph/CMakeLists.txt | 8 ++------ | ||
11 | ngraph/test/runtime/CMakeLists.txt | 2 ++ | ||
12 | 2 files changed, 4 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt | ||
15 | index a05ca3b15c..9bc507b4c7 100644 | ||
16 | --- a/ngraph/CMakeLists.txt | ||
17 | +++ b/ngraph/CMakeLists.txt | ||
18 | @@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
19 | install(EXPORT ngraphTargets | ||
20 | FILE ngraphTargets.cmake | ||
21 | NAMESPACE ngraph:: | ||
22 | - DESTINATION "deployment_tools/ngraph/cmake" | ||
23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
24 | COMPONENT ngraph_dev) | ||
25 | endif() | ||
26 | |||
27 | @@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
28 | |||
29 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
30 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
31 | - DESTINATION "deployment_tools/ngraph/cmake" | ||
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
33 | COMPONENT ngraph_dev) | ||
34 | endif() | ||
35 | |||
36 | @@ -337,7 +337,3 @@ add_subdirectory(test) | ||
37 | if (NGRAPH_PYTHON_BUILD_ENABLE) | ||
38 | add_subdirectory(python) | ||
39 | endif() | ||
40 | - | ||
41 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION | ||
42 | - DESTINATION "deployment_tools/ngraph" | ||
43 | - COMPONENT ngraph) | ||
44 | diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt | ||
45 | index be84499ee0..f65357b751 100644 | ||
46 | --- a/ngraph/test/runtime/CMakeLists.txt | ||
47 | +++ b/ngraph/test/runtime/CMakeLists.txt | ||
48 | @@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | ||
49 | |||
50 | add_subdirectory(interpreter) | ||
51 | add_subdirectory(ie) | ||
52 | + | ||
53 | +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) | ||
54 | -- | ||
55 | 2.32.0 | ||
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 b16135ee..315385d8 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,51 +1,44 @@ | |||
1 | From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 | 1 | From b0f30ab7ecdac98afa72a31371a393a73f855b3c 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, 7 Apr 2022 21:39:26 +0800 |
4 | Subject: [PATCH] inference-engine: use system installed packages | 4 | Subject: [PATCH] Use system installed dependencies |
5 | 5 | ||
6 | Use installed versions of ade, protobuf, zlib and tbb. | 6 | Use the system versions of libva, tbb, OpenCV, ade and zlib. |
7 | |||
8 | Don't fetch pybind11 at runtime and use the one that we have fetched while | ||
9 | running do_fetch. | ||
10 | 7 | ||
11 | Upstream-Status: Inappropriate | 8 | Upstream-Status: Inappropriate |
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
10 | |||
14 | --- | 11 | --- |
15 | cmake/dependencies.cmake | 19 -------- | 12 | cmake/dependencies.cmake | 75 ------------------------- |
16 | inference-engine/CMakeLists.txt | 6 +-- | 13 | cmake/extra_modules.cmake | 4 +- |
17 | inference-engine/cmake/dependencies.cmake | 45 ------------------- | 14 | cmake/templates/OpenVINOConfig.cmake.in | 9 --- |
18 | inference-engine/cmake/ie_parallel.cmake | 2 +- | 15 | src/cmake/ie_parallel.cmake | 2 +- |
19 | .../templates/InferenceEngineConfig.cmake.in | 10 ----- | 16 | src/plugins/intel_gpu/include/va/va.h | 6 -- |
20 | inference-engine/samples/CMakeLists.txt | 3 +- | 17 | tests/fuzz/src/CMakeLists.txt | 3 +- |
21 | .../src/inference_engine/CMakeLists.txt | 4 +- | 18 | thirdparty/CMakeLists.txt | 26 ++++----- |
22 | .../common_test_utils/CMakeLists.txt | 4 +- | 19 | thirdparty/cnpy/CMakeLists.txt | 2 +- |
23 | .../unit_test_utils/CMakeLists.txt | 3 +- | 20 | 8 files changed, 15 insertions(+), 112 deletions(-) |
24 | inference-engine/thirdparty/CMakeLists.txt | 5 +-- | 21 | delete mode 100644 src/plugins/intel_gpu/include/va/va.h |
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(-) | ||
30 | 22 | ||
31 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 23 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
32 | index 6cb15a077e..74d4ac4124 100644 | 24 | index e2f941fcd..1fcc358ef 100644 |
33 | --- a/cmake/dependencies.cmake | 25 | --- a/cmake/dependencies.cmake |
34 | +++ b/cmake/dependencies.cmake | 26 | +++ b/cmake/dependencies.cmake |
35 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") | 27 | @@ -29,26 +29,6 @@ endif() |
36 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | ||
37 | set(protoc_version "3.7.1") | ||
38 | 28 | ||
29 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | ||
30 | set(protoc_version "3.18.2") | ||
31 | - | ||
39 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | 32 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT |
40 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | 33 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" |
41 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" | 34 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" |
42 | - SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" | 35 | - SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21" |
43 | - ) | 36 | - ) |
44 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | 37 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) |
45 | - | 38 | - |
46 | - reset_deps_cache(SYSTEM_PROTOC) | 39 | - reset_deps_cache(SYSTEM_PROTOC) |
47 | - | 40 | - |
48 | - find_program( | 41 | - find_host_program( |
49 | - SYSTEM_PROTOC | 42 | - SYSTEM_PROTOC |
50 | - NAMES protoc | 43 | - NAMES protoc |
51 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | 44 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" |
@@ -56,57 +49,29 @@ index 6cb15a077e..74d4ac4124 100644 | |||
56 | - | 49 | - |
57 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 50 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
58 | endif() | 51 | endif() |
59 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | ||
60 | index 1ac7fd8bf6..0615873110 100644 | ||
61 | --- a/inference-engine/CMakeLists.txt | ||
62 | +++ b/inference-engine/CMakeLists.txt | ||
63 | @@ -18,7 +18,7 @@ function(ie_developer_export_targets) | ||
64 | endfunction() | ||
65 | |||
66 | function(ie_developer_export) | ||
67 | - set(all_dev_targets gflags ie_libraries) | ||
68 | + set(all_dev_targets ie_libraries) | ||
69 | foreach(component IN LISTS openvino_export_components) | ||
70 | export(TARGETS ${${component}} NAMESPACE IE:: | ||
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 | 52 | ||
89 | configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | 53 | if(ENABLE_INTEL_MYRIAD) |
90 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | 54 | @@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
91 | index b270c46f2d..5f85197a85 100644 | 55 | set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") |
92 | --- a/inference-engine/cmake/dependencies.cmake | 56 | endif() |
93 | +++ b/inference-engine/cmake/dependencies.cmake | ||
94 | @@ -81,51 +81,6 @@ endif () | ||
95 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
96 | reset_deps_cache(TBBROOT TBB_DIR) | ||
97 | 57 | ||
98 | - if (WIN32 AND X86_64) | 58 | - if(WIN32 AND X86_64) |
99 | - #TODO: add target_path to be platform specific as well, to avoid following if | 59 | - # TODO: add target_path to be platform specific as well, to avoid following if |
100 | - RESOLVE_DEPENDENCY(TBB | 60 | - RESOLVE_DEPENDENCY(TBB |
101 | - ARCHIVE_WIN "tbb2020_20200415_win.zip" | 61 | - ARCHIVE_WIN "tbb2020_20200415_win.zip" |
102 | - TARGET_PATH "${TEMP}/tbb" | 62 | - TARGET_PATH "${TEMP}/tbb" |
103 | - ENVIRONMENT "TBBROOT" | 63 | - ENVIRONMENT "TBBROOT" |
104 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | 64 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") |
105 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | 65 | - if(ENABLE_TBBBIND_2_5) |
106 | - ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" | 66 | - RESOLVE_DEPENDENCY(TBBBIND_2_5 |
107 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | 67 | - ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip" |
108 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | 68 | - TARGET_PATH "${TEMP}/tbbbind_2_5" |
109 | - SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") | 69 | - ENVIRONMENT "TBBBIND_2_5_ROOT" |
70 | - SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1") | ||
71 | - else() | ||
72 | - message(WARNING "prebuilt TBBBIND_2_5 is not available. | ||
73 | - Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") | ||
74 | - endif() | ||
110 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | 75 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well |
111 | - RESOLVE_DEPENDENCY(TBB | 76 | - RESOLVE_DEPENDENCY(TBB |
112 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | 77 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" |
@@ -119,11 +84,16 @@ index b270c46f2d..5f85197a85 100644 | |||
119 | - TARGET_PATH "${TEMP}/tbb" | 84 | - TARGET_PATH "${TEMP}/tbb" |
120 | - ENVIRONMENT "TBBROOT" | 85 | - ENVIRONMENT "TBBROOT" |
121 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | 86 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") |
122 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | 87 | - if(ENABLE_TBBBIND_2_5) |
123 | - ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" | 88 | - RESOLVE_DEPENDENCY(TBBBIND_2_5 |
124 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | 89 | - ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz" |
125 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | 90 | - TARGET_PATH "${TEMP}/tbbbind_2_5" |
126 | - SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") | 91 | - ENVIRONMENT "TBBBIND_2_5_ROOT" |
92 | - SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4") | ||
93 | - else() | ||
94 | - message(WARNING "prebuilt TBBBIND_2_5 is not available. | ||
95 | - Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") | ||
96 | - endif() | ||
127 | - elseif(LINUX AND AARCH64) | 97 | - elseif(LINUX AND AARCH64) |
128 | - RESOLVE_DEPENDENCY(TBB | 98 | - RESOLVE_DEPENDENCY(TBB |
129 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | 99 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" |
@@ -141,193 +111,186 @@ index b270c46f2d..5f85197a85 100644 | |||
141 | - endif() | 111 | - endif() |
142 | - | 112 | - |
143 | update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") | 113 | update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") |
144 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") | 114 | if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake") |
115 | # oneTBB case | ||
116 | diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake | ||
117 | index e33e4378f..f0cacdf6f 100644 | ||
118 | --- a/cmake/extra_modules.cmake | ||
119 | +++ b/cmake/extra_modules.cmake | ||
120 | @@ -18,7 +18,7 @@ function(ie_generate_dev_package_config) | ||
121 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" | ||
122 | "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" | ||
123 | INSTALL_DESTINATION share # not used | ||
124 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" | ||
125 | + PATH_VARS "OpenVINO_SOURCE_DIR" | ||
126 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
145 | 127 | ||
146 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 128 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" |
147 | index edf3d2f2b2..6579d0f7ea 100644 | 129 | @@ -45,7 +45,7 @@ function(ov_generate_dev_package_config) |
148 | --- a/inference-engine/cmake/ie_parallel.cmake | 130 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in" |
149 | +++ b/inference-engine/cmake/ie_parallel.cmake | 131 | "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake" |
150 | @@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) | 132 | INSTALL_DESTINATION share # not used |
151 | find_dependency(TBB COMPONENTS tbb tbbmalloc) | 133 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" |
152 | endif() | 134 | + PATH_VARS "OpenVINO_SOURCE_DIR" |
153 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) | 135 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) |
154 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) | 136 | |
155 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) | 137 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in" |
156 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) | 138 | diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in |
157 | if (NOT TBB_FOUND) | 139 | index 00e892f2b..7c686fa07 100644 |
158 | ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ | 140 | --- a/cmake/templates/OpenVINOConfig.cmake.in |
159 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | 141 | +++ b/cmake/templates/OpenVINOConfig.cmake.in |
160 | index 261edbf3d7..bf217a789a 100644 | 142 | @@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}") |
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 | 143 | ||
166 | set(THREADING "@THREADING@") | 144 | set(THREADING "@THREADING@") |
167 | -if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | 145 | if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND) |
168 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") | 146 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") |
169 | - _ie_find_dependency(TBB | 147 | - _ov_find_dependency(TBB |
170 | - COMPONENTS tbb tbbmalloc | 148 | - COMPONENTS tbb tbbmalloc |
171 | - CONFIG | 149 | - CONFIG |
172 | - PATHS ${TBBROOT}/cmake | 150 | - PATHS ${TBBROOT}/cmake |
173 | - ${_tbb_dir} | 151 | - ${_tbb_dir} |
174 | - NO_CMAKE_FIND_ROOT_PATH | 152 | - NO_CMAKE_FIND_ROOT_PATH |
175 | - NO_DEFAULT_PATH) | 153 | - NO_DEFAULT_PATH) |
176 | -endif() | 154 | - |
177 | 155 | set(install_tbbbind "@install_tbbbind@") | |
178 | set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") | 156 | if(install_tbbbind) |
179 | _ie_find_dependency(ngraph | 157 | set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@") |
180 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 158 | diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake |
181 | index 7924c56779..ae93857944 100644 | 159 | index a036b019c..031f1ea48 100644 |
182 | --- a/inference-engine/samples/CMakeLists.txt | 160 | --- a/src/cmake/ie_parallel.cmake |
183 | +++ b/inference-engine/samples/CMakeLists.txt | 161 | +++ b/src/cmake/ie_parallel.cmake |
184 | @@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | 162 | @@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME) |
185 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) | 163 | endforeach() |
186 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | 164 | endif() |
187 | endfunction() | 165 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) |
188 | - add_gflags() | 166 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) |
189 | + #add_gflags() | 167 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) |
190 | endif() | 168 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) |
191 | 169 | if (NOT TBB_FOUND) | |
192 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") | 170 | set(THREADING "SEQ" PARENT_SCOPE) |
193 | - add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) | 171 | diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h |
194 | endif() | 172 | deleted file mode 100644 |
195 | 173 | index 5c8a5c6f6..000000000 | |
196 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") | 174 | --- a/src/plugins/intel_gpu/include/va/va.h |
197 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | 175 | +++ /dev/null |
198 | index e8ed1a5c4c..2fcb0bed4a 100644 | 176 | @@ -1,6 +0,0 @@ |
199 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | 177 | -// Copyright (C) 2018-2022 Intel Corporation |
200 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | 178 | -// SPDX-License-Identifier: Apache-2.0 |
201 | @@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf | 179 | -// |
202 | INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" | 180 | - |
203 | PATH_VARS ${PATH_VARS}) | 181 | -typedef cl_uint VASurfaceID; |
204 | 182 | -typedef void* VADisplay; | |
205 | -set(IE_INCLUDE_DIR "include") | 183 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt |
206 | -set(IE_NGRAPH_DIR "../ngraph/cmake") | 184 | index 5e6b7b168..a81c51bb7 100644 |
207 | +set(IE_INCLUDE_DIR "../../include") | 185 | --- a/tests/fuzz/src/CMakeLists.txt |
208 | +set(IE_NGRAPH_DIR "ngraph") | 186 | +++ b/tests/fuzz/src/CMakeLists.txt |
209 | set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") | 187 | @@ -10,14 +10,13 @@ add_custom_target(fuzz) |
210 | set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") | 188 | FILE(GLOB tests "*-fuzzer.cc") |
211 | |||
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 | ||
213 | index 5e8643dc5d..031557efc3 100644 | ||
214 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
215 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | ||
216 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) | ||
217 | PROPERTIES FOLDER thirdparty) | ||
218 | endfunction() | ||
219 | 189 | ||
220 | -add_gtest_libraries() | 190 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) |
221 | +#add_gtest_libraries() | 191 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) |
222 | 192 | ||
223 | if (MSVC) | 193 | foreach(test_source ${tests}) |
224 | set(PUGI pugixml_mt) | 194 | get_filename_component(test_name ${test_source} NAME_WE) |
225 | @@ -52,8 +52,6 @@ else () | 195 | add_fuzzer(${test_name} ${test_source}) |
226 | endif () | ||
227 | 196 | ||
228 | list(APPEND EXPORT_DEPENDENCIES | 197 | target_link_libraries(${test_name} PRIVATE |
229 | - gtest | 198 | - openvino::runtime cnpy zlib) |
230 | - gtest_main | 199 | + openvino::runtime cnpy z) |
231 | ) | ||
232 | 200 | ||
233 | set(TARGET_NAME commonTestUtils) | 201 | add_dependencies(fuzz ${test_name}) |
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 | ||
235 | index 7c1d89eabf..2fbd8fc324 100644 | ||
236 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
237 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | ||
238 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) | ||
239 | 202 | ||
240 | list(APPEND EXPORT_DEPENDENCIES | 203 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt |
241 | commonTestUtils_s | 204 | index 2d61c5fd7..97b372998 100644 |
242 | - inference_engine_s | 205 | --- a/thirdparty/CMakeLists.txt |
243 | - gmock) | 206 | +++ b/thirdparty/CMakeLists.txt |
244 | + inference_engine_s) | 207 | @@ -12,10 +12,9 @@ endif() |
245 | 208 | ||
246 | addIeTarget( | 209 | add_subdirectory(ittapi) |
247 | NAME ${TARGET_NAME} | 210 | add_subdirectory(itt_collector EXCLUDE_FROM_ALL) |
248 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 211 | -add_subdirectory(zlib EXCLUDE_FROM_ALL) |
249 | index f028ebdd8a..9c5bd53466 100644 | 212 | add_subdirectory(cnpy EXCLUDE_FROM_ALL) |
250 | --- a/inference-engine/thirdparty/CMakeLists.txt | 213 | if(ENABLE_INTEL_GPU) |
251 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 214 | - add_subdirectory(ocl) |
252 | @@ -62,14 +62,13 @@ else() | 215 | + #add_subdirectory(ocl) |
253 | target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") | ||
254 | endif() | 216 | endif() |
255 | 217 | ||
256 | -add_subdirectory(ade EXCLUDE_FROM_ALL) | 218 | add_subdirectory(xbyak EXCLUDE_FROM_ALL) |
257 | add_subdirectory(fluid/modules/gapi) | 219 | @@ -52,21 +51,16 @@ endif() |
220 | add_library(ocv_hal INTERFACE) | ||
221 | target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv") | ||
258 | 222 | ||
223 | -add_subdirectory(ade EXCLUDE_FROM_ALL) | ||
224 | add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL) | ||
259 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) | 225 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) |
260 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) | ||
261 | |||
262 | # developer package | ||
263 | |||
264 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) | 226 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) |
227 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) | ||
265 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) | 228 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) |
266 | 229 | ||
267 | if (NOT USE_SYSTEM_PUGIXML) | 230 | -ov_install_static_lib(ade openvino_common) |
268 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) | 231 | ov_install_static_lib(fluid openvino_common) |
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 | 232 | ||
275 | include(FetchContent) | 233 | # |
234 | # Gflags | ||
235 | # | ||
276 | 236 | ||
277 | -FetchContent_Declare( | 237 | -add_subdirectory(gflags EXCLUDE_FROM_ALL) |
278 | - pybind11 | 238 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags) |
279 | - GIT_REPOSITORY "https://github.com/pybind/pybind11.git" | ||
280 | - GIT_TAG "v2.5.0" | ||
281 | -) | ||
282 | - | 239 | - |
283 | -FetchContent_GetProperties(pybind11) | 240 | # |
284 | -if(NOT pybind11_POPULATED) | 241 | # Google Tests framework |
285 | - FetchContent_Populate(pybind11) | 242 | # |
286 | - add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) | 243 | @@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND |
287 | -endif() | 244 | set(Protobuf_DEBUG ON) |
288 | +add_subdirectory(pybind11) | 245 | endif() |
289 | 246 | find_package(Protobuf 3.18.2 REQUIRED) | |
290 | # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 | 247 | - set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) |
291 | set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) | 248 | - set(Protobuf_LIBRARIES protobuf::libprotobuf) |
292 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | 249 | - set(SYSTEM_PROTOC protobuf::protoc) |
293 | index b9400d9e7e..669938526c 100644 | 250 | + set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) |
294 | --- a/tests/fuzz/src/CMakeLists.txt | 251 | + set(Protobuf_LIBRARIES protobuf::libprotobuf) |
295 | +++ b/tests/fuzz/src/CMakeLists.txt | 252 | + #set(SYSTEM_PROTOC protobuf::protoc) |
296 | @@ -10,7 +10,6 @@ add_custom_target(fuzz) | 253 | set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC}) |
297 | FILE(GLOB tests "*-fuzzer.cc") | ||
298 | 254 | ||
299 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | 255 | foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES}) |
300 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | 256 | - set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) |
257 | + #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) | ||
258 | endforeach() | ||
259 | else() | ||
260 | add_subdirectory(protobuf EXCLUDE_FROM_ALL) | ||
261 | @@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
262 | # forward variables used in the other places | ||
263 | set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE) | ||
264 | set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE) | ||
265 | - set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE) | ||
266 | - set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE) | ||
267 | + set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE) | ||
268 | + set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE) | ||
269 | set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE) | ||
270 | set(Protobuf_IN_FRONTEND ON PARENT_SCOPE) | ||
301 | 271 | ||
302 | foreach(test_source ${tests}) | 272 | @@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND |
303 | get_filename_component(test_name ${test_source} NAME_WE) | 273 | set(link_type INTERFACE) |
304 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | 274 | endif() |
305 | index 2c6b656408..4e86bd21ef 100644 | 275 | if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) |
306 | --- a/thirdparty/CMakeLists.txt | 276 | - target_compile_options(${target} ${link_type} -Wno-undef) |
307 | +++ b/thirdparty/CMakeLists.txt | 277 | + #target_compile_options(${target} ${link_type} -Wno-undef) |
308 | @@ -5,6 +5,5 @@ | 278 | endif() |
309 | add_subdirectory(ittapi) | 279 | endforeach() |
310 | add_subdirectory(itt_collector) | 280 | endif() |
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 | 281 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt |
316 | index 5571cd5f78..e30604927a 100644 | 282 | index 041031e92..793de9845 100644 |
317 | --- a/thirdparty/cnpy/CMakeLists.txt | 283 | --- a/thirdparty/cnpy/CMakeLists.txt |
318 | +++ b/thirdparty/cnpy/CMakeLists.txt | 284 | +++ b/thirdparty/cnpy/CMakeLists.txt |
319 | @@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") | 285 | @@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") |
320 | target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) | 286 | PRIVATE -Wno-all) |
321 | endif() | 287 | endif() |
322 | 288 | ||
323 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) | 289 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) |
324 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | 290 | +target_link_libraries(${TARGET_NAME} PUBLIC z) |
325 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | 291 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") |
326 | "${CMAKE_CURRENT_SOURCE_DIR}/..") | ||
327 | 292 | ||
328 | -set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | 293 | set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) |
329 | \ No newline at end of file | ||
330 | +set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
331 | -- | 294 | -- |
332 | 2.32.0 | 295 | 2.35.1 |
333 | 296 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch deleted file mode 100644 index 5e7cfb38..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 10 Jun 2020 09:45:48 +0800 | ||
4 | Subject: [PATCH] Disable Werror | ||
5 | |||
6 | Don't treat warnings as errors. This just leads to failures every time | ||
7 | we upgrade the compiler. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - | ||
14 | ngraph/CMakeLists.txt | 1 - | ||
15 | 2 files changed, 2 deletions(-) | ||
16 | |||
17 | diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
18 | index d14da47860..08ed695c0d 100644 | ||
19 | --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
20 | +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt | ||
21 | @@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") | ||
22 | MultiProcessorCompilation | ||
23 | DeadCodeEliminate | ||
24 | ExtensionsEnabled | ||
25 | - TreatWarnAsErrorEnabled | ||
26 | WarnLevel4 | ||
27 | NoFastMath | ||
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) | ||
41 | -- | ||
42 | 2.32.0 | ||
43 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch new file mode 100644 index 00000000..9e2b46fd --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch | |||
@@ -0,0 +1,348 @@ | |||
1 | From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Mon, 11 Apr 2022 11:11:23 +0800 | ||
4 | Subject: [PATCH] Fix installation of binaries and libraries | ||
5 | |||
6 | Make sure binaries are installed correctly. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 2 +- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | cmake/developer_package/packaging.cmake | 4 ++-- | ||
15 | cmake/developer_package/plugins/plugins.cmake | 2 +- | ||
16 | docs/CMakeLists.txt | 3 ++- | ||
17 | samples/CMakeLists.txt | 2 +- | ||
18 | samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++ | ||
19 | samples/cpp/CMakeLists.txt | 2 ++ | ||
20 | scripts/CMakeLists.txt | 10 +++++----- | ||
21 | src/bindings/c/src/CMakeLists.txt | 4 ++-- | ||
22 | src/cmake/openvino.cmake | 12 ++++++------ | ||
23 | src/common/preprocessing/CMakeLists.txt | 2 +- | ||
24 | src/core/CMakeLists.txt | 4 ++-- | ||
25 | src/inference/CMakeLists.txt | 2 +- | ||
26 | .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +- | ||
27 | src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +- | ||
28 | .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +- | ||
29 | tools/CMakeLists.txt | 2 +- | ||
30 | tools/compile_tool/CMakeLists.txt | 8 ++++---- | ||
31 | 19 files changed, 37 insertions(+), 32 deletions(-) | ||
32 | |||
33 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
34 | index fe62c6318..344d9398f 100644 | ||
35 | --- a/CMakeLists.txt | ||
36 | +++ b/CMakeLists.txt | ||
37 | @@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake) | ||
38 | add_subdirectory(docs) | ||
39 | add_subdirectory(tools) | ||
40 | add_subdirectory(scripts) | ||
41 | -add_subdirectory(licensing) | ||
42 | +#add_subdirectory(licensing) | ||
43 | |||
44 | # | ||
45 | # CPack | ||
46 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
47 | index 39b23fe65..aa638c077 100644 | ||
48 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
49 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
50 | @@ -2,7 +2,7 @@ | ||
51 | # SPDX-License-Identifier: Apache-2.0 | ||
52 | # | ||
53 | |||
54 | -set(FRONTEND_INSTALL_INCLUDE "runtime/include/") | ||
55 | +set(FRONTEND_INSTALL_INCLUDE "include/") | ||
56 | set(FRONTEND_NAME_PREFIX "openvino_") | ||
57 | set(FRONTEND_NAME_SUFFIX "_frontend") | ||
58 | |||
59 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
60 | index cc287ff1f..2daee6611 100644 | ||
61 | --- a/cmake/developer_package/packaging.cmake | ||
62 | +++ b/cmake/developer_package/packaging.cmake | ||
63 | @@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir) | ||
64 | set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
65 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
66 | else() | ||
67 | - set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
68 | - set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
69 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
70 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
71 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
72 | endif() | ||
73 | endfunction() | ||
74 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | ||
75 | index a630d6c35..779c43631 100644 | ||
76 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
77 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
78 | @@ -138,7 +138,7 @@ function(ie_add_plugin) | ||
79 | |||
80 | if(BUILD_SHARED_LIBS) | ||
81 | install(TARGETS ${IE_PLUGIN_NAME} | ||
82 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
83 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
84 | COMPONENT ${install_component}) | ||
85 | else() | ||
86 | ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) | ||
87 | diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt | ||
88 | index 86b0e8652..4f31d3cc4 100644 | ||
89 | --- a/docs/CMakeLists.txt | ||
90 | +++ b/docs/CMakeLists.txt | ||
91 | @@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER) | ||
92 | foreach(target openvino_template_plugin template_extension openvino_template_extension) | ||
93 | if(TARGET ${target}) | ||
94 | install(TARGETS ${target} | ||
95 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
96 | + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
97 | COMPONENT tests | ||
98 | EXCLUDE_FROM_ALL) | ||
99 | + install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
100 | endif() | ||
101 | endforeach() | ||
102 | endif() | ||
103 | diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt | ||
104 | index 8101b5e32..6abe8c20c 100644 | ||
105 | --- a/samples/CMakeLists.txt | ||
106 | +++ b/samples/CMakeLists.txt | ||
107 | @@ -9,7 +9,7 @@ add_subdirectory(c) | ||
108 | if(TARGET format_reader) | ||
109 | install(TARGETS format_reader | ||
110 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL | ||
111 | - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL) | ||
112 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests) | ||
113 | endif() | ||
114 | |||
115 | openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) | ||
116 | diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
117 | index a8e6e5172..aa3d2fe0e 100644 | ||
118 | --- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
119 | +++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
120 | @@ -34,3 +34,5 @@ install( | ||
121 | RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
122 | LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
123 | ) | ||
124 | + | ||
125 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
126 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
127 | index 3433dee0e..0c0fa0723 100644 | ||
128 | --- a/samples/cpp/CMakeLists.txt | ||
129 | +++ b/samples/cpp/CMakeLists.txt | ||
130 | @@ -222,6 +222,8 @@ macro(ie_add_sample) | ||
131 | EXCLUDE_FROM_ALL | ||
132 | ) | ||
133 | |||
134 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
135 | + | ||
136 | # create global target with all samples / demo apps | ||
137 | if(NOT TARGET ie_samples) | ||
138 | add_custom_target(ie_samples ALL) | ||
139 | diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt | ||
140 | index 9ad26ba95..0853e2370 100644 | ||
141 | --- a/scripts/CMakeLists.txt | ||
142 | +++ b/scripts/CMakeLists.txt | ||
143 | @@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" | ||
144 | |||
145 | # install setupvars | ||
146 | |||
147 | -ie_cpack_add_component(setupvars REQUIRED) | ||
148 | +#ie_cpack_add_component(setupvars REQUIRED) | ||
149 | |||
150 | if(UNIX) | ||
151 | set(_setupvars_file setupvars/setupvars.sh) | ||
152 | @@ -43,13 +43,13 @@ elseif(WIN32) | ||
153 | file(WRITE "${_setupvars_file}" "${_setupvars_content}") | ||
154 | endif() | ||
155 | endif() | ||
156 | -install(PROGRAMS "${_setupvars_file}" | ||
157 | - DESTINATION . | ||
158 | - COMPONENT setupvars) | ||
159 | +#install(PROGRAMS "${_setupvars_file}" | ||
160 | +# DESTINATION . | ||
161 | +# COMPONENT setupvars) | ||
162 | |||
163 | # install install_dependencies | ||
164 | |||
165 | -if(LINUX) | ||
166 | +if (FALSE) | ||
167 | ie_cpack_add_component(install_dependencies REQUIRED) | ||
168 | install(DIRECTORY install_dependencies/ | ||
169 | DESTINATION install_dependencies | ||
170 | diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt | ||
171 | index 9200d0bda..b3636e071 100644 | ||
172 | --- a/src/bindings/c/src/CMakeLists.txt | ||
173 | +++ b/src/bindings/c/src/CMakeLists.txt | ||
174 | @@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
175 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c | ||
176 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c | ||
177 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c | ||
178 | - INCLUDES DESTINATION runtime/include/ie) | ||
179 | + INCLUDES DESTINATION include/ie) | ||
180 | |||
181 | install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ | ||
182 | - DESTINATION runtime/include/ie | ||
183 | + DESTINATION include/ie | ||
184 | COMPONENT core_c_dev) | ||
185 | diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake | ||
186 | index c46548468..3d65a20a5 100644 | ||
187 | --- a/src/cmake/openvino.cmake | ||
188 | +++ b/src/cmake/openvino.cmake | ||
189 | @@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
190 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
191 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core | ||
192 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core | ||
193 | - INCLUDES DESTINATION runtime/include | ||
194 | - runtime/include/ie) | ||
195 | + INCLUDES DESTINATION include | ||
196 | + include/ie) | ||
197 | |||
198 | # --------------- OpenVINO runtime library dev ------------------------------ | ||
199 | add_library(${TARGET_NAME}_dev INTERFACE) | ||
200 | @@ -96,7 +96,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components}) | ||
201 | |||
202 | if(BUILD_SHARED_LIBS) | ||
203 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
204 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
205 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
206 | COMPONENT core) | ||
207 | |||
208 | # for InferenceEngineUnitTest | ||
209 | @@ -115,7 +115,7 @@ endif() | ||
210 | install(EXPORT OpenVINOTargets | ||
211 | FILE OpenVINOTargets.cmake | ||
212 | NAMESPACE openvino:: | ||
213 | - DESTINATION runtime/cmake | ||
214 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
215 | COMPONENT core_dev) | ||
216 | |||
217 | set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core") | ||
218 | @@ -161,10 +161,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm | ||
219 | install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
220 | "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" | ||
221 | "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake" | ||
222 | - DESTINATION runtime/cmake | ||
223 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
224 | COMPONENT core_dev) | ||
225 | |||
226 | install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" | ||
227 | "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" | ||
228 | - DESTINATION runtime/cmake | ||
229 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
230 | COMPONENT core_dev) | ||
231 | diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt | ||
232 | index e41e286c9..11aaffca6 100644 | ||
233 | --- a/src/common/preprocessing/CMakeLists.txt | ||
234 | +++ b/src/common/preprocessing/CMakeLists.txt | ||
235 | @@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) | ||
236 | |||
237 | if(BUILD_SHARED_LIBS) | ||
238 | install(TARGETS ${TARGET_NAME} | ||
239 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
240 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
241 | else() | ||
242 | ov_install_static_lib(${TARGET_NAME} core) | ||
243 | endif() | ||
244 | diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt | ||
245 | index cc64b94ca..5f0dcf20c 100644 | ||
246 | --- a/src/core/CMakeLists.txt | ||
247 | +++ b/src/core/CMakeLists.txt | ||
248 | @@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_ | ||
249 | #----------------------------------------------------------------------------------------------- | ||
250 | |||
251 | install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ | ||
252 | - DESTINATION "runtime/include" | ||
253 | + DESTINATION "include" | ||
254 | COMPONENT core_dev | ||
255 | FILES_MATCHING | ||
256 | PATTERN "*.hpp" | ||
257 | @@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
258 | |||
259 | install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake | ||
260 | ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
261 | - DESTINATION "runtime/cmake" | ||
262 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
263 | COMPONENT core_dev) | ||
264 | diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt | ||
265 | index ddd2fdcbc..f4ad1e623 100644 | ||
266 | --- a/src/inference/CMakeLists.txt | ||
267 | +++ b/src/inference/CMakeLists.txt | ||
268 | @@ -204,7 +204,7 @@ set_target_properties(${TARGET_NAME}_obj | ||
269 | |||
270 | openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api) | ||
271 | |||
272 | -install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include | ||
273 | +install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include | ||
274 | COMPONENT core_dev) | ||
275 | |||
276 | # Install static libraries for case BUILD_SHARED_LIBS=OFF | ||
277 | diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
278 | index 3993bd973..99287bad5 100644 | ||
279 | --- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
280 | +++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
281 | @@ -94,7 +94,7 @@ add_custom_command( | ||
282 | COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json) | ||
283 | |||
284 | install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json | ||
285 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
286 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
287 | COMPONENT gpu) | ||
288 | |||
289 | ov_install_static_lib(${TARGET_NAME} gpu) | ||
290 | diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
291 | index 5bba4235f..69c1470a7 100644 | ||
292 | --- a/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
293 | +++ b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
294 | @@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES) | ||
295 | VERBATIM) | ||
296 | |||
297 | install(FILES ${${var_name}} | ||
298 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
299 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
300 | COMPONENT myriad) | ||
301 | |||
302 | if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS) | ||
303 | diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
304 | index 12a2f15e4..893146294 100644 | ||
305 | --- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
306 | +++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
307 | @@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | ||
308 | # install | ||
309 | if (LINUX) | ||
310 | install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules | ||
311 | - DESTINATION runtime/3rdparty | ||
312 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
313 | COMPONENT myriad) | ||
314 | endif() | ||
315 | diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt | ||
316 | index c8638f7fd..ba30641c5 100644 | ||
317 | --- a/tools/CMakeLists.txt | ||
318 | +++ b/tools/CMakeLists.txt | ||
319 | @@ -20,7 +20,7 @@ endif() | ||
320 | ie_cpack_add_component(deployment_manager REQUIRED) | ||
321 | |||
322 | install(DIRECTORY deployment_manager | ||
323 | - DESTINATION tools | ||
324 | + DESTINATION share/openvino/tools | ||
325 | COMPONENT deployment_manager | ||
326 | USE_SOURCE_PERMISSIONS) | ||
327 | |||
328 | diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt | ||
329 | index d19eb5cc1..9fc929cbb 100644 | ||
330 | --- a/tools/compile_tool/CMakeLists.txt | ||
331 | +++ b/tools/compile_tool/CMakeLists.txt | ||
332 | @@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
333 | ie_cpack_add_component(core_tools DEPENDS core) | ||
334 | |||
335 | install(TARGETS compile_tool | ||
336 | - RUNTIME DESTINATION tools/compile_tool | ||
337 | + RUNTIME DESTINATION bin | ||
338 | COMPONENT core_tools) | ||
339 | |||
340 | -install(FILES README.md | ||
341 | - DESTINATION tools/compile_tool | ||
342 | - COMPONENT core_tools) | ||
343 | +#install(FILES README.md | ||
344 | +# DESTINATION tools/compile_tool | ||
345 | +# COMPONENT core_tools) | ||
346 | -- | ||
347 | 2.35.1 | ||
348 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch deleted file mode 100644 index 145f2585..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch +++ /dev/null | |||
@@ -1,326 +0,0 @@ | |||
1 | From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 11 Jun 2020 14:24:04 +0800 | ||
4 | Subject: [PATCH] cmake installation fixes | ||
5 | |||
6 | Make sure that libraries/samples/binaries are installed correctly. | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 15 -------- | ||
11 | .../IEDevScriptsConfig.cmake | 2 +- | ||
12 | cmake/developer_package/packaging.cmake | 8 +++-- | ||
13 | cmake/developer_package/plugins/plugins.cmake | 2 +- | ||
14 | .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ | ||
15 | inference-engine/samples/CMakeLists.txt | 4 ++- | ||
16 | .../common/format_reader/CMakeLists.txt | 4 ++- | ||
17 | .../src/inference_engine/CMakeLists.txt | 35 ++----------------- | ||
18 | .../src/preprocessing/CMakeLists.txt | 2 +- | ||
19 | .../src/readers/ir_reader/CMakeLists.txt | 2 +- | ||
20 | .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- | ||
21 | .../tests/unit/cpu/CMakeLists.txt | 2 ++ | ||
22 | .../unit/inference_engine/CMakeLists.txt | 2 ++ | ||
23 | .../tests/unit/vpu/CMakeLists.txt | 2 ++ | ||
24 | .../tools/compile_tool/CMakeLists.txt | 2 +- | ||
25 | ngraph/CMakeLists.txt | 8 ++--- | ||
26 | 16 files changed, 32 insertions(+), 62 deletions(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index e0706a72e8..7920de9a42 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" | ||
33 | |||
34 | # install setupvars | ||
35 | |||
36 | -ie_cpack_add_component(setupvars REQUIRED) | ||
37 | - | ||
38 | if(UNIX) | ||
39 | - install(PROGRAMS scripts/setupvars/setupvars.sh | ||
40 | - DESTINATION bin | ||
41 | - COMPONENT setupvars) | ||
42 | elseif(WIN32) | ||
43 | install(PROGRAMS scripts/setupvars/setupvars.bat | ||
44 | DESTINATION bin | ||
45 | @@ -195,22 +190,12 @@ endif() | ||
46 | # install install_dependencies | ||
47 | |||
48 | if(UNIX) | ||
49 | - ie_cpack_add_component(install_dependencies REQUIRED) | ||
50 | - install(DIRECTORY scripts/install_dependencies/ | ||
51 | - DESTINATION install_dependencies | ||
52 | - COMPONENT install_dependencies) | ||
53 | endif() | ||
54 | |||
55 | # install files for demo | ||
56 | |||
57 | -ie_cpack_add_component(demo_scripts DEPENDS core) | ||
58 | |||
59 | if(UNIX) | ||
60 | - install(DIRECTORY scripts/demo/ | ||
61 | - DESTINATION deployment_tools/demo | ||
62 | - COMPONENT demo_scripts | ||
63 | - USE_SOURCE_PERMISSIONS | ||
64 | - PATTERN *.bat EXCLUDE) | ||
65 | elseif(WIN32) | ||
66 | install(DIRECTORY scripts/demo/ | ||
67 | DESTINATION deployment_tools/demo | ||
68 | diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake | ||
69 | index 0e1fe76db2..97867a24f8 100644 | ||
70 | --- a/cmake/developer_package/IEDevScriptsConfig.cmake | ||
71 | +++ b/cmake/developer_package/IEDevScriptsConfig.cmake | ||
72 | @@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) | ||
73 | if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) | ||
74 | message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") | ||
75 | endif() | ||
76 | - set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) | ||
77 | + set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) | ||
78 | endif() | ||
79 | |||
80 | # Enable postfixes for Debug/Release builds | ||
81 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
82 | index 2b5e945b17..adc4bef0bc 100644 | ||
83 | --- a/cmake/developer_package/packaging.cmake | ||
84 | +++ b/cmake/developer_package/packaging.cmake | ||
85 | @@ -5,7 +5,9 @@ | ||
86 | include(CPackComponent) | ||
87 | unset(IE_CPACK_COMPONENTS_ALL CACHE) | ||
88 | |||
89 | -set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
90 | +if (NOT DEFINED IE_CPACK_IE_DIR) | ||
91 | + set(IE_CPACK_IE_DIR deployment_tools/inference_engine) | ||
92 | +endif() | ||
93 | |||
94 | # | ||
95 | # ie_cpack_set_library_dir() | ||
96 | @@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) | ||
97 | set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${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) | ||
99 | else() | ||
100 | - set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
101 | - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
102 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
103 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
104 | set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
105 | endif() | ||
106 | endfunction() | ||
107 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | ||
108 | index aae1dbb7fb..e6dac2a478 100644 | ||
109 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
110 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
111 | @@ -124,7 +124,7 @@ function(ie_add_plugin) | ||
112 | |||
113 | install(TARGETS ${IE_PLUGIN_NAME} | ||
114 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} | ||
115 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) | ||
116 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) | ||
117 | endif() | ||
118 | endfunction() | ||
119 | |||
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 | ||
121 | index 45b2b3e9ed..55f7dfd214 100644 | ||
122 | --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt | ||
123 | +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt | ||
124 | @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) | ||
125 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) | ||
126 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) | ||
127 | endif() | ||
128 | + | ||
129 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
130 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | ||
131 | index ae93857944..fba24c6fed 100644 | ||
132 | --- a/inference-engine/samples/CMakeLists.txt | ||
133 | +++ b/inference-engine/samples/CMakeLists.txt | ||
134 | @@ -33,7 +33,7 @@ endif() | ||
135 | |||
136 | if(IE_MAIN_SOURCE_DIR) | ||
137 | # in case if samples are built from IE repo | ||
138 | - set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) | ||
139 | + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) | ||
140 | # hint for find_package(InferenceEngine in the samples folder) | ||
141 | set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") | ||
142 | # hint for find_package(ngraph in the samples folder) | ||
143 | @@ -256,6 +256,8 @@ macro(ie_add_sample) | ||
144 | if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) | ||
145 | add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) | ||
146 | endif() | ||
147 | + | ||
148 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
149 | endmacro() | ||
150 | |||
151 | # collect all samples subdirectories | ||
152 | diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
153 | index d75061e56c..a2f8bd6397 100644 | ||
154 | --- a/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
155 | +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt | ||
156 | @@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} | ||
157 | |||
158 | if(COMMAND add_clang_format_target) | ||
159 | add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) | ||
160 | -endif() | ||
161 | \ No newline at end of file | ||
162 | +endif() | ||
163 | + | ||
164 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
165 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
166 | index 5d044e097c..103c187913 100644 | ||
167 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
168 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
169 | @@ -227,35 +227,6 @@ list(APPEND core_components ngraph) | ||
170 | list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" | ||
171 | "IE_PARALLEL_CMAKE") | ||
172 | |||
173 | -if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) | ||
174 | - ie_cpack_add_component(tbb REQUIRED) | ||
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 | |||
208 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
209 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
210 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
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) | ||
230 | diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt | ||
231 | index f9548339d1..2670a04b60 100644 | ||
232 | --- a/inference-engine/src/preprocessing/CMakeLists.txt | ||
233 | +++ b/inference-engine/src/preprocessing/CMakeLists.txt | ||
234 | @@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) | ||
235 | |||
236 | install(TARGETS ${TARGET_NAME} | ||
237 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
238 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
239 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
240 | diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
241 | index 6d2bd39f3c..0722702055 100644 | ||
242 | --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
243 | +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt | ||
244 | @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
245 | |||
246 | install(TARGETS ${TARGET_NAME} | ||
247 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
248 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
249 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
250 | diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
251 | index a3e0182ed9..1b0e241485 100644 | ||
252 | --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
253 | +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt | ||
254 | @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | ||
255 | # install | ||
256 | if (LINUX) | ||
257 | install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules | ||
258 | - DESTINATION ${IE_CPACK_IE_DIR}/external | ||
259 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
260 | COMPONENT myriad) | ||
261 | endif() | ||
262 | diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
263 | index dfa8ce9d3f..88e7fbf67f 100644 | ||
264 | --- a/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
265 | +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt | ||
266 | @@ -25,3 +25,5 @@ addIeTargetTest( | ||
267 | ie_faster_build(${TARGET_NAME} | ||
268 | UNITY | ||
269 | ) | ||
270 | + | ||
271 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
272 | diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
273 | index 5c38c77b9b..927f93484f 100644 | ||
274 | --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
275 | +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt | ||
276 | @@ -26,3 +26,5 @@ addIeTargetTest( | ||
277 | LABELS | ||
278 | IE | ||
279 | ) | ||
280 | + | ||
281 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
282 | diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
283 | index fcb9f567bb..d4ac1952b8 100644 | ||
284 | --- a/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
285 | +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt | ||
286 | @@ -33,3 +33,5 @@ addIeTargetTest( | ||
287 | VPU | ||
288 | MYRIAD | ||
289 | ) | ||
290 | + | ||
291 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
292 | diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
293 | index 6e6f384289..a76ba55e64 100644 | ||
294 | --- a/inference-engine/tools/compile_tool/CMakeLists.txt | ||
295 | +++ b/inference-engine/tools/compile_tool/CMakeLists.txt | ||
296 | @@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
297 | ie_cpack_add_component(core_tools DEPENDS core) | ||
298 | |||
299 | install(TARGETS compile_tool | ||
300 | - RUNTIME DESTINATION deployment_tools/tools/compile_tool | ||
301 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
302 | COMPONENT core_tools) | ||
303 | |||
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... | ||
324 | -- | ||
325 | 2.32.0 | ||
326 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb deleted file mode 100644 index 14a3c8ee..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb +++ /dev/null | |||
@@ -1,132 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2021/4;lfs=0 \ | ||
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \ | ||
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \ | ||
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;branch=master \ | ||
12 | git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11;branch=master \ | ||
13 | file://0001-inference-engine-use-system-installed-packages.patch \ | ||
14 | file://0002-Disable-Werror.patch \ | ||
15 | file://0003-inference-engine-installation-fixes.patch \ | ||
16 | file://0001-dont-install-licenses-and-version-file.patch \ | ||
17 | " | ||
18 | |||
19 | SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8" | ||
20 | SRCREV_mkl = "60f41b3a9988ce7b1bc85c4f1ce7f9443bc91c9d" | ||
21 | SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" | ||
22 | SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" | ||
23 | |||
24 | SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf" | ||
25 | SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5" | ||
26 | |||
27 | LICENSE = "Apache-2.0 & ISSL & MIT" | ||
28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
29 | file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \ | ||
30 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | ||
31 | file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
32 | " | ||
33 | LICENSE:${PN}-vpu-firmware = "ISSL" | ||
34 | |||
35 | inherit cmake python3native | ||
36 | |||
37 | S = "${WORKDIR}/git" | ||
38 | |||
39 | EXTRA_OECMAKE += " \ | ||
40 | -DENABLE_OPENCV=0 \ | ||
41 | -DENABLE_PLUGIN_RPATH=0 \ | ||
42 | -DENABLE_GNA=0 \ | ||
43 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
44 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
45 | -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \ | ||
46 | -DENABLE_SAMPLES=1 \ | ||
47 | -DIE_CPACK_IE_DIR=${prefix} \ | ||
48 | -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ | ||
49 | -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ | ||
50 | -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ | ||
51 | -DNGRAPH_JSON_ENABLE=FALSE \ | ||
52 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
53 | -DENABLE_SPEECH_DEMO=FALSE \ | ||
54 | -DENABLE_DATA=FALSE \ | ||
55 | -DUSE_SYSTEM_PUGIXML=TRUE \ | ||
56 | " | ||
57 | |||
58 | DEPENDS += "libusb1 \ | ||
59 | ade \ | ||
60 | opencv \ | ||
61 | pugixml \ | ||
62 | protobuf-native \ | ||
63 | tbb \ | ||
64 | zlib \ | ||
65 | " | ||
66 | |||
67 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
68 | COMPATIBLE_HOST:libc-musl = "null" | ||
69 | |||
70 | #Disable opencl temporarily. intel-compute-runtime depends on | ||
71 | #intel-graphics-compiler and vc-intrinsics and these two recipes fail to | ||
72 | #compile with LLVM13. Enable it after upstream has fixed it. | ||
73 | #PACKAGECONFIG ?= "vpu opencl" | ||
74 | PACKAGECONFIG ?= "vpu" | ||
75 | PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime" | ||
76 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython" | ||
77 | PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" | ||
78 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
79 | |||
80 | do_install:append() { | ||
81 | if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then | ||
82 | install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ | ||
83 | install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ | ||
84 | fi | ||
85 | |||
86 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
87 | install -d ${D}${datadir}/inference_engine | ||
88 | mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ | ||
89 | |||
90 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
91 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
92 | mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
93 | mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ | ||
94 | |||
95 | rm -rf ${D}${prefix}/python | ||
96 | fi | ||
97 | |||
98 | rm -rf ${D}${prefix}/deployment_tools | ||
99 | |||
100 | # Remove the samples source directory. We install the built samples. | ||
101 | rm -rf ${D}/usr/samples | ||
102 | } | ||
103 | |||
104 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
105 | # instead of RSS | ||
106 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
107 | |||
108 | FILES:${PN}-dev = "${includedir} \ | ||
109 | ${libdir}/cmake \ | ||
110 | " | ||
111 | |||
112 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ | ||
113 | ${datadir}/openvino \ | ||
114 | ${libdir}/custom_kernels \ | ||
115 | ${libdir}/plugins.xml \ | ||
116 | ${libdir}/cache.json \ | ||
117 | " | ||
118 | |||
119 | # Move inference engine samples into a separate package | ||
120 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | ||
121 | |||
122 | FILES:${PN}-samples = "${datadir}/inference_engine \ | ||
123 | ${bindir} \ | ||
124 | " | ||
125 | FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" | ||
126 | |||
127 | # Package for inference engine python API | ||
128 | PACKAGES =+ "${PN}-${PYTHON_PN}" | ||
129 | |||
130 | FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" | ||
131 | |||
132 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb new file mode 100644 index 00000000..e01960ac --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb | |||
@@ -0,0 +1,141 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \ | ||
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \ | ||
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \ | ||
10 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ | ||
11 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \ | ||
12 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ | ||
13 | git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \ | ||
14 | git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \ | ||
15 | git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \ | ||
16 | git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=master \ | ||
17 | git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \ | ||
18 | file://0001-inference-engine-use-system-installed-packages.patch \ | ||
19 | file://0002-inference-engine-installation-fixes.patch \ | ||
20 | " | ||
21 | |||
22 | SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e" | ||
23 | SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8" | ||
24 | SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6" | ||
25 | SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" | ||
26 | SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b" | ||
27 | SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea" | ||
28 | SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c" | ||
29 | SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1" | ||
30 | SRCREV_omz = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1" | ||
31 | |||
32 | SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf" | ||
33 | SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5" | ||
34 | |||
35 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" | ||
36 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
37 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | ||
38 | file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ | ||
39 | file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ | ||
40 | file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \ | ||
41 | file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \ | ||
42 | file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
43 | file://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ | ||
44 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ | ||
45 | file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \ | ||
46 | " | ||
47 | |||
48 | inherit cmake python3native | ||
49 | |||
50 | S = "${WORKDIR}/git" | ||
51 | EXTRA_OECMAKE += " \ | ||
52 | -DENABLE_OPENCV=OFF \ | ||
53 | -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \ | ||
54 | -DENABLE_PLUGIN_RPATH=0 \ | ||
55 | -DENABLE_INTEL_GNA=OFF \ | ||
56 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
57 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
58 | -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ | ||
59 | -DENABLE_SAMPLES=ON \ | ||
60 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
61 | -DENABLE_DATA=FALSE \ | ||
62 | -DENABLE_SYSTEM_PUGIXML=TRUE \ | ||
63 | -DENABLE_SYSTEM_PROTOBUF=TRUE \ | ||
64 | -DProtobuf_LIBRARIES=protobuf \ | ||
65 | -DProtobuf_LITE_LIBRARIES=protobuf-lite \ | ||
66 | -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \ | ||
67 | -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \ | ||
68 | -DENABLE_OV_ONNX_FRONTEND=FALSE \ | ||
69 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ | ||
70 | " | ||
71 | |||
72 | DEPENDS += "libusb1 \ | ||
73 | ade \ | ||
74 | opencv \ | ||
75 | pugixml \ | ||
76 | protobuf \ | ||
77 | protobuf-native \ | ||
78 | tbb \ | ||
79 | zlib \ | ||
80 | " | ||
81 | |||
82 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
83 | COMPATIBLE_HOST:libc-musl = "null" | ||
84 | |||
85 | #Disable opencl temporarily. intel-compute-runtime depends on | ||
86 | #intel-graphics-compiler and vc-intrinsics and these two recipes fail to | ||
87 | #compile with LLVM13. Enable it after upstream has fixed it. | ||
88 | #PACKAGECONFIG ?= "vpu opencl" | ||
89 | PACKAGECONFIG ?= "vpu" | ||
90 | PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva," | ||
91 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython" | ||
92 | PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware" | ||
93 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
94 | |||
95 | do_install:append() { | ||
96 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
97 | install -d ${D}${datadir}/openvino | ||
98 | mv ${D}/usr/samples/python ${D}${datadir}/openvino/ | ||
99 | |||
100 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
101 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
102 | mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
103 | |||
104 | rm -rf ${D}${prefix}/python | ||
105 | fi | ||
106 | |||
107 | rm -rf ${D}${prefix}/deployment_tools | ||
108 | |||
109 | # Remove the samples source directory. We install the built samples. | ||
110 | rm -rf ${D}/usr/samples | ||
111 | } | ||
112 | |||
113 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
114 | # instead of RSS | ||
115 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
116 | |||
117 | FILES:${PN}-dev = "${includedir} \ | ||
118 | ${libdir}/cmake \ | ||
119 | " | ||
120 | |||
121 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ | ||
122 | ${datadir}/openvino \ | ||
123 | ${libdir}/custom_kernels \ | ||
124 | ${libdir}/plugins.xml \ | ||
125 | ${libdir}/cache.json \ | ||
126 | " | ||
127 | |||
128 | # Move inference engine samples into a separate package | ||
129 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | ||
130 | |||
131 | FILES:${PN}-samples = "${datadir}/openvino \ | ||
132 | ${bindir} \ | ||
133 | " | ||
134 | FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" | ||
135 | |||
136 | # Package for inference engine python API | ||
137 | PACKAGES =+ "${PN}-${PYTHON_PN}" | ||
138 | |||
139 | FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" | ||
140 | |||
141 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | ||