For release notes, see: https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html
Refresh patches and use the now available option to build against system version of pugixml. Signed-off-by: Anuj Mittal <[email protected]> --- ...nt-install-licenses-and-version-file.patch | 32 ++- ...engine-use-system-installed-packages.patch | 200 +++++------------- ...-inference-engine-installation-fixes.patch | 80 ++++--- .../0005-cldnn-fix-inclusion-of-headers.patch | 18 +- ...bb => openvino-inference-engine_2021.2.bb} | 22 +- 5 files changed, 125 insertions(+), 227 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2021.1.bb => openvino-inference-engine_2021.2.bb} (81%) 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 88aab623..2a2c8b87 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 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001 +From a60710c910e6c995aef9dd36757bf040bf24acf5 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,15 +7,15 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- - ngraph/CMakeLists.txt | 13 ++----------- - ngraph/test/runtime/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+), 11 deletions(-) + ngraph/CMakeLists.txt | 6 ++---- + ngraph/test/runtime/CMakeLists.txt | 2 ++ + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index 4eb969f02..c52aec2ec 100644 +index 99f32a6181..b90aa382b9 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt -@@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +@@ -490,7 +490,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(EXPORT ngraphTargets FILE ngraphTargets.cmake NAMESPACE ngraph:: @@ -24,7 +24,7 @@ index 4eb969f02..c52aec2ec 100644 COMPONENT ngraph) configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in -@@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +@@ -503,7 +503,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake @@ -32,25 +32,23 @@ index 4eb969f02..c52aec2ec 100644 + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph COMPONENT ngraph) endif() + +@@ -518,5 +518,3 @@ add_subdirectory(test) + if (NGRAPH_PYTHON_BUILD_ENABLE) + add_subdirectory(python) + endif() - --install(DIRECTORY -- ${CMAKE_CURRENT_SOURCE_DIR}/licenses -- DESTINATION "${NGRAPH_COMPONENT_PREFIX}." -- COMPONENT ngraph --) -- --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph) diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt -index e37aba8b7..83ed2efbd 100644 +index d27ea8090c..17a3843f7d 100644 --- a/ngraph/test/runtime/CMakeLists.txt +++ b/ngraph/test/runtime/CMakeLists.txt -@@ -68,3 +68,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -80,3 +80,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.26.2 +2.29.2 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 bbf186df..1f64ce21 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,42 +1,39 @@ -From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 +From a8b6a2e251c42a393218174c6737208760d2e1c1 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Wed, 10 Jun 2020 09:43:55 +0800 Subject: [PATCH] inference-engine: use system installed packages -Use installed versions of pugixml, ade, protobuf and tbb. +Use installed versions of ade, protobuf and tbb. Upstream-Status: Pending Signed-off-by: Anuj Mittal <[email protected]> --- - cmake/dependencies.cmake | 17 -------------- + cmake/dependencies.cmake | 18 ------------------ inference-engine/CMakeLists.txt | 2 +- - inference-engine/cmake/ie_parallel.cmake | 7 +----- - .../src/inference_engine/CMakeLists.txt | 23 +------------------ - .../src/legacy_api/CMakeLists.txt | 3 +-- - .../src/vpu/graph_transformer/CMakeLists.txt | 1 - - .../common_test_utils/CMakeLists.txt | 7 ++---- + inference-engine/cmake/ie_parallel.cmake | 7 +------ + .../src/inference_engine/CMakeLists.txt | 19 ------------------- + .../common_test_utils/CMakeLists.txt | 4 +--- .../unit_test_utils/CMakeLists.txt | 3 +-- - .../tests_deprecated/helpers/CMakeLists.txt | 1 - - inference-engine/thirdparty/CMakeLists.txt | 14 +---------- - 10 files changed, 8 insertions(+), 70 deletions(-) + inference-engine/thirdparty/CMakeLists.txt | 5 ++--- + 7 files changed, 6 insertions(+), 52 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index 2a5a74db6..9cc9a6c94 100644 +index 6a44c8769e..a128eb63a1 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake -@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) - - set(protoc_version "3.7.1") - if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) -- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT -- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" -- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") -- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) - else() - message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") - endif() - +@@ -13,25 +13,7 @@ if(CMAKE_CROSSCOMPILING AND NGRAPH_ONNX_IMPORT_ENABLE) + + set(protoc_version "3.7.1") + if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux) +- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT +- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" +- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64") +- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) + else() + message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation") + endif() +- - reset_deps_cache(SYSTEM_PROTOC) - - message("${SYSTEM_PROTOC_ROOT}/bin") @@ -52,10 +49,10 @@ index 2a5a74db6..9cc9a6c94 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 7f45ab021..db85e8690 100644 +index a3e4f74c40..76b09683dd 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt -@@ -57,7 +57,7 @@ function(ie_developer_export) +@@ -56,7 +56,7 @@ function(ie_developer_export) APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") # Custom target to build only Inference Engine Developer Package targets @@ -65,10 +62,10 @@ index 7f45ab021..db85e8690 100644 endfunction() diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index 7fd77ccc0..143dcf669 100644 +index f8988aa105..28e79417f4 100644 --- a/inference-engine/cmake/ie_parallel.cmake +++ b/inference-engine/cmake/ie_parallel.cmake -@@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME) +@@ -67,13 +67,8 @@ function(set_ie_threading_interface_for TARGET_NAME) set(IE_THREAD_DEFINE "IE_THREAD_SEQ") if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") @@ -76,37 +73,19 @@ index 7fd77ccc0..143dcf669 100644 set(IE_THREAD_DEFINE "IE_THREAD_TBB") - ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS}) - else () -- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \ +- ext_message(WARNING "TBB was not found by the configured TBB_DIR path.\ - SEQ method will be used for ${TARGET_NAME}") - endif () -+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) ++ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc) elseif (THREADING STREQUAL "OMP") if (WIN32) set(omp_lib_name libiomp5md) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index 9ab888983..105e666a3 100644 +index f012a038a2..3bba22215e 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE - $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) - - target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) - - # Create object library -@@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT - - target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) - --target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) -+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) - - target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" - "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp -@@ -233,25 +231,6 @@ list(APPEND core_components ngraph) - if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") +@@ -216,25 +216,6 @@ list(APPEND core_components ngraph) + if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) ie_cpack_add_component(tbb REQUIRED) list(APPEND core_components tbb) - @@ -131,37 +110,11 @@ index 9ab888983..105e666a3 100644 endif() ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) -diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt -index ed87a073a..adc970a09 100644 ---- a/inference-engine/src/legacy_api/CMakeLists.txt -+++ b/inference-engine/src/legacy_api/CMakeLists.txt -@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE - ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl - $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> -- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES> -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>) -+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>) - - # Create shared library - -diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt -index a45437453..7a67a8226 100644 ---- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt -+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt -@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE) - - target_include_directories(${TARGET_NAME} - SYSTEM PUBLIC -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> - "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include") - 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 efead7271..732abee2d 100644 +index ca58264bd5..11df150845 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 -@@ -23,7 +23,7 @@ function(add_gtest_libraries) +@@ -26,7 +26,7 @@ function(add_gtest_libraries) PROPERTIES FOLDER thirdparty) endfunction() @@ -170,93 +123,50 @@ index efead7271..732abee2d 100644 if (MSVC) set(PUGI pugixml_mt) -@@ -32,10 +32,7 @@ else () - endif () - +@@ -37,8 +37,6 @@ endif () list(APPEND EXPORT_DEPENDENCIES -- ${PUGI} + ${PUGI} ${NGRAPH_LIBRARIES} - gtest - gtest_main ) set(TARGET_NAME commonTestUtils) -@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME) - PUBLIC - ${IE_TESTS_ROOT}/ie_test_utils - $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES> -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> - PRIVATE - $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> - ) -@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) - target_link_libraries(${ADD_TARGET_NAME} - PUBLIC - ${EXPORT_DEPENDENCIES} -+ pugixml - ) - endfunction() - 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 dbb0f4e5b..9586d651d 100644 +index 5413d13895..3f2803750f 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 -@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) +@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) + list(APPEND EXPORT_DEPENDENCIES commonTestUtils_s - inference_engine_s -- inference_engine_lp_transformations +- inference_engine_s - gmock) -+ inference_engine_lp_transformations) ++ inference_engine_s) addIeTarget( NAME ${TARGET_NAME} -diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt -index 2bc668965..e44ab9d5d 100644 ---- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt -+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt -@@ -22,7 +22,6 @@ function(add_helpers target_name) - target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - "${IE_MAIN_SOURCE_DIR}/src/inference_engine" - $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES> -- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES> - "${IE_MAIN_SOURCE_DIR}/src/vpu/" - PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") - diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index a2550bfaa..0eb616415 100644 +index fa2a4d02d8..67d3b7ad05 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -51,28 +51,16 @@ function(build_with_lto) - function(ie_build_pugixml) - set(BUILD_TESTS_current ${BUILD_TESTS}) - set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) -- add_subdirectory(pugixml) - set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) - endfunction() +@@ -62,14 +62,13 @@ else() + endif() - ie_build_pugixml() - add_subdirectory(stb_lib) -- add_subdirectory(ade) - add_subdirectory(fluid/modules/gapi) + add_subdirectory(stb_lib) +-add_subdirectory(ade) + add_subdirectory(fluid/modules/gapi) -- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") -- -- set_target_properties(pugixml ade fluid stb_image -+ set_target_properties(fluid stb_image - PROPERTIES FOLDER thirdparty) +-set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty) ++set_target_properties(fluid stb_image PROPERTIES FOLDER thirdparty) -- # developer package -- -- ie_developer_export_targets(ade fluid pugixml) -- if(TARGET pugixml_mt) -- ie_developer_export_targets(pugixml_mt) -- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty) -- endif() -- - if(ENABLE_MKL_DNN) - set(SDL_cmake_included ON) - include(mkldnn.cmake) + # developer package + +-ie_developer_export_targets(ade fluid) ++ie_developer_export_targets(fluid) + + if (NOT USE_SYSTEM_PUGIXML) + set_target_properties(pugixml PROPERTIES FOLDER thirdparty) -- -2.26.2 +2.29.2 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 9c91ac4d..52049eb0 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 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001 +From cb9a755218ff033c8c42e9dc46a845310a3331fa 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 @@ -14,17 +14,17 @@ Signed-off-by: Anuj Mittal <[email protected]> .../samples/common/format_reader/CMakeLists.txt | 2 ++ .../src/inference_engine/CMakeLists.txt | 4 ++-- .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- - inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- + inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ - inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- + inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- - 11 files changed, 25 insertions(+), 30 deletions(-) + 11 files changed, 23 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 18ed02ee5..18f6094f3 100644 +index 5c3585a3e9..2b8c99f862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -143,12 +143,8 @@ add_subdirectory(docs) +@@ -176,12 +176,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" # install setupvars @@ -37,7 +37,7 @@ index 18ed02ee5..18f6094f3 100644 elseif(WIN32) install(PROGRAMS scripts/setupvars/setupvars.bat DESTINATION bin -@@ -158,22 +154,12 @@ endif() +@@ -191,22 +187,12 @@ endif() # install install_dependencies if(UNIX) @@ -61,10 +61,10 @@ index 18ed02ee5..18f6094f3 100644 install(DIRECTORY scripts/demo/ DESTINATION deployment_tools/demo diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake -index 86137c384..af011c361 100644 +index cda7afd294..ec51636e96 100644 --- a/cmake/developer_package.cmake +++ b/cmake/developer_package.cmake -@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH +@@ -29,7 +29,9 @@ list(APPEND CMAKE_MODULE_PATH include(CPackComponent) unset(IE_CPACK_COMPONENTS_ALL CACHE) @@ -75,18 +75,18 @@ index 86137c384..af011c361 100644 # Search packages for the host system instead of packages for the target system # in case of cross compilation these macros should be defined by the toolchain file -@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir) - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) +@@ -55,8 +57,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() -- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) -- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) +- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) +- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/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 ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) ++ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) endif() endfunction() -@@ -147,7 +149,7 @@ endif() +@@ -151,7 +153,7 @@ endif() # allow to override default OUTPUT_ROOT root if(NOT DEFINED OUTPUT_ROOT) @@ -96,7 +96,7 @@ index 86137c384..af011c361 100644 # Enable postfixes for Debug/Release builds 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 b8d5ddf62..d086478f6 100644 +index b8d5ddf622..d086478f6d 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 @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) @@ -106,7 +106,7 @@ index b8d5ddf62..d086478f6 100644 + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 4dda7eecd..04e1b9c3e 100644 +index 236c17e6af..22f410d1fd 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -34,7 +34,7 @@ endif() @@ -118,7 +118,7 @@ index 4dda7eecd..04e1b9c3e 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) -@@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1) +@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) set (INTTYPES_FORMAT C99) set (BUILD_TESTING OFF) @@ -130,7 +130,7 @@ index 4dda7eecd..04e1b9c3e 100644 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") endif() -@@ -250,6 +245,8 @@ macro(ie_add_sample) +@@ -245,6 +240,8 @@ macro(ie_add_sample) add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} CUSTOM_FILTERS ${custom_filters}) endif() @@ -140,7 +140,7 @@ index 4dda7eecd..04e1b9c3e 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 48dbed9f2..76532fd04 100644 +index 48dbed9f2b..76532fd047 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}" @@ -150,10 +150,10 @@ index 48dbed9f2..76532fd04 100644 + +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 105e666a3..5c2f70575 100644 +index 3bba22215e..b6f6b7b203 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME} +@@ -229,8 +229,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" @@ -165,10 +165,10 @@ index 105e666a3..5c2f70575 100644 + DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core) diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -index aeebe4e04..310eb6231 100644 +index 889f2e6e66..67de9c3a32 100644 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME} +@@ -50,5 +50,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL # install install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules @@ -176,20 +176,17 @@ index aeebe4e04..310eb6231 100644 + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d COMPONENT myriad) diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt -index d7acf8908..be4ae4a76 100644 +index c9a92b4857..2b4fcc4d01 100644 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt -@@ -24,4 +24,6 @@ addIeTargetTest( - ADD_CPPLINT - LABELS - CPU --) -\ No newline at end of file -+) +@@ -25,3 +25,5 @@ addIeTargetTest( + ie_faster_build(${TARGET_NAME} + UNITY + ) + +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 e4613f032..5fe9e7089 100644 +index 76cc67cca1..04ff11cc05 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt @@ -26,3 +26,5 @@ addIeTargetTest( @@ -199,20 +196,17 @@ index e4613f032..5fe9e7089 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 a4106753d..091339e17 100644 +index 215562f2af..215ec9f4fb 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -27,4 +27,6 @@ addIeTargetTest( - LABELS +@@ -35,3 +35,5 @@ addIeTargetTest( VPU MYRIAD --) -\ No newline at end of file -+) + ) + +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 58614d3ce..9dfa068e4 100644 +index 58614d3ced..9dfa068e4d 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}) @@ -225,5 +219,5 @@ index 58614d3ce..9dfa068e4 100644 install(FILES README.md -- -2.26.2 +2.29.2 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch index ad4d8e8a..d4819077 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch @@ -1,4 +1,4 @@ -From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001 +From aa515686548d74a68456b9ba7a295b6ae4be343a Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Wed, 10 Jun 2020 09:50:19 +0800 Subject: [PATCH] cldnn: fix inclusion of headers @@ -6,6 +6,7 @@ Subject: [PATCH] cldnn: fix inclusion of headers Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> + --- inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +- inference-engine/src/cldnn_engine/CMakeLists.txt | 1 + @@ -13,30 +14,30 @@ Signed-off-by: Anuj Mittal <[email protected]> 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp -index 282dcd844..0d5d4084c 100644 +index 68ccf3217..c5b0ce6be 100644 --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp -@@ -22,7 +22,7 @@ +@@ -39,7 +39,7 @@ # pragma GCC system_header #endif -#include <CL/cl2.hpp> +#include <cl2.hpp> - #if defined __GNUC__ + #ifdef __GNUC__ # pragma GCC diagnostic pop diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt -index cdc0de406..70883465b 100644 +index 7e15abbed..46d43e0e5 100644 --- a/inference-engine/src/cldnn_engine/CMakeLists.txt +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt -@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE +@@ -31,6 +31,7 @@ target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES> ${CLDNN__IOCL_ICD_INCDIRS} + ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp ${CLDNN_TOP_FOLDER}) - # install + set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp index 97608c30a..3a04096c0 100644 --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp @@ -50,6 +51,3 @@ index 97608c30a..3a04096c0 100644 #include "cl_intel_usm_defs.h" #include <memory> --- -2.26.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb similarity index 81% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb index a2cc2467..568072d7 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.2.bb @@ -4,10 +4,9 @@ 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/1;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1381.zip;name=ma2450 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1381.zip;name=ma248x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1381.zip;name=ma2x8x \ +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2021/2;lfs=0 \ + https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1522.zip;name=usb_ma2x8x \ + https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1522.zip;name=pcie_ma2x8x \ git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ file://0001-inference-engine-use-system-installed-packages.patch \ file://0002-cldNN-disable-Werror.patch \ @@ -16,12 +15,11 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=git;branch=rel file://0001-dont-install-licenses-and-version-file.patch \ " -SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c" -SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51" +SRCREV = "4795391b73381660b69b4cd3986c7a0bf902e868" +SRCREV_mkl = "5ef085d5af65e8966e03cdfcbaa65761d61a5c9a" -SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745" -SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204" -SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a" +SRC_URI[usb_ma2x8x.sha256sum] = "95a93144f0bbfe6e35d3830e93e6b63e1e109f849a6a7c307cae9030e3a662aa" +SRC_URI[pcie_ma2x8x.sha256sum] = "6d061d21d90f1919ef375138066ba7a20ceb663901d2729d9cb1b639169df5da" LICENSE = "Apache-2.0 & ISSL & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ @@ -51,6 +49,7 @@ EXTRA_OECMAKE += " \ -DTREAT_WARNING_AS_ERROR=FALSE \ -DENABLE_SPEECH_DEMO=FALSE \ -DENABLE_DATA=FALSE \ + -DUSE_SYSTEM_PUGIXML=TRUE \ " DEPENDS += "libusb1 \ @@ -68,14 +67,13 @@ COMPATIBLE_HOST_libc-musl = "null" PACKAGECONFIG ?= "vpu" 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" 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" -PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" +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" PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then - install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/ install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ - install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ + install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ fi if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then -- 2.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6865): https://lists.yoctoproject.org/g/meta-intel/message/6865 Mute This Topic: https://lists.yoctoproject.org/mt/79286979/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
