Refresh patches and add zlib to DEPENDS. Also fetch pybind11 as it's needed by ngraph.
Release notes: https://software.intel.com/content/www/us/en/develop/articles/openvino-2021-4-lts-relnotes.html Signed-off-by: Anuj Mittal <[email protected]> --- ...gineConfig.cmake-set-the-right-paths.patch | 50 ---- ...nt-install-licenses-and-version-file.patch | 32 +-- ...engine-use-system-installed-packages.patch | 206 ++++++++++++++--- ...001-plugin_api-fix-build-with-gcc-11.patch | 36 --- ...Werror.patch => 0002-Disable-Werror.patch} | 25 +- ...-inference-engine-installation-fixes.patch | 215 ++++++++++++------ ...bb => openvino-inference-engine_2021.4.bb} | 21 +- 7 files changed, 360 insertions(+), 225 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{0002-cldNN-disable-Werror.patch => 0002-Disable-Werror.patch} (55%) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2021.3.bb => openvino-inference-engine_2021.4.bb} (88%) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch deleted file mode 100644 index 31a7f7ff..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 13a9e6fbe3e62720d088e750de73483f2b74a855 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Wed, 14 Jul 2021 00:55:31 +0800 -Subject: [PATCH] InferenceEngineConfig.cmake: set the right paths - -Make sure that the projects using cmake to locate the libraries -are able to do so. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <[email protected]> ---- - .../cmake/templates/InferenceEngineConfig.cmake.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -index 5ede817bbf..83d258834b 100644 ---- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -@@ -74,7 +74,7 @@ else() - ext_message(FATAL_ERROR "inference_engine root directory is not found") - endif() - -- find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include" NO_DEFAULT_PATH) -+ find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include") - - set(IE_LIB_DIR "${IE_ROOT_DIR}/lib/${_ARCH}") - set(IE_LIB_REL_DIR "${IE_LIB_DIR}/Release") -@@ -89,8 +89,8 @@ else() - find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) - find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) - else() -- find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) -- find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) -+ find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") -+ find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") - endif() - - find_package_handle_standard_args( InferenceEngine -@@ -163,6 +163,6 @@ else() - IE::inference_engine_c_api) - - set(IE_EXTERNAL_DIR "${IE_ROOT_DIR}/external") -- include("${IE_ROOT_DIR}/share/ie_parallel.cmake") -+ include("$ENV{PKG_CONFIG_SYSROOT_DIR}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/InferenceEngine/ie_parallel.cmake") - endif() - endif() --- -2.32.0 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch index 3130fb88..3c265652 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch @@ -1,4 +1,4 @@ -From c6fa6f32077ab554839d6e1e5b46d0778c17b8b1 Mon Sep 17 00:00:00 2001 +From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Tue, 9 Jun 2020 11:35:59 +0800 Subject: [PATCH] don't install licenses and version @@ -7,48 +7,50 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- - ngraph/CMakeLists.txt | 6 ++---- + ngraph/CMakeLists.txt | 8 ++------ ngraph/test/runtime/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+), 4 deletions(-) + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index 6163c01e4a..74c479c071 100644 +index a05ca3b15c..9bc507b4c7 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt -@@ -353,7 +353,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +@@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(EXPORT ngraphTargets FILE ngraphTargets.cmake NAMESPACE ngraph:: -- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake +- DESTINATION "deployment_tools/ngraph/cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph) + COMPONENT ngraph_dev) endif() -@@ -367,7 +367,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +@@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake -- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake +- DESTINATION "deployment_tools/ngraph/cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph) + COMPONENT ngraph_dev) endif() -@@ -386,5 +386,3 @@ add_subdirectory(test) +@@ -337,7 +337,3 @@ add_subdirectory(test) if (NGRAPH_PYTHON_BUILD_ENABLE) add_subdirectory(python) endif() - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION +- DESTINATION "deployment_tools/ngraph" +- COMPONENT ngraph) diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt -index 2943722acc..a2ccdd11de 100644 +index be84499ee0..f65357b751 100644 --- a/ngraph/test/runtime/CMakeLists.txt +++ b/ngraph/test/runtime/CMakeLists.txt -@@ -79,3 +79,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(interpreter) add_subdirectory(ie) + +install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) -- -2.30.2 +2.32.0 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch index 822ab1cc..b16135ee 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch @@ -1,26 +1,35 @@ -From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001 +From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Thu, 8 Apr 2021 14:19:51 +0800 Subject: [PATCH] inference-engine: use system installed packages -Use installed versions of ade, protobuf and tbb. +Use installed versions of ade, protobuf, zlib and tbb. -Upstream-Status: Pending +Don't fetch pybind11 at runtime and use the one that we have fetched while +running do_fetch. + +Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- - cmake/dependencies.cmake | 19 ----------- - inference-engine/CMakeLists.txt | 2 +- - inference-engine/cmake/dependencies.cmake | 34 ------------------- + cmake/dependencies.cmake | 19 -------- + inference-engine/CMakeLists.txt | 6 +-- + inference-engine/cmake/dependencies.cmake | 45 ------------------- inference-engine/cmake/ie_parallel.cmake | 2 +- - inference-engine/samples/CMakeLists.txt | 2 +- - .../common_test_utils/CMakeLists.txt | 4 +-- + .../templates/InferenceEngineConfig.cmake.in | 10 ----- + inference-engine/samples/CMakeLists.txt | 3 +- + .../src/inference_engine/CMakeLists.txt | 4 +- + .../common_test_utils/CMakeLists.txt | 4 +- .../unit_test_utils/CMakeLists.txt | 3 +- - inference-engine/thirdparty/CMakeLists.txt | 5 ++- - 8 files changed, 7 insertions(+), 64 deletions(-) + inference-engine/thirdparty/CMakeLists.txt | 5 +-- + ngraph/python/CMakeLists.txt | 12 +---- + tests/fuzz/src/CMakeLists.txt | 1 - + thirdparty/CMakeLists.txt | 1 - + thirdparty/cnpy/CMakeLists.txt | 4 +- + 14 files changed, 14 insertions(+), 105 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index aed7614734..f5baa6f86b 100644 +index 6cb15a077e..74d4ac4124 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") @@ -48,10 +57,10 @@ index aed7614734..f5baa6f86b 100644 - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") endif() diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 95c657222e..20cbd5000b 100644 +index 1ac7fd8bf6..0615873110 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt -@@ -20,7 +20,7 @@ function(ie_developer_export_targets) +@@ -18,7 +18,7 @@ function(ie_developer_export_targets) endfunction() function(ie_developer_export) @@ -59,12 +68,30 @@ index 95c657222e..20cbd5000b 100644 + set(all_dev_targets ie_libraries) foreach(component IN LISTS openvino_export_components) export(TARGETS ${${component}} NAMESPACE IE:: - APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") + APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") +@@ -142,7 +142,7 @@ endif() + # Developer package + # + +-openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils) ++openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) + + # for Template plugin + if(NGRAPH_INTERPRETER_ENABLE) +@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config) + configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" + "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" + INSTALL_DESTINATION share # not used +- PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR" ++ PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR" + NO_CHECK_REQUIRED_COMPONENTS_MACRO) + + configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index 6fdfc6f3cd..c07bf0f3c8 100644 +index b270c46f2d..5f85197a85 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake -@@ -138,40 +138,6 @@ endif () +@@ -81,51 +81,6 @@ endif () if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") reset_deps_cache(TBBROOT TBB_DIR) @@ -75,6 +102,11 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 - TARGET_PATH "${TEMP}/tbb" - ENVIRONMENT "TBBROOT" - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") +- RESOLVE_DEPENDENCY(TBBBIND_2_4 +- ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" +- TARGET_PATH "${TEMP}/tbbbind_2_4" +- ENVIRONMENT "TBBBIND_2_4_ROOT" +- SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well - RESOLVE_DEPENDENCY(TBB - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" @@ -85,7 +117,13 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 - RESOLVE_DEPENDENCY(TBB - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" - TARGET_PATH "${TEMP}/tbb" +- ENVIRONMENT "TBBROOT" - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") +- RESOLVE_DEPENDENCY(TBBBIND_2_4 +- ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" +- TARGET_PATH "${TEMP}/tbbbind_2_4" +- ENVIRONMENT "TBBBIND_2_4_ROOT" +- SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") - elseif(LINUX AND AARCH64) - RESOLVE_DEPENDENCY(TBB - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" @@ -106,23 +144,44 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index f8988aa105..42fedd10c5 100644 +index edf3d2f2b2..6579d0f7ea 100644 --- a/inference-engine/cmake/ie_parallel.cmake +++ b/inference-engine/cmake/ie_parallel.cmake -@@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME) - if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) - find_package(TBB COMPONENTS tbb tbbmalloc) - set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE) -- set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) -+ set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE) - set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE) - if (TBB_FOUND) - if (TBB_VERSION VERSION_LESS 2020) +@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) + find_dependency(TBB COMPONENTS tbb tbbmalloc) + endif() + set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) +- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) ++ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) + set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) + if (NOT TBB_FOUND) + ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ +diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in +index 261edbf3d7..bf217a789a 100644 +--- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in ++++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in +@@ -86,16 +86,6 @@ endfunction() + set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}") + + set(THREADING "@THREADING@") +-if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) +- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") +- _ie_find_dependency(TBB +- COMPONENTS tbb tbbmalloc +- CONFIG +- PATHS ${TBBROOT}/cmake +- ${_tbb_dir} +- NO_CMAKE_FIND_ROOT_PATH +- NO_DEFAULT_PATH) +-endif() + + set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") + _ie_find_dependency(ngraph diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index dfe9f2303d..6bc44019fe 100644 +index 7924c56779..ae93857944 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt -@@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") +@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) endfunction() @@ -130,9 +189,28 @@ index dfe9f2303d..6bc44019fe 100644 + #add_gflags() endif() - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") +- add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) + endif() + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") +diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt +index e8ed1a5c4c..2fcb0bed4a 100644 +--- a/inference-engine/src/inference_engine/CMakeLists.txt ++++ b/inference-engine/src/inference_engine/CMakeLists.txt +@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf + INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" + PATH_VARS ${PATH_VARS}) + +-set(IE_INCLUDE_DIR "include") +-set(IE_NGRAPH_DIR "../ngraph/cmake") ++set(IE_INCLUDE_DIR "../../include") ++set(IE_NGRAPH_DIR "ngraph") + set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") + set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") + 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 -index 6e09201f1e..2d2e3524a5 100644 +index 5e8643dc5d..031557efc3 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -43,7 +43,7 @@ function(add_gtest_libraries) @@ -154,7 +232,7 @@ index 6e09201f1e..2d2e3524a5 100644 set(TARGET_NAME commonTestUtils) 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 -index ab956218aa..233eb5ea46 100644 +index 7c1d89eabf..2fbd8fc324 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) @@ -168,7 +246,7 @@ index ab956218aa..233eb5ea46 100644 addIeTarget( NAME ${TARGET_NAME} diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index 9a6a9209f1..eda6a64161 100644 +index f028ebdd8a..9c5bd53466 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -62,14 +62,13 @@ else() @@ -188,6 +266,68 @@ index 9a6a9209f1..eda6a64161 100644 if (NOT USE_SYSTEM_PUGIXML) set_target_properties(pugixml PROPERTIES FOLDER thirdparty) +diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt +index 501bfffb4b..b45612c19c 100644 +--- a/ngraph/python/CMakeLists.txt ++++ b/ngraph/python/CMakeLists.txt +@@ -17,17 +17,7 @@ endif() + + include(FetchContent) + +-FetchContent_Declare( +- pybind11 +- GIT_REPOSITORY "https://github.com/pybind/pybind11.git"; +- GIT_TAG "v2.5.0" +-) +- +-FetchContent_GetProperties(pybind11) +-if(NOT pybind11_POPULATED) +- FetchContent_Populate(pybind11) +- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) +-endif() ++add_subdirectory(pybind11) + + # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 + set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt +index b9400d9e7e..669938526c 100644 +--- a/tests/fuzz/src/CMakeLists.txt ++++ b/tests/fuzz/src/CMakeLists.txt +@@ -10,7 +10,6 @@ add_custom_target(fuzz) + FILE(GLOB tests "*-fuzzer.cc") + + add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) +-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) + + foreach(test_source ${tests}) + get_filename_component(test_name ${test_source} NAME_WE) +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 2c6b656408..4e86bd21ef 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -5,6 +5,5 @@ + add_subdirectory(ittapi) + add_subdirectory(itt_collector) + add_subdirectory(xbyak EXCLUDE_FROM_ALL) +-add_subdirectory(zlib EXCLUDE_FROM_ALL) + add_subdirectory(cnpy EXCLUDE_FROM_ALL) + openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) +diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt +index 5571cd5f78..e30604927a 100644 +--- a/thirdparty/cnpy/CMakeLists.txt ++++ b/thirdparty/cnpy/CMakeLists.txt +@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") + target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) + endif() + +-target_link_libraries(${TARGET_NAME} PUBLIC zlib) ++target_link_libraries(${TARGET_NAME} PUBLIC z) + target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/..") + +-set_target_properties(cnpy PROPERTIES FOLDER thirdparty) +\ No newline at end of file ++set_target_properties(cnpy PROPERTIES FOLDER thirdparty) -- -2.29.0 +2.32.0 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch deleted file mode 100644 index 4b83a948..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0ecaaf9098dc22b5503dfbce5cf629525e1dd237 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Fri, 7 May 2021 14:30:03 +0800 -Subject: [PATCH] plugin_api: fix build with gcc 11 - -Some C++ Standard Library headers have been changed in gcc 11 to no -longer include other headers that they do need to depend on. - -Include exception explicitly to avoid: - -| inference-engine/src/plugin_api/ie_system_conf.h:21:31: error: 'exception_ptr' in namespace 'std' does not name a type; did you mean 'exception'? -| 21 | INFERENCE_ENGINE_API_CPP(std::exception_ptr&) CurrentException(); -| | ^~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/5546] - -Signed-off-by: Anuj Mittal <[email protected]> ---- - inference-engine/src/plugin_api/ie_system_conf.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/inference-engine/src/plugin_api/ie_system_conf.h b/inference-engine/src/plugin_api/ie_system_conf.h -index c0e4cbb8b..56d5fb488 100644 ---- a/inference-engine/src/plugin_api/ie_system_conf.h -+++ b/inference-engine/src/plugin_api/ie_system_conf.h -@@ -11,6 +11,7 @@ - - #include "ie_api.h" - #include <vector> -+#include <exception> - - namespace InferenceEngine { - --- -2.30.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch similarity index 55% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch index a4e58b8e..5e7cfb38 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch @@ -1,7 +1,7 @@ -From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001 +From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Wed, 10 Jun 2020 09:45:48 +0800 -Subject: [PATCH 2/5] cldNN: disable Werror +Subject: [PATCH] Disable Werror Don't treat warnings as errors. This just leads to failures every time we upgrade the compiler. @@ -11,13 +11,14 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) + ngraph/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index 4b444eca..8610b9b8 100644 +index d14da47860..08ed695c0d 100644 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") +@@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") MultiProcessorCompilation DeadCodeEliminate ExtensionsEnabled @@ -25,6 +26,18 @@ index 4b444eca..8610b9b8 100644 WarnLevel4 NoFastMath StackProtector +diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt +index a05ca3b15c..ae888c4cb2 100644 +--- a/ngraph/CMakeLists.txt ++++ b/ngraph/CMakeLists.txt +@@ -197,7 +197,6 @@ if (WIN32) + endif() + + if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") + endif() + + if(WIN32) -- -2.25.4 +2.32.0 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch index 631b1839..145f2585 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch @@ -1,4 +1,4 @@ -From 21453439cd6d89058710e868f05727502e556f99 Mon Sep 17 00:00:00 2001 +From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Thu, 11 Jun 2020 14:24:04 +0800 Subject: [PATCH] cmake installation fixes @@ -7,41 +7,34 @@ Make sure that libraries/samples/binaries are installed correctly. Signed-off-by: Anuj Mittal <[email protected]> --- - CMakeLists.txt | 15 --------------- - cmake/developer_package/IEDevScriptsConfig.cmake | 2 +- - cmake/developer_package/packaging.cmake | 8 +++++--- - cmake/developer_package/plugins/plugins.cmake | 2 +- - .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ - inference-engine/samples/CMakeLists.txt | 4 +++- - .../samples/common/format_reader/CMakeLists.txt | 2 ++ - .../src/inference_engine/CMakeLists.txt | 4 ++-- - inference-engine/src/preprocessing/CMakeLists.txt | 2 +- - .../src/readers/ir_reader/CMakeLists.txt | 2 +- - .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- - inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ - .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ - inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ - .../tools/compile_tool/CMakeLists.txt | 2 +- - 15 files changed, 26 insertions(+), 27 deletions(-) + CMakeLists.txt | 15 -------- + .../IEDevScriptsConfig.cmake | 2 +- + cmake/developer_package/packaging.cmake | 8 +++-- + cmake/developer_package/plugins/plugins.cmake | 2 +- + .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ + inference-engine/samples/CMakeLists.txt | 4 ++- + .../common/format_reader/CMakeLists.txt | 4 ++- + .../src/inference_engine/CMakeLists.txt | 35 ++----------------- + .../src/preprocessing/CMakeLists.txt | 2 +- + .../src/readers/ir_reader/CMakeLists.txt | 2 +- + .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- + .../tests/unit/cpu/CMakeLists.txt | 2 ++ + .../unit/inference_engine/CMakeLists.txt | 2 ++ + .../tests/unit/vpu/CMakeLists.txt | 2 ++ + .../tools/compile_tool/CMakeLists.txt | 2 +- + ngraph/CMakeLists.txt | 8 ++--- + 16 files changed, 32 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e72f2b61f1..2c22827e2d 100644 +index e0706a72e8..7920de9a42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -105,7 +105,6 @@ function(build_ngraph) - ie_cpack_add_component(ngraph) - - set(SDL_cmake_included ON) -- set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/") - add_subdirectory(ngraph) - set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) - set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE) -@@ -174,12 +173,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" +@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" # install setupvars -ie_cpack_add_component(setupvars REQUIRED) - +- if(UNIX) - install(PROGRAMS scripts/setupvars/setupvars.sh - DESTINATION bin @@ -49,7 +42,7 @@ index e72f2b61f1..2c22827e2d 100644 elseif(WIN32) install(PROGRAMS scripts/setupvars/setupvars.bat DESTINATION bin -@@ -189,22 +184,12 @@ endif() +@@ -195,22 +190,12 @@ endif() # install install_dependencies if(UNIX) @@ -61,7 +54,7 @@ index e72f2b61f1..2c22827e2d 100644 # install files for demo --ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) +-ie_cpack_add_component(demo_scripts DEPENDS core) if(UNIX) - install(DIRECTORY scripts/demo/ @@ -73,10 +66,10 @@ index e72f2b61f1..2c22827e2d 100644 install(DIRECTORY scripts/demo/ DESTINATION deployment_tools/demo diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake -index ed6971fd37..10817d3a75 100644 +index 0e1fe76db2..97867a24f8 100644 --- a/cmake/developer_package/IEDevScriptsConfig.cmake +++ b/cmake/developer_package/IEDevScriptsConfig.cmake -@@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT) +@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") endif() @@ -86,10 +79,10 @@ index ed6971fd37..10817d3a75 100644 # Enable postfixes for Debug/Release builds diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake -index b846bf732d..7a0022968c 100644 +index 2b5e945b17..adc4bef0bc 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake -@@ -4,7 +4,9 @@ +@@ -5,7 +5,9 @@ include(CPackComponent) unset(IE_CPACK_COMPONENTS_ALL CACHE) @@ -100,7 +93,7 @@ index b846bf732d..7a0022968c 100644 # # ie_cpack_set_library_dir() -@@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir) +@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) else() @@ -112,10 +105,10 @@ index b846bf732d..7a0022968c 100644 endif() endfunction() diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake -index a66d2568d9..c3aad14bab 100644 +index aae1dbb7fb..e6dac2a478 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake -@@ -106,7 +106,7 @@ function(ie_add_plugin) +@@ -124,7 +124,7 @@ function(ie_add_plugin) install(TARGETS ${IE_PLUGIN_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} @@ -124,18 +117,18 @@ index a66d2568d9..c3aad14bab 100644 endif() endfunction() -diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt -index aff7229c9f..f45a215f68 100644 ---- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt -+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt +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 +index 45b2b3e9ed..55f7dfd214 100644 +--- 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 @@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) - if(COMMAND add_cpplint_target) - add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) + add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) endif() + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 6bc44019fe..ca5ab34704 100644 +index ae93857944..fba24c6fed 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -33,7 +33,7 @@ endif() @@ -147,9 +140,9 @@ index 6bc44019fe..ca5ab34704 100644 # hint for find_package(InferenceEngine in the samples folder) set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") # hint for find_package(ngraph in the samples folder) -@@ -251,6 +251,8 @@ macro(ie_add_sample) - add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} - CUSTOM_FILTERS ${custom_filters}) +@@ -256,6 +256,8 @@ macro(ie_add_sample) + if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) + add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) endif() + + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) @@ -157,52 +150,105 @@ index 6bc44019fe..ca5ab34704 100644 # collect all samples subdirectories diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt -index c5c5449677..06ecab13b5 100644 +index d75061e56c..a2f8bd6397 100644 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" +@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} - set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} - FOLDER cpp_samples) + if(COMMAND add_clang_format_target) + add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) +-endif() +\ No newline at end of file ++endif() + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index 1ea3227631..aa64718940 100644 +index 5d044e097c..103c187913 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME} - install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" - "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" - "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" -- DESTINATION ${IE_CPACK_IE_DIR}/share -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine - COMPONENT core) +@@ -227,35 +227,6 @@ list(APPEND core_components ngraph) + list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" + "IE_PARALLEL_CMAKE") + +-if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) +- ie_cpack_add_component(tbb REQUIRED) +- list(APPEND core_components tbb) +- +- install(DIRECTORY "${TBB}/include" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- install(DIRECTORY "${TBB}/lib" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- if(EXISTS "${TBB}/bin") +- install(DIRECTORY "${TBB}/bin" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- endif() +- install(FILES "${TBB}/LICENSE" +- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb +- COMPONENT tbb) +- +- set(IE_TBB_DIR_INSTALL "external/tbb/cmake") +- set(IE_TBB_DIR "${TBB_DIR}") +- list(APPEND PATH_VARS "IE_TBB_DIR") +- +- install(FILES "${TBB}/cmake/TBBConfig.cmake" +- "${TBB}/cmake/TBBConfigVersion.cmake" +- DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} +- COMPONENT tbb) +-endif() +- + # Install Inference Engine + + ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) +@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml - DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core) + + # Install cmake scripts +@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml + install(EXPORT InferenceEngineTargets + FILE InferenceEngineTargets.cmake + NAMESPACE IE:: +- DESTINATION ${IE_CPACK_IE_DIR}/share ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine + COMPONENT core_dev) + + set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") +@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers + install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" + "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" + "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" +- DESTINATION ${IE_CPACK_IE_DIR}/share ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine + COMPONENT core_dev) diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt -index 973fafcbf5..81aea3471a 100644 +index f9548339d1..2670a04b60 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt -@@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) +@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) + install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt -index 7721b7df6d..bf6543efa8 100644 +index 6d2bd39f3c..0722702055 100644 --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -index d8a5f2ec1d..2db7ddea6f 100644 +index a3e0182ed9..1b0e241485 100644 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt @@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL @@ -214,7 +260,7 @@ index d8a5f2ec1d..2db7ddea6f 100644 COMPONENT myriad) endif() diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt -index c9a92b4857..2b4fcc4d01 100644 +index dfa8ce9d3f..88e7fbf67f 100644 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt @@ -25,3 +25,5 @@ addIeTargetTest( @@ -224,7 +270,7 @@ index c9a92b4857..2b4fcc4d01 100644 + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -index 1d9515f540..c81cb2ed79 100644 +index 5c38c77b9b..927f93484f 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt @@ -26,3 +26,5 @@ addIeTargetTest( @@ -234,28 +280,47 @@ index 1d9515f540..c81cb2ed79 100644 + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt -index 5be30a3092..6a01e280ae 100644 +index fcb9f567bb..d4ac1952b8 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -35,3 +35,5 @@ addIeTargetTest( +@@ -33,3 +33,5 @@ addIeTargetTest( VPU MYRIAD ) + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt -index 58614d3ced..9dfa068e4d 100644 +index 6e6f384289..a76ba55e64 100644 --- a/inference-engine/tools/compile_tool/CMakeLists.txt +++ b/inference-engine/tools/compile_tool/CMakeLists.txt -@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) - # install +@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + ie_cpack_add_component(core_tools DEPENDS core) install(TARGETS compile_tool - RUNTIME DESTINATION deployment_tools/tools/compile_tool + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT core) + COMPONENT core_tools) install(FILES README.md +diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt +index 830fb3eb36..3093596e4a 100644 +--- a/ngraph/CMakeLists.txt ++++ b/ngraph/CMakeLists.txt +@@ -183,10 +183,10 @@ endif() + message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") + + # Destinations +-set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") +-set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") +-set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") +-set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") ++set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") ++set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") ++set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") ++set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") + + #----------------------------------------------------------------------------------------------- + # Compile Flags for nGraph... -- -2.29.0 +2.32.0 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.bb similarity index 88% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.bb index 654cac13..2db256d8 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.bb @@ -4,25 +4,25 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ deep learning models through a high-level C++ Inference Engine API \ integrated with application logic." -SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/3;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1642.zip;name=usb_ma2x8x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1642.zip;name=pcie_ma2x8x \ +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/4;lfs=0 \ + https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1736.zip;name=usb_ma2x8x \ + https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1736.zip;name=pcie_ma2x8x \ git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak \ + git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11 \ file://0001-inference-engine-use-system-installed-packages.patch \ - file://0002-cldNN-disable-Werror.patch \ + file://0002-Disable-Werror.patch \ file://0003-inference-engine-installation-fixes.patch \ file://0001-dont-install-licenses-and-version-file.patch \ - file://0001-plugin_api-fix-build-with-gcc-11.patch \ - file://0001-InferenceEngineConfig.cmake-set-the-right-paths.patch \ " -SRCREV = "c5f7ad383e654dfb4a5ac0805323cf8d43426b3f" -SRCREV_mkl = "d35c3c11f9ff0f5090f9afe16af122cda501134c" +SRCREV = "5cee8bbf29797f4544b343e803de957e9f041f92" +SRCREV_mkl = "e0381c369fc3bed487b0dcfef7e9fcb2e0aea575" SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" +SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" -SRC_URI[usb_ma2x8x.sha256sum] = "d0f6aaaf71a595963e6013ef59045e20b07324f1a47deaa3f906419d39b2bd5a" -SRC_URI[pcie_ma2x8x.sha256sum] = "18d3cd10cf6cc36ff58001812d3d215c0bbb2de09a8832128592401c8f959358" +SRC_URI[usb_ma2x8x.sha256sum] = "28ed086ac52b964d9a1f5a54c017237d2d03ea39013e7910df678b176b9ce0c3" +SRC_URI[pcie_ma2x8x.sha256sum] = "c2268e700eb597329376cbe830eeb6504203d765a1bde4da917242ca535a7ab3" LICENSE = "Apache-2.0 & ISSL & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ @@ -61,6 +61,7 @@ DEPENDS += "libusb1 \ pugixml \ protobuf-native \ tbb \ + zlib \ " COMPATIBLE_HOST = '(x86_64).*-linux' -- 2.32.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7225): https://lists.yoctoproject.org/g/meta-intel/message/7225 Mute This Topic: https://lists.yoctoproject.org/mt/85164007/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
