From 023266fcbf67e4c8fc7c4f6b951948384ba8282b Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Fri, 21 Oct 2022 17:03:54 +0800 Subject: openvino-inference-engine : upgrade 2022.1.1 -> 2022.2.0 - Change gflag to shared as we are not building with static library. - We are using zlib from yocto recipe, so don't add zlib as third party package - Third party package mkl-dnn name changed to onednn upstream in openvino repo so changed the name accordingly in openvino-inference-engine recipe - Refresh patches Release Notes: https://github.com/openvinotoolkit/openvino/releases/tag/2022.2.0 Signed-off-by: Yogesh Tyagi Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- ...ix-installation-of-binaries-and-libraries.patch | 348 +++++++++++++++++++++ 1 file changed, 348 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch new file mode 100644 index 00000000..12c8054e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch @@ -0,0 +1,348 @@ +From 3d55027cd86db299faeed0a4a97ddcec1baedd61 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Mon, 11 Apr 2022 11:11:23 +0800 +Subject: [PATCH 2/2] Fix installation of binaries and libraries + +Make sure binaries are installed correctly. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal +--- + CMakeLists.txt | 2 +- + cmake/developer_package/frontends/frontends.cmake | 2 +- + cmake/developer_package/packaging.cmake | 4 ++-- + cmake/developer_package/plugins/plugins.cmake | 2 +- + docs/CMakeLists.txt | 3 ++- + samples/CMakeLists.txt | 2 +- + samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++ + samples/cpp/CMakeLists.txt | 2 ++ + scripts/CMakeLists.txt | 10 +++++----- + src/bindings/c/src/CMakeLists.txt | 4 ++-- + src/cmake/openvino.cmake | 12 ++++++------ + src/common/preprocessing/CMakeLists.txt | 2 +- + src/core/CMakeLists.txt | 4 ++-- + src/inference/CMakeLists.txt | 2 +- + .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +- + src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +- + .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +- + tools/CMakeLists.txt | 2 +- + tools/compile_tool/CMakeLists.txt | 8 ++++---- + 19 files changed, 37 insertions(+), 32 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f570d4246c..d20ac60749 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,7 +111,7 @@ include(cmake/extra_modules.cmake) + add_subdirectory(docs) + add_subdirectory(tools) + add_subdirectory(scripts) +-add_subdirectory(licensing) ++#add_subdirectory(licensing) + + # + # CPack +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index 0779ed286d..f80cb9bb79 100644 +--- a/cmake/developer_package/frontends/frontends.cmake ++++ b/cmake/developer_package/frontends/frontends.cmake +@@ -2,7 +2,7 @@ + # SPDX-License-Identifier: Apache-2.0 + # + +-set(FRONTEND_INSTALL_INCLUDE "runtime/include/") ++set(FRONTEND_INSTALL_INCLUDE "include/") + set(FRONTEND_NAME_PREFIX "openvino_") + set(FRONTEND_NAME_SUFFIX "_frontend") + +diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake +index 458ddade93..626eb6548a 100644 +--- a/cmake/developer_package/packaging.cmake ++++ b/cmake/developer_package/packaging.cmake +@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir) + set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$ PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$ PARENT_SCOPE) + else() +- set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) +- set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) ++ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) ++ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) + endif() + endfunction() +diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake +index b748ebddef..fe670e88bc 100644 +--- a/cmake/developer_package/plugins/plugins.cmake ++++ b/cmake/developer_package/plugins/plugins.cmake +@@ -139,7 +139,7 @@ function(ie_add_plugin) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${IE_PLUGIN_NAME} +- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} ++ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} + COMPONENT ${install_component}) + else() + ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 86b0e8652b..4f31d3cc4b 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER) + foreach(target openvino_template_plugin template_extension openvino_template_extension) + if(TARGET ${target}) + install(TARGETS ${target} +- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} ++ LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} + COMPONENT tests + EXCLUDE_FROM_ALL) ++ install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + endforeach() + endif() +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index 8101b5e328..6abe8c20ce 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -9,7 +9,7 @@ add_subdirectory(c) + if(TARGET format_reader) + install(TARGETS format_reader + RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL +- LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL) ++ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests) + endif() + + openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) +diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt +index 2755579a0f..4a5f5b424f 100644 +--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt ++++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt +@@ -34,3 +34,5 @@ install( + RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL + LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL + ) ++ ++install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 3628c8283a..186540940f 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -258,6 +258,8 @@ macro(ie_add_sample) + COMPONENT samples_bin + EXCLUDE_FROM_ALL) + ++ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) ++ + # create global target with all samples / demo apps + if(NOT TARGET ie_samples) + add_custom_target(ie_samples ALL) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 4e9f76638f..6d8df5f0a1 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -37,7 +37,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" + + # install setupvars + +-ie_cpack_add_component(setupvars REQUIRED) ++#ie_cpack_add_component(setupvars REQUIRED) + + if(UNIX) + set(_setupvars_file setupvars/setupvars.sh) +@@ -54,13 +54,13 @@ elseif(WIN32) + file(WRITE "${_setupvars_file}" "${_setupvars_content}") + endif() + endif() +-install(PROGRAMS "${_setupvars_file}" +- DESTINATION . +- COMPONENT setupvars) ++#install(PROGRAMS "${_setupvars_file}" ++# DESTINATION . ++# COMPONENT setupvars) + + # install install_dependencies + +-if(LINUX) ++if (FALSE) + ie_cpack_add_component(install_dependencies REQUIRED) + install(DIRECTORY install_dependencies/ + DESTINATION install_dependencies +diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt +index 9200d0bda1..b3636e0716 100644 +--- a/src/bindings/c/src/CMakeLists.txt ++++ b/src/bindings/c/src/CMakeLists.txt +@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets + RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c +- INCLUDES DESTINATION runtime/include/ie) ++ INCLUDES DESTINATION include/ie) + + install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ +- DESTINATION runtime/include/ie ++ DESTINATION include/ie + COMPONENT core_c_dev) +diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake +index 340896e3a8..9bda84fe51 100644 +--- a/src/cmake/openvino.cmake ++++ b/src/cmake/openvino.cmake +@@ -62,8 +62,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets + RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core + ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core +- INCLUDES DESTINATION runtime/include +- runtime/include/ie) ++ INCLUDES DESTINATION include ++ include/ie) + + # + # Add openvin::dev target +@@ -107,7 +107,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components}) + + if(BUILD_SHARED_LIBS) + install(FILES $/plugins.xml +- DESTINATION ${IE_CPACK_RUNTIME_PATH} ++ DESTINATION ${IE_CPACK_LIBRARY_PATH} + COMPONENT core) + + # for InferenceEngineUnitTest +@@ -126,7 +126,7 @@ endif() + install(EXPORT OpenVINOTargets + FILE OpenVINOTargets.cmake + NAMESPACE openvino:: +- DESTINATION runtime/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO + COMPONENT core_dev) + + set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include") +@@ -167,10 +167,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm + + install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" + "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" +- DESTINATION runtime/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine + COMPONENT core_dev) + + install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" + "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" +- DESTINATION runtime/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO + COMPONENT core_dev) +diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt +index e41e286c95..11aaffca6a 100644 +--- a/src/common/preprocessing/CMakeLists.txt ++++ b/src/common/preprocessing/CMakeLists.txt +@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${TARGET_NAME} +- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) ++ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + else() + ov_install_static_lib(${TARGET_NAME} core) + endif() +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 86b195ee1c..867121ee50 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -127,7 +127,7 @@ target_include_directories(ngraph INTERFACE $