For release notes, see: https://software.intel.com/content/www/us/en/develop/articles/openvino-relnotes.html
The recipe has been changed to: - disable unit tests as they rely on an older version of googletest. - remove a patch as it was merged upstream. - backport a patch instead of using a local version. - refresh other patches. - download mkl-dnn separately instead of using the submodule. The project downloads a lot of other modules as well and we don't want/use those. - not download lfs documentation content. Signed-off-by: Anuj Mittal <[email protected]> --- ...engine-use-system-installed-packages.patch | 130 ++++++++++++------ ...lver.hpp-include-stdint.h-to-avoid-b.patch | 37 ----- ...-inference-engine-installation-fixes.patch | 97 +++++++------ .../files/0004-fix-compilation-errors.patch | 24 +--- .../0005-cldnn-fix-inclusion-of-headers.patch | 16 +-- .../recipes-support/opencv/files/run-ptest | 8 -- ...bb => openvino-inference-engine_2020.4.bb} | 54 ++------ 7 files changed, 173 insertions(+), 193 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2020.3.0.bb => openvino-inference-engine_2020.4.bb} (65%) 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 d1379de5..3fff5607 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,7 +1,7 @@ -From e7730e68795c8ed0b9e1772ddc21ec931da462d0 Mon Sep 17 00:00:00 2001 +From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Wed, 10 Jun 2020 09:43:55 +0800 -Subject: [PATCH 1/5] inference-engine: use system installed packages +Subject: [PATCH] inference-engine: use system installed packages Use installed versions of pugixml, ade, protobuf and tbb. @@ -10,17 +10,19 @@ Upstream-Status: Pending Signed-off-by: Anuj Mittal <[email protected]> --- cmake/dependencies.cmake | 17 -------------- + inference-engine/CMakeLists.txt | 2 +- inference-engine/cmake/ie_parallel.cmake | 10 ++------- .../src/inference_engine/CMakeLists.txt | 22 +------------------ .../src/legacy_api/CMakeLists.txt | 3 +-- .../src/vpu/graph_transformer/CMakeLists.txt | 1 - - .../common_test_utils/CMakeLists.txt | 3 +-- + .../common_test_utils/CMakeLists.txt | 7 ++---- + .../unit_test_utils/CMakeLists.txt | 3 +-- .../tests_deprecated/helpers/CMakeLists.txt | 1 - - inference-engine/thirdparty/CMakeLists.txt | 11 +--------- - 8 files changed, 6 insertions(+), 62 deletions(-) + inference-engine/thirdparty/CMakeLists.txt | 14 +----------- + 10 files changed, 9 insertions(+), 71 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index 2a5a74db..9cc9a6c9 100644 +index 2a5a74db6..9cc9a6c94 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING) @@ -49,8 +51,21 @@ index 2a5a74db..9cc9a6c9 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 +--- 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") + + # 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}) + endfunction() + + add_subdirectory(thirdparty) diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index 0f3c41e0..b3b2dfda 100644 +index 0f3c41e0a..b3b2dfdab 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) @@ -71,20 +86,20 @@ index 0f3c41e0..b3b2dfda 100644 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 c8cd4b27..d98ba55d 100644 +index 4ae0d5607..4106cf8b4 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -117,8 +117,7 @@ add_library(${TARGET_NAME}_obj OBJECT - - target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) +@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE) + target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) + endif() -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}" - $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) -@@ -257,25 +256,6 @@ list(APPEND core_components ngraph) + $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES> +@@ -233,25 +232,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) @@ -111,21 +126,21 @@ index c8cd4b27..d98ba55d 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 d54c5906..90920ab3 100644 +index 85524310b..dc25cae2f 100644 --- a/inference-engine/src/legacy_api/CMakeLists.txt +++ b/inference-engine/src/legacy_api/CMakeLists.txt -@@ -33,8 +33,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE - - target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src +@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM + ${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>) - function(nn_builder_disable_warnings) - disable_deprecated_warnings() + # Create shared library + diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt -index 982d3c7f..db881246 100644 +index 982d3c7fa..db881246c 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) @@ -137,18 +152,30 @@ index 982d3c7f..db881246 100644 "${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 8a4ffd42..5bee450a 100644 +index efead7271..732abee2d 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 -@@ -28,7 +28,6 @@ else () +@@ -23,7 +23,7 @@ function(add_gtest_libraries) + PROPERTIES FOLDER thirdparty) + endfunction() + +-add_gtest_libraries() ++#add_gtest_libraries() + + if (MSVC) + set(PUGI pugixml_mt) +@@ -32,10 +32,7 @@ else () endif () list(APPEND EXPORT_DEPENDENCIES - ${PUGI} ${NGRAPH_LIBRARIES} - gtest - gtest_main -@@ -70,7 +69,6 @@ function(add_common_utils ADD_TARGET_NAME) +- 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> @@ -156,7 +183,7 @@ index 8a4ffd42..5bee450a 100644 PRIVATE $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> ) -@@ -80,6 +78,7 @@ function(add_common_utils ADD_TARGET_NAME) +@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME) target_link_libraries(${ADD_TARGET_NAME} PUBLIC ${EXPORT_DEPENDENCIES} @@ -164,43 +191,66 @@ index 8a4ffd42..5bee450a 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 +--- 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 + commonTestUtils_s + inference_engine_s + inference_engine_lp_transformations +- inference_engine_ir_reader +- gmock) ++ inference_engine_ir_reader) + + addIeTarget( + NAME ${TARGET_NAME} diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt -index 14265fa9..2482be78 100644 +index bf915e52d..9e7173db6 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) - target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${IE_MAIN_SOURCE_DIR}/src/inference_engine" + $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES> $<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 ebf32c71..56b6bcb0 100644 +index f94453e06..b3c25daf4 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -35,19 +35,10 @@ function(build_with_lto) - add_subdirectory(clDNN) - endif() +@@ -38,28 +38,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() -- add_subdirectory(pugixml) + ie_build_pugixml() add_subdirectory(stb_lib) - add_subdirectory(ade) add_subdirectory(fluid/modules/gapi) -- # developer package -- - 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) + +- # 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() -+ ie_developer_export_targets(fluid) - endfunction() - - build_with_lto() +- + if(ENABLE_MKL_DNN) + set(SDL_cmake_included ON) + include(mkldnn.cmake) -- -2.25.4 +2.26.2 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch deleted file mode 100644 index 057eff23..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 91d72cc97138e5349e36bba9329ae29dee814388 Mon Sep 17 00:00:00 2001 -From: Liwei Song <[email protected]> -Date: Tue, 2 Jun 2020 09:55:49 +0000 -Subject: [PATCH] mkldnn_memory_solver.hpp: include stdint.h to avoid build - error - -fix the following compile error: - -inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp:60:9: error: 'int64_t' does not name a type -| 60 | int64_t size; -| | ^~~~~~~ - -include stdint.h to fix this. - -Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/729] - -Signed-off-by: Liwei Song <[email protected]> ---- - inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp b/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp -index 2c236a307276..aa52d29b310d 100644 ---- a/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp -+++ b/inference-engine/src/mkldnn_plugin/mkldnn_memory_solver.hpp -@@ -10,6 +10,8 @@ - - #include "ie_api.h" - -+#include <stdint.h> -+ - #include <vector> - #include <map> - --- -2.24.1 - 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 5fa1b2ec..ac34fa4f 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,26 +1,29 @@ -From 0838608d9c2b09a845efbdde88a09e151ac9ff7d Mon Sep 17 00:00:00 2001 +From d9adfdc9c802fdb880fb658085854384f90a88c2 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Thu, 11 Jun 2020 14:24:04 +0800 -Subject: [PATCH] fixes +Subject: [PATCH] cmake installation fixes + +Make sure that libraries/samples/binaries are installed correctly. Signed-off-by: Anuj Mittal <[email protected]> --- CMakeLists.txt | 14 -------------- cmake/developer_package.cmake | 10 ++++++---- - inference-engine/samples/CMakeLists.txt | 8 +++----- + .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++ + inference-engine/samples/CMakeLists.txt | 9 +++------ .../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 +++- - .../tests/unit/inference_engine/CMakeLists.txt | 4 +++- + .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++- - 9 files changed, 23 insertions(+), 29 deletions(-) + 10 files changed, 24 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 902d3289..f1bfb3f5 100644 +index 1f981ed25..2c014ca27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -123,12 +123,8 @@ add_subdirectory(docs) +@@ -121,12 +121,8 @@ add_subdirectory(docs) # install setupvars @@ -33,7 +36,7 @@ index 902d3289..f1bfb3f5 100644 elseif(WIN32) install(PROGRAMS scripts/setupvars/setupvars.bat DESTINATION bin -@@ -138,22 +134,12 @@ endif() +@@ -136,22 +132,12 @@ endif() # install install_dependencies if(UNIX) @@ -57,10 +60,10 @@ index 902d3289..f1bfb3f5 100644 install(DIRECTORY scripts/demo/ DESTINATION deployment_tools/demo diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake -index 23cd9b2d..24c33711 100644 +index 5e022244b..6e2cbf44e 100644 --- a/cmake/developer_package.cmake +++ b/cmake/developer_package.cmake -@@ -7,7 +7,9 @@ set(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake/download" ${CMAKE_MODUL +@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH include(CPackComponent) unset(IE_CPACK_COMPONENTS_ALL CACHE) @@ -71,7 +74,7 @@ index 23cd9b2d..24c33711 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 -@@ -40,8 +42,8 @@ function(ie_cpack_set_library_dir) +@@ -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) else() @@ -82,20 +85,30 @@ index 23cd9b2d..24c33711 100644 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE) endif() endfunction() -@@ -143,7 +145,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "") - set(CMAKE_BUILD_TYPE "Release") - endif() +@@ -147,7 +149,7 @@ endif() --set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) -+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) + # allow to override default OUTPUT_ROOT root + if(NOT DEFINED OUTPUT_ROOT) +- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) ++ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) + endif() # Enable postfixes for Debug/Release builds - set(IE_DEBUG_POSTFIX_WIN "d") +diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/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 +@@ -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}) + endif() ++ ++install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 033a8aab..4a871ca6 100644 +index 594e581b1..4e95a7808 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt -@@ -28,7 +28,7 @@ endif() +@@ -34,7 +34,7 @@ endif() if(IE_MAIN_SOURCE_DIR) # in case if samples are built from IE repo @@ -103,21 +116,22 @@ index 033a8aab..4a871ca6 100644 + set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) # hint for find_package(InferenceEngine in the samples folder) set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") - else() -@@ -110,10 +110,6 @@ set (HAVE_INTTYPES_H 1) + # hint for find_package(ngraph in the samples folder) +@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1) set (INTTYPES_FORMAT C99) set (BUILD_TESTING OFF) -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") - add_subdirectory(thirdparty/gflags) +- set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) -endif() - - if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") endif() -@@ -222,6 +218,8 @@ macro(ie_add_sample) - if(COMMAND add_cpplint_target AND NOT IE_SAMPLE_EXCLUDE_CPPLINT) - add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}) +@@ -239,6 +234,8 @@ macro(ie_add_sample) + add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} + CUSTOM_FILTERS ${custom_filters}) endif() + + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) @@ -125,20 +139,20 @@ index 033a8aab..4a871ca6 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 6d935135..fe12eeb7 100644 +index 48dbed9f2..76532fd04 100644 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/..") +@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - 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) + +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 c8cd4b27..babe8ff5 100644 +index 4ae0d5607..b9ee12498 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -289,8 +289,8 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder +@@ -265,8 +265,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" @@ -150,7 +164,7 @@ index c8cd4b27..babe8ff5 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 b35910f6..304d6d40 100644 +index bf30d127c..6ed8c4081 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} @@ -161,7 +175,7 @@ index b35910f6..304d6d40 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 9ec5ad02..45c62571 100644 +index 9ec5ad025..45c62571a 100644 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt @@ -22,4 +22,6 @@ addIeTargetTest( @@ -174,23 +188,20 @@ index 9ec5ad02..45c62571 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 55e52b59..9d383d74 100644 +index 3eb21a434..09ba9225a 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -@@ -12,4 +12,6 @@ addIeTargetTest( - ADD_CPPLINT +@@ -15,3 +15,5 @@ addIeTargetTest( LABELS - INFERENCE_ENGINE --) -\ No newline at end of file -+) + 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 39fb1d5a..5ce82b5f 100644 +index 072103292..117cc9ee1 100644 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -23,4 +23,6 @@ addIeTargetTest( +@@ -26,4 +26,6 @@ addIeTargetTest( LABELS VPU MYRIAD @@ -200,5 +211,5 @@ index 39fb1d5a..5ce82b5f 100644 + +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -- -2.25.4 +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 index 8169f9fb..1a54a124 100644 --- 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 @@ -1,25 +1,16 @@ -From deec5feef34f86eb5616252e2e5b685b6555f561 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Wed, 10 Jun 2020 09:49:03 +0800 -Subject: [PATCH 4/5] fix compilation errors - -Fixes errors like: - -build/tmp/work/skylake-64-poky-linux/dldt-inference-engine/2020r1-r0/git/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h:295:28: -error: 'runtime_error' is not a member of 'std' - 295 | throw std::runtime_error("Tensor pitches didn't -set correctly"); - | - -Upstream-Status: Pending +From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001 +From: Vladimir Zinoviev <[email protected]> +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 <[email protected]> --- .../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 7f05b67f..641a4c9b 100644 +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 @@ @@ -30,6 +21,3 @@ index 7f05b67f..641a4c9b 100644 namespace kernel_selector { #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9 --- -2.25.4 - 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 1b842da2..d47d273c 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,7 +1,7 @@ -From 0d0810481186fc443fe65a6119ddcc71ba21e814 Mon Sep 17 00:00:00 2001 +From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> Date: Wed, 10 Jun 2020 09:50:19 +0800 -Subject: [PATCH 5/5] cldnn: fix inclusion of headers +Subject: [PATCH] cldnn: fix inclusion of headers Upstream-Status: Inappropriate @@ -13,7 +13,7 @@ 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 fce7d8f1..827e5764 100644 +index fce7d8f17..827e5764a 100644 --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp @@ -21,4 +21,4 @@ @@ -23,19 +23,19 @@ index fce7d8f1..827e5764 100644 -#include <CL/cl2.hpp> +#include <cl2.hpp> diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt -index de56ed8e..c81453ab 100644 +index eeb9b5c80..32a283ba4 100644 --- a/inference-engine/src/cldnn_engine/CMakeLists.txt +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt -@@ -31,6 +31,7 @@ set (CLDNN_TOP_FOLDER ${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN) - target_include_directories(${TARGET_NAME} PRIVATE +@@ -33,6 +33,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}) - # copy default global xml file describing the custom kernels and the *.cl files + # 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 8f668b18..a1d24438 100644 +index c67c81726..5ca48c597 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; diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest deleted file mode 100644 index 0b995ccb..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/run-ptest +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -for i in cpu ie vpu -do - ./$i"UnitTests" |sed \ - -e 's|\[.*OK.*\]\(.*\)|PASS:\1|' \ - -e 's|\[.*FAILED.*\]\(.*\)|FAIL:\1|' -done diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb similarity index 65% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb index 41964728..c2863e65 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.3.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb @@ -4,37 +4,35 @@ 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 = "gitsm://github.com/openvinotoolkit/openvino.git;protocol=git;branch=releases/2020/3 \ - https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2450_1119.zip;name=ma2450 \ - https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_pcie-ma248x_1119.zip;name=ma248x \ - https://download.01.org/opencv/2020/openvinotoolkit/2020.3/inference_engine/firmware_usb-ma2x8x_1119.zip;name=ma2x8x \ +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-mkldnn_memory_solver.hpp-include-stdint.h-to-avoid-b.patch \ file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \ - file://run-ptest \ " -SRCREV = "2fe9b1523058e282ad374db7dc1b3538c7d2dd27" +SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6" +SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab" -SRC_URI[ma2450.sha256sum] = "9b8f61954751343995dde9d714134e5082dbaadffb0c7c33d41ce84c1296a20e" -SRC_URI[ma248x.sha256sum] = "338940db127b16231e0afa948c83ed576458b130dd2a0a593c5edb29d9637f35" -SRC_URI[ma2x8x.sha256sum] = "94cd485105de47ef3f747baec1261a1254ddf30e308807948dd8b0176ecdfebf" +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=3b9bf048d063d54cdb28964db558bcc7 \ + 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 \ - file://inference-engine/tests/ie_test_utils/common_test_utils/gtest/googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://inference-engine/tests/ie_test_utils/common_test_utils/gtest/googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ " LICENSE_${PN}-vpu-firmware = "ISSL" -inherit cmake ptest python3native +inherit cmake python3native S = "${WORKDIR}/git" @@ -45,23 +43,15 @@ EXTRA_OECMAKE += " \ -DPYTHON_EXECUTABLE=${PYTHON} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \ - -DENABLE_TESTS="${@bb.utils.contains('PTEST_ENABLED', '1', '1', '0', d)}" \ - -DBUILD_GMOCK=1 \ - -DBUILD_GTEST=0 \ - -DINSTALL_GMOCK=0 \ - -DINSTALL_GTEST=0 \ -DENABLE_SAMPLES=1 \ - -DENABLE_NGRAPH=ON \ - -DENABLE_MKL_DNN=ON \ -DIE_CPACK_IE_DIR=${prefix} \ -DNGRAPH_UNIT_TEST_ENABLE=FALSE \ -DNGRAPH_TEST_UTIL_ENABLE=FALSE \ -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \ -DNGRAPH_JSON_ENABLE=FALSE \ - -DNGRAPH_NATIVE_ARCH_ENABLE=FALSE \ - -DNGRAPH_NOP_ENABLE=FALSE \ - -DNGRAPH_GENERIC_CPU_ENABLE=FALSE \ -DTREAT_WARNING_AS_ERROR=FALSE \ + -DENABLE_SPEECH_DEMO=FALSE \ + -DENABLE_DATA=FALSE \ " DEPENDS += "libusb1 \ @@ -70,7 +60,7 @@ DEPENDS += "libusb1 \ pugixml \ protobuf-native \ tbb \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'gflags', '', d)} \ + onednn \ " COMPATIBLE_HOST = '(x86_64).*-linux' @@ -89,10 +79,6 @@ do_install_append() { install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/ fi - if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then - cp -r ${S}/inference-engine/src/cldnn_engine/cldnn_global_custom_kernels ${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/ @@ -109,15 +95,6 @@ do_install_append() { rm -rf ${D}/usr/samples } -do_install_ptest_base_prepend() { - # While not a Makefile based project that strictly falls into the category of - # what ptest helps with, adding the unit tests here as ptest would help. - # Create a dummy Makefile so installation doesn't fail. - touch ${WORKDIR}/Makefile - - mv ${D}${bindir}/*UnitTests ${D}${PTEST_PATH}/ -} - # 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" @@ -128,7 +105,6 @@ FILES_${PN}-dev = "${includedir} \ FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ ${datadir}/openvino \ - ${libdir}/cldnn_global_custom_kernels \ ${libdir}/custom_kernels \ ${libdir}/plugins.xml \ ${libdir}/cache.json \ -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6663): https://lists.yoctoproject.org/g/meta-intel/message/6663 Mute This Topic: https://lists.yoctoproject.org/mt/76180809/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
