From 4480afe686804c8ec30cd5900e914414d446a541 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 8 Oct 2020 09:42:16 +0800 Subject: openvino-inference-engine: upgrade 2020.4 -> 2021.1 Release notes: https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html Update the firmware files and refresh patches as well. Signed-off-by: Anuj Mittal --- ...01-dont-install-licenses-and-version-file.patch | 31 +++-- ...ence-engine-use-system-installed-packages.patch | 78 +++++++------ .../0003-inference-engine-installation-fixes.patch | 58 ++++++---- .../opencv/files/0004-fix-compilation-errors.patch | 23 ---- .../0005-cldnn-fix-inclusion-of-headers.patch | 15 ++- .../opencv/openvino-inference-engine_2020.4.bb | 124 -------------------- .../opencv/openvino-inference-engine_2021.1.bb | 125 +++++++++++++++++++++ 7 files changed, 233 insertions(+), 221 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb 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 185a475b..88aab623 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 a7ee6a27135fef24a398690d9280aca79315fa25 Mon Sep 17 00:00:00 2001 +From 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 9 Jun 2020 11:35:59 +0800 Subject: [PATCH] don't install licenses and version @@ -7,14 +7,15 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal --- - CMakeLists.txt | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) + ngraph/CMakeLists.txt | 13 ++----------- + ngraph/test/runtime/CMakeLists.txt | 2 ++ + 2 files changed, 4 insertions(+), 11 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c347cb465d..9f57a5ed9c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -641,7 +641,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt +index 4eb969f02..c52aec2ec 100644 +--- a/ngraph/CMakeLists.txt ++++ b/ngraph/CMakeLists.txt +@@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(EXPORT ngraphTargets FILE ngraphTargets.cmake NAMESPACE ngraph:: @@ -23,7 +24,7 @@ index c347cb465d..9f57a5ed9c 100644 COMPONENT ngraph) configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in -@@ -654,15 +654,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) +@@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake @@ -40,6 +41,16 @@ index c347cb465d..9f57a5ed9c 100644 - -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 +--- 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}) + + add_subdirectory(interpreter) + add_subdirectory(ie) ++ ++install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) -- -2.25.4 +2.26.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 3fff5607..bbf186df 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,4 +1,4 @@ -From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001 +From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 10 Jun 2020 09:43:55 +0800 Subject: [PATCH] inference-engine: use system installed packages @@ -11,15 +11,15 @@ Signed-off-by: Anuj Mittal --- cmake/dependencies.cmake | 17 -------------- inference-engine/CMakeLists.txt | 2 +- - inference-engine/cmake/ie_parallel.cmake | 10 ++------- - .../src/inference_engine/CMakeLists.txt | 22 +------------------ + 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 ++---- .../unit_test_utils/CMakeLists.txt | 3 +-- .../tests_deprecated/helpers/CMakeLists.txt | 1 - - inference-engine/thirdparty/CMakeLists.txt | 14 +----------- - 10 files changed, 9 insertions(+), 71 deletions(-) + inference-engine/thirdparty/CMakeLists.txt | 14 +---------- + 10 files changed, 8 insertions(+), 70 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 2a5a74db6..9cc9a6c94 100644 @@ -52,54 +52,60 @@ 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 39ff413bc..ba8ed354c 100644 +index 7f45ab021..db85e8690 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt -@@ -54,7 +54,7 @@ function(ie_developer_export) - APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") +@@ -57,7 +57,7 @@ function(ie_developer_export) + APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") # Custom target to build only Inference Engine Developer Package targets -- add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags) -+ add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets}) +- add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags ++ add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} + inference_engine_ir_reader inference_engine_ir_v7_reader) endfunction() - add_subdirectory(thirdparty) diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index 0f3c41e0a..b3b2dfdab 100644 +index 7fd77ccc0..143dcf669 100644 --- a/inference-engine/cmake/ie_parallel.cmake +++ b/inference-engine/cmake/ie_parallel.cmake -@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME) +@@ -62,13 +62,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") -- find_package(TBB COMPONENTS tbb tbbmalloc) - if (TBB_FOUND) -- set(IE_THREAD_DEFINE "IE_THREAD_TBB") + 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. \ - SEQ method will be used for ${TARGET_NAME}") - endif () -+ set(IE_THREAD_DEFINE "IE_THREAD_TBB") -+ 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 4ae0d5607..4106cf8b4 100644 +index 9ab888983..105e666a3 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) - target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) - endif() +@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE + $) + + target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE +- $ + $) + + # 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_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $) target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" - $ -@@ -233,25 +232,6 @@ list(APPEND core_components ngraph) + "${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") ie_cpack_add_component(tbb REQUIRED) list(APPEND core_components tbb) @@ -126,10 +132,10 @@ index 4ae0d5607..4106cf8b4 100644 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 85524310b..dc25cae2f 100644 +index ed87a073a..adc970a09 100644 --- a/inference-engine/src/legacy_api/CMakeLists.txt +++ b/inference-engine/src/legacy_api/CMakeLists.txt -@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM +@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl $ $ @@ -140,7 +146,7 @@ index 85524310b..dc25cae2f 100644 # Create shared library diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt -index 982d3c7fa..db881246c 100644 +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) @@ -192,36 +198,36 @@ index efead7271..732abee2d 100644 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 df611c700..06bd911ae 100644 +index dbb0f4e5b..9586d651d 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 -@@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES +@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine) + list(APPEND EXPORT_DEPENDENCIES commonTestUtils_s inference_engine_s - inference_engine_lp_transformations -- inference_engine_ir_reader +- inference_engine_lp_transformations - gmock) -+ inference_engine_ir_reader) ++ inference_engine_lp_transformations) addIeTarget( NAME ${TARGET_NAME} diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt -index bf915e52d..9e7173db6 100644 +index 2bc668965..e44ab9d5d 100644 --- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt +++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt -@@ -23,7 +23,6 @@ function(add_helpers target_name) +@@ -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" - $ $ - $ "${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 f94453e06..b3c25daf4 100644 +index a2550bfaa..0eb616415 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -38,28 +38,16 @@ function(build_with_lto) +@@ -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) 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 ac34fa4f..9c91ac4d 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 d9adfdc9c802fdb880fb658085854384f90a88c2 Mon Sep 17 00:00:00 2001 +From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 11 Jun 2020 14:24:04 +0800 Subject: [PATCH] cmake installation fixes @@ -9,7 +9,7 @@ Signed-off-by: Anuj Mittal --- CMakeLists.txt | 14 -------------- cmake/developer_package.cmake | 10 ++++++---- - .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++ + .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ inference-engine/samples/CMakeLists.txt | 9 +++------ .../samples/common/format_reader/CMakeLists.txt | 2 ++ .../src/inference_engine/CMakeLists.txt | 4 ++-- @@ -17,13 +17,14 @@ Signed-off-by: Anuj Mittal inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++- .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- - 10 files changed, 24 insertions(+), 29 deletions(-) + inference-engine/tools/compile_tool/CMakeLists.txt | 2 +- + 11 files changed, 25 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f981ed25..2c014ca27 100644 +index 18ed02ee5..18f6094f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -121,12 +121,8 @@ add_subdirectory(docs) +@@ -143,12 +143,8 @@ add_subdirectory(docs) # install setupvars @@ -36,7 +37,7 @@ index 1f981ed25..2c014ca27 100644 elseif(WIN32) install(PROGRAMS scripts/setupvars/setupvars.bat DESTINATION bin -@@ -136,22 +132,12 @@ endif() +@@ -158,22 +154,12 @@ endif() # install install_dependencies if(UNIX) @@ -60,7 +61,7 @@ index 1f981ed25..2c014ca27 100644 install(DIRECTORY scripts/demo/ DESTINATION deployment_tools/demo diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake -index 5e022244b..6e2cbf44e 100644 +index 86137c384..af011c361 100644 --- a/cmake/developer_package.cmake +++ b/cmake/developer_package.cmake @@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH @@ -94,10 +95,10 @@ index 5e022244b..6e2cbf44e 100644 endif() # Enable postfixes for Debug/Release builds -diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt +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 ---- a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt -+++ b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt +--- 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) if(COMMAND add_cpplint_target) add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) @@ -105,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 594e581b1..4e95a7808 100644 +index 4dda7eecd..04e1b9c3e 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -34,7 +34,7 @@ endif() @@ -117,7 +118,7 @@ index 594e581b1..4e95a7808 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) -@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) +@@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1) set (INTTYPES_FORMAT C99) set (BUILD_TESTING OFF) @@ -129,7 +130,7 @@ index 594e581b1..4e95a7808 100644 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") endif() -@@ -239,6 +234,8 @@ macro(ie_add_sample) +@@ -250,6 +245,8 @@ macro(ie_add_sample) add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} CUSTOM_FILTERS ${custom_filters}) endif() @@ -149,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 4ae0d5607..b9ee12498 100644 +index 105e666a3..5c2f70575 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME} +@@ -244,8 +244,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" @@ -164,7 +165,7 @@ index 4ae0d5607..b9ee12498 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 bf30d127c..6ed8c4081 100644 +index aeebe4e04..310eb6231 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} @@ -175,10 +176,10 @@ index bf30d127c..6ed8c4081 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 9ec5ad025..45c62571a 100644 +index d7acf8908..be4ae4a76 100644 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt -@@ -22,4 +22,6 @@ addIeTargetTest( +@@ -24,4 +24,6 @@ addIeTargetTest( ADD_CPPLINT LABELS CPU @@ -188,20 +189,20 @@ index 9ec5ad025..45c62571a 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 3eb21a434..09ba9225a 100644 +index e4613f032..5fe9e7089 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -@@ -15,3 +15,5 @@ addIeTargetTest( +@@ -26,3 +26,5 @@ addIeTargetTest( LABELS IE ) + +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 072103292..117cc9ee1 100644 +index a4106753d..091339e17 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -26,4 +26,6 @@ addIeTargetTest( +@@ -27,4 +27,6 @@ addIeTargetTest( LABELS VPU MYRIAD @@ -210,6 +211,19 @@ index 072103292..117cc9ee1 100644 +) + +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 +--- 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 + + install(TARGETS compile_tool +- RUNTIME DESTINATION deployment_tools/tools/compile_tool ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT core) + + install(FILES README.md -- 2.26.2 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch deleted file mode 100644 index 1a54a124..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001 -From: Vladimir Zinoviev -Date: Sun, 14 Jun 2020 18:54:36 +0300 -Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871) - -Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55] -Signed-off-by: Anuj Mittal ---- - .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h -index 3dbdfd0b22..2226f1a874 100644 ---- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h -+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - namespace kernel_selector { - #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9 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 d47d273c..ad4d8e8a 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 f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001 +From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 10 Jun 2020 09:50:19 +0800 Subject: [PATCH] cldnn: fix inclusion of headers @@ -13,17 +13,20 @@ Signed-off-by: Anuj Mittal 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 fce7d8f17..827e5764a 100644 +index 282dcd844..0d5d4084c 100644 --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp -@@ -21,4 +21,4 @@ +@@ -22,7 +22,7 @@ # pragma GCC system_header #endif -#include +#include + + #if defined __GNUC__ + # pragma GCC diagnostic pop diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt -index eeb9b5c80..32a283ba4 100644 +index cdc0de406..70883465b 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 @@ -35,7 +38,7 @@ index eeb9b5c80..32a283ba4 100644 # install 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 c67c81726..5ca48c597 100644 +index 97608c30a..3a04096c0 100644 --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp @@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel; @@ -48,5 +51,5 @@ index c67c81726..5ca48c597 100644 #include -- -2.25.4 +2.26.2 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb deleted file mode 100644 index c2863e65..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb +++ /dev/null @@ -1,124 +0,0 @@ -SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" -HOMEPAGE = "https://github.com/opencv/dldt" -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/2020/4;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1223.zip;name=ma2450 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1223.zip;name=ma248x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1223.zip;name=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 \ - file://0003-inference-engine-installation-fixes.patch \ - file://0004-fix-compilation-errors.patch \ - file://0005-cldnn-fix-inclusion-of-headers.patch \ - file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \ - " - -SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6" -SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab" - -SRC_URI[ma2450.sha256sum] = "4dc246bd12d7a21c1b10ac3e090b30043777c4ea862e1e4119536ba03c5878ef" -SRC_URI[ma248x.sha256sum] = "64dd77ecd2f7172421414a388a87be4e6271894a982a58b3829f9de1a1869abd" -SRC_URI[ma2x8x.sha256sum] = "d1d209221c1389a9a04e14ffeeaff1c3308f6ab105c7bd22f0e300df01cce4d8" - -LICENSE = "Apache-2.0 & ISSL & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ - file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ - file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ -" -LICENSE_${PN}-vpu-firmware = "ISSL" - -inherit cmake python3native - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " \ - -DENABLE_OPENCV=0 \ - -DENABLE_PLUGIN_RPATH=0 \ - -DENABLE_GNA=0 \ - -DPYTHON_EXECUTABLE=${PYTHON} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ - -DENABLE_SAMPLES=1 \ - -DIE_CPACK_IE_DIR=${prefix} \ - -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ - -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ - -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ - -DNGRAPH_JSON_ENABLE=FALSE \ - -DTREAT_WARNING_AS_ERROR=FALSE \ - -DENABLE_SPEECH_DEMO=FALSE \ - -DENABLE_DATA=FALSE \ - " - -DEPENDS += "libusb1 \ - ade \ - opencv \ - pugixml \ - protobuf-native \ - tbb \ - onednn \ - " - -COMPATIBLE_HOST = '(x86_64).*-linux' -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[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}/ - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -d ${D}${datadir}/inference_engine - mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ - - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - - rm -rf ${D}${prefix}/python - rm -rf ${D}${prefix}/deployment_tools - fi - - # Remove the samples source directory. We install the built samples. - rm -rf ${D}/usr/samples -} - -# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR -# instead of RSS -SSTATE_SCAN_FILES_append = " *.cmake" - -FILES_${PN}-dev = "${includedir} \ - ${libdir}/cmake \ - " - -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ - ${datadir}/openvino \ - ${libdir}/custom_kernels \ - ${libdir}/plugins.xml \ - ${libdir}/cache.json \ - " - -# Move inference engine samples into a separate package -PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" - -FILES_${PN}-samples = "${datadir}/inference_engine \ - ${bindir} \ - " -FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" - -# Package for inference engine python API -PACKAGES =+ "${PN}-${PYTHON_PN}" - -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" 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.1.bb new file mode 100644 index 00000000..a2cc2467 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb @@ -0,0 +1,125 @@ +SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" +HOMEPAGE = "https://github.com/opencv/dldt" +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 \ + 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 \ + file://0003-inference-engine-installation-fixes.patch \ + file://0005-cldnn-fix-inclusion-of-headers.patch \ + file://0001-dont-install-licenses-and-version-file.patch \ + " + +SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c" +SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51" + +SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745" +SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204" +SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a" + +LICENSE = "Apache-2.0 & ISSL & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \ + file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ + file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \ +" +LICENSE_${PN}-vpu-firmware = "ISSL" + +inherit cmake python3native + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += " \ + -DENABLE_OPENCV=0 \ + -DENABLE_PLUGIN_RPATH=0 \ + -DENABLE_GNA=0 \ + -DPYTHON_EXECUTABLE=${PYTHON} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ + -DENABLE_SAMPLES=1 \ + -DIE_CPACK_IE_DIR=${prefix} \ + -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ + -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ + -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ + -DNGRAPH_JSON_ENABLE=FALSE \ + -DTREAT_WARNING_AS_ERROR=FALSE \ + -DENABLE_SPEECH_DEMO=FALSE \ + -DENABLE_DATA=FALSE \ + " + +DEPENDS += "libusb1 \ + ade \ + opencv \ + pugixml \ + protobuf-native \ + tbb \ + onednn \ + " + +COMPATIBLE_HOST = '(x86_64).*-linux' +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[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}/ + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -d ${D}${datadir}/inference_engine + mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/ + + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ + mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ + mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ + + rm -rf ${D}${prefix}/python + fi + + rm -rf ${D}${prefix}/deployment_tools + + # Remove the samples source directory. We install the built samples. + rm -rf ${D}/usr/samples +} + +# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR +# instead of RSS +SSTATE_SCAN_FILES_append = " *.cmake" + +FILES_${PN}-dev = "${includedir} \ + ${libdir}/cmake \ + " + +FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ + ${datadir}/openvino \ + ${libdir}/custom_kernels \ + ${libdir}/plugins.xml \ + ${libdir}/cache.json \ + " + +# Move inference engine samples into a separate package +PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" + +FILES_${PN}-samples = "${datadir}/inference_engine \ + ${bindir} \ + " +FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" + +# Package for inference engine python API +PACKAGES =+ "${PN}-${PYTHON_PN}" + +FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" -- cgit v1.2.3-54-g00ecf