* OpenVINO now installs libraries and headers correctly so we don't need the local patches anymore.
* Switch to using pybind11 from system. json-schema-validator is no longer used and open model zoo submodule is only used when building a specific tool so these submodules have been removed. * Tweak build scripts to include Yocto specific changes. License-Update: xbyak deleted the Japaneses translation from COPYRIGHT and nlohmann_json updated copyright years. Signed-off-by: Yogesh Tyagi <[email protected]> Signed-off-by: Anuj Mittal <[email protected]> --- ...01-Use-system-installed-dependencies.patch | 196 ---------- ...stallation-of-binaries-and-libraries.patch | 348 ------------------ ...x-build-issues-due-to-gflag-and-zlib.patch | 40 -- .../opencv/files/fix-build.patch | 89 +++++ ... => openvino-inference-engine_2022.3.0.bb} | 95 ++--- 5 files changed, 124 insertions(+), 644 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2022.2.0.bb => openvino-inference-engine_2022.3.0.bb} (51%) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch deleted file mode 100644 index 2dde9880..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 86fc5a725883cf59086c319fca29ddb3e47fa7de Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Thu, 7 Apr 2022 21:39:26 +0800 -Subject: [PATCH 1/2] Use system installed dependencies - -Use the system versions of libva, ade and zlib. - -Upstream-Status: Inappropriate -Signed-off-by: Anuj Mittal <[email protected]> ---- - cmake/dependencies.cmake | 20 -------------------- - cmake/extra_modules.cmake | 4 ++-- - src/plugins/intel_gpu/include/va/va.h | 6 ------ - tests/fuzz/src/CMakeLists.txt | 3 +-- - thirdparty/CMakeLists.txt | 25 +++++++++++-------------- - thirdparty/cnpy/CMakeLists.txt | 2 +- - 6 files changed, 15 insertions(+), 45 deletions(-) - delete mode 100644 src/plugins/intel_gpu/include/va/va.h - -diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index 8d66a012b8..75db89b915 100644 ---- a/cmake/dependencies.cmake -+++ b/cmake/dependencies.cmake -@@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME) - - if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(protoc_version "3.18.2") -- -- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT -- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" -- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" -- SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21" -- ) -- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) -- -- reset_deps_cache(SYSTEM_PROTOC) -- -- find_host_program( -- SYSTEM_PROTOC -- NAMES protoc -- PATHS "${SYSTEM_PROTOC_ROOT}/bin" -- NO_DEFAULT_PATH) -- if(NOT SYSTEM_PROTOC) -- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") -- endif() -- -- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") - endif() - - if(ENABLE_INTEL_MYRIAD) -diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake -index 72eed6ad3a..39e9674a11 100644 ---- a/cmake/extra_modules.cmake -+++ b/cmake/extra_modules.cmake -@@ -22,7 +22,7 @@ function(ie_generate_dev_package_config) - configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" - INSTALL_DESTINATION share # not used -- PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" -+ PATH_VARS "OpenVINO_SOURCE_DIR" - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" -@@ -53,7 +53,7 @@ function(ov_generate_dev_package_config) - configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in" - "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake" - INSTALL_DESTINATION share # not used -- PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" -+ PATH_VARS "OpenVINO_SOURCE_DIR" - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in" -diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h -deleted file mode 100644 -index 5c8a5c6f6e..0000000000 ---- a/src/plugins/intel_gpu/include/va/va.h -+++ /dev/null -@@ -1,6 +0,0 @@ --// Copyright (C) 2018-2022 Intel Corporation --// SPDX-License-Identifier: Apache-2.0 --// -- --typedef cl_uint VASurfaceID; --typedef void* VADisplay; -diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt -index 5e6b7b168e..a81c51bb77 100644 ---- a/tests/fuzz/src/CMakeLists.txt -+++ b/tests/fuzz/src/CMakeLists.txt -@@ -10,14 +10,13 @@ add_custom_target(fuzz) - FILE(GLOB tests "*-fuzzer.cc") - - add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) --add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) - - foreach(test_source ${tests}) - get_filename_component(test_name ${test_source} NAME_WE) - add_fuzzer(${test_name} ${test_source}) - - target_link_libraries(${test_name} PRIVATE -- openvino::runtime cnpy zlib) -+ openvino::runtime cnpy z) - - add_dependencies(fuzz ${test_name}) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 38b0a5439d..4cba1588fe 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -14,7 +14,7 @@ add_subdirectory(ittapi) - add_subdirectory(itt_collector EXCLUDE_FROM_ALL) - add_subdirectory(cnpy EXCLUDE_FROM_ALL) - if(ENABLE_INTEL_GPU) -- add_subdirectory(ocl) -+ #add_subdirectory(ocl) - endif() - - add_subdirectory(xbyak EXCLUDE_FROM_ALL) -@@ -72,12 +72,11 @@ endif() - add_library(ocv_hal INTERFACE) - target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv") - --add_subdirectory(ade EXCLUDE_FROM_ALL) - add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL) --set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) --openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) -+set_target_properties(fluid PROPERTIES FOLDER thirdparty) -+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) -+ - --ov_install_static_lib(ade openvino_common) - ov_install_static_lib(fluid openvino_common) - - # -@@ -93,8 +92,6 @@ if(gflags_FOUND) - set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON) - message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}") - else() -- add_subdirectory(gflags EXCLUDE_FROM_ALL) -- openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags) - endif() - - # -@@ -119,13 +116,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - set(Protobuf_DEBUG ON) - endif() - find_package(Protobuf 3.18.2 REQUIRED) -- set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) -- set(Protobuf_LIBRARIES protobuf::libprotobuf) -- set(SYSTEM_PROTOC protobuf::protoc) -+ set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) -+ set(Protobuf_LIBRARIES protobuf::libprotobuf) -+ #set(SYSTEM_PROTOC protobuf::protoc) - set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC}) - - foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES}) -- set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) -+ #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) - endforeach() - else() - add_subdirectory(protobuf EXCLUDE_FROM_ALL) -@@ -134,8 +131,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - # forward variables used in the other places - set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE) - set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE) -- set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE) -- set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE) -+ set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE) -+ set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE) - set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE) - set(Protobuf_IN_FRONTEND ON PARENT_SCOPE) - -@@ -146,7 +143,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - set(link_type INTERFACE) - endif() - if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) -- target_compile_options(${target} ${link_type} -Wno-undef) -+ #target_compile_options(${target} ${link_type} -Wno-undef) - endif() - endforeach() - endif() -diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt -index 556adb03c4..793de9845c 100644 ---- a/thirdparty/cnpy/CMakeLists.txt -+++ b/thirdparty/cnpy/CMakeLists.txt -@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") - PRIVATE -Wno-all) - endif() - --target_link_libraries(${TARGET_NAME} PUBLIC zlib::zlib) -+target_link_libraries(${TARGET_NAME} PUBLIC z) - target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") - - set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) --- -2.37.3 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch deleted file mode 100644 index 12c8054e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch +++ /dev/null @@ -1,348 +0,0 @@ -From 3d55027cd86db299faeed0a4a97ddcec1baedd61 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Mon, 11 Apr 2022 11:11:23 +0800 -Subject: [PATCH 2/2] Fix installation of binaries and libraries - -Make sure binaries are installed correctly. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <[email protected]> ---- - CMakeLists.txt | 2 +- - cmake/developer_package/frontends/frontends.cmake | 2 +- - cmake/developer_package/packaging.cmake | 4 ++-- - cmake/developer_package/plugins/plugins.cmake | 2 +- - docs/CMakeLists.txt | 3 ++- - samples/CMakeLists.txt | 2 +- - samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++ - samples/cpp/CMakeLists.txt | 2 ++ - scripts/CMakeLists.txt | 10 +++++----- - src/bindings/c/src/CMakeLists.txt | 4 ++-- - src/cmake/openvino.cmake | 12 ++++++------ - src/common/preprocessing/CMakeLists.txt | 2 +- - src/core/CMakeLists.txt | 4 ++-- - src/inference/CMakeLists.txt | 2 +- - .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +- - src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +- - .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +- - tools/CMakeLists.txt | 2 +- - tools/compile_tool/CMakeLists.txt | 8 ++++---- - 19 files changed, 37 insertions(+), 32 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f570d4246c..d20ac60749 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ include(cmake/extra_modules.cmake) - add_subdirectory(docs) - add_subdirectory(tools) - add_subdirectory(scripts) --add_subdirectory(licensing) -+#add_subdirectory(licensing) - - # - # CPack -diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake -index 0779ed286d..f80cb9bb79 100644 ---- a/cmake/developer_package/frontends/frontends.cmake -+++ b/cmake/developer_package/frontends/frontends.cmake -@@ -2,7 +2,7 @@ - # SPDX-License-Identifier: Apache-2.0 - # - --set(FRONTEND_INSTALL_INCLUDE "runtime/include/") -+set(FRONTEND_INSTALL_INCLUDE "include/") - set(FRONTEND_NAME_PREFIX "openvino_") - set(FRONTEND_NAME_SUFFIX "_frontend") - -diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake -index 458ddade93..626eb6548a 100644 ---- a/cmake/developer_package/packaging.cmake -+++ b/cmake/developer_package/packaging.cmake -@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir) - set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) - else() -- set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) -- set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) -+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) -+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) - endif() - endfunction() -diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake -index b748ebddef..fe670e88bc 100644 ---- a/cmake/developer_package/plugins/plugins.cmake -+++ b/cmake/developer_package/plugins/plugins.cmake -@@ -139,7 +139,7 @@ function(ie_add_plugin) - - if(BUILD_SHARED_LIBS) - install(TARGETS ${IE_PLUGIN_NAME} -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} - COMPONENT ${install_component}) - else() - ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 86b0e8652b..4f31d3cc4b 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER) - foreach(target openvino_template_plugin template_extension openvino_template_extension) - if(TARGET ${target}) - install(TARGETS ${target} -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} - COMPONENT tests - EXCLUDE_FROM_ALL) -+ install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - endforeach() - endif() -diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt -index 8101b5e328..6abe8c20ce 100644 ---- a/samples/CMakeLists.txt -+++ b/samples/CMakeLists.txt -@@ -9,7 +9,7 @@ add_subdirectory(c) - if(TARGET format_reader) - install(TARGETS format_reader - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL -- LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests) - endif() - - openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) -diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt -index 2755579a0f..4a5f5b424f 100644 ---- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt -+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt -@@ -34,3 +34,5 @@ install( - RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL - LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index 3628c8283a..186540940f 100644 ---- a/samples/cpp/CMakeLists.txt -+++ b/samples/cpp/CMakeLists.txt -@@ -258,6 +258,8 @@ macro(ie_add_sample) - COMPONENT samples_bin - EXCLUDE_FROM_ALL) - -+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) -+ - # create global target with all samples / demo apps - if(NOT TARGET ie_samples) - add_custom_target(ie_samples ALL) -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 4e9f76638f..6d8df5f0a1 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -37,7 +37,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" - - # install setupvars - --ie_cpack_add_component(setupvars REQUIRED) -+#ie_cpack_add_component(setupvars REQUIRED) - - if(UNIX) - set(_setupvars_file setupvars/setupvars.sh) -@@ -54,13 +54,13 @@ elseif(WIN32) - file(WRITE "${_setupvars_file}" "${_setupvars_content}") - endif() - endif() --install(PROGRAMS "${_setupvars_file}" -- DESTINATION . -- COMPONENT setupvars) -+#install(PROGRAMS "${_setupvars_file}" -+# DESTINATION . -+# COMPONENT setupvars) - - # install install_dependencies - --if(LINUX) -+if (FALSE) - ie_cpack_add_component(install_dependencies REQUIRED) - install(DIRECTORY install_dependencies/ - DESTINATION install_dependencies -diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt -index 9200d0bda1..b3636e0716 100644 ---- a/src/bindings/c/src/CMakeLists.txt -+++ b/src/bindings/c/src/CMakeLists.txt -@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c -- INCLUDES DESTINATION runtime/include/ie) -+ INCLUDES DESTINATION include/ie) - - install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ -- DESTINATION runtime/include/ie -+ DESTINATION include/ie - COMPONENT core_c_dev) -diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake -index 340896e3a8..9bda84fe51 100644 ---- a/src/cmake/openvino.cmake -+++ b/src/cmake/openvino.cmake -@@ -62,8 +62,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core -- INCLUDES DESTINATION runtime/include -- runtime/include/ie) -+ INCLUDES DESTINATION include -+ include/ie) - - # - # Add openvin::dev target -@@ -107,7 +107,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components}) - - if(BUILD_SHARED_LIBS) - install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml -- DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${IE_CPACK_LIBRARY_PATH} - COMPONENT core) - - # for InferenceEngineUnitTest -@@ -126,7 +126,7 @@ endif() - install(EXPORT OpenVINOTargets - FILE OpenVINOTargets.cmake - NAMESPACE openvino:: -- DESTINATION runtime/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO - COMPONENT core_dev) - - set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include") -@@ -167,10 +167,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm - - install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" - "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" -- DESTINATION runtime/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine - COMPONENT core_dev) - - install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" - "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" -- DESTINATION runtime/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO - COMPONENT core_dev) -diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt -index e41e286c95..11aaffca6a 100644 ---- a/src/common/preprocessing/CMakeLists.txt -+++ b/src/common/preprocessing/CMakeLists.txt -@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) - - if(BUILD_SHARED_LIBS) - install(TARGETS ${TARGET_NAME} -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) - else() - ov_install_static_lib(${TARGET_NAME} core) - endif() -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 86b195ee1c..867121ee50 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -127,7 +127,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_ - #----------------------------------------------------------------------------------------------- - - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ -- DESTINATION "runtime/include" -+ DESTINATION "include" - COMPONENT core_dev - FILES_MATCHING - PATTERN "*.hpp" -@@ -143,5 +143,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake - - install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake - ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake -- DESTINATION "runtime/cmake" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT core_dev) -diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt -index 737e7e0027..259d5e141d 100644 ---- a/src/inference/CMakeLists.txt -+++ b/src/inference/CMakeLists.txt -@@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj - - openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api) - --install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include -+install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include - COMPONENT core_dev) - - # Install static libraries for case BUILD_SHARED_LIBS=OFF -diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt -index 3993bd9731..99287bad51 100644 ---- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt -+++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt -@@ -94,7 +94,7 @@ add_custom_command( - COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json) - - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json -- DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${IE_CPACK_LIBRARY_PATH} - COMPONENT gpu) - - ov_install_static_lib(${TARGET_NAME} gpu) -diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake -index 480acc05d1..5849f55878 100644 ---- a/src/plugins/intel_myriad/myriad_dependencies.cmake -+++ b/src/plugins/intel_myriad/myriad_dependencies.cmake -@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES) - VERBATIM) - - install(FILES ${${var_name}} -- DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${IE_CPACK_LIBRARY_PATH} - COMPONENT myriad) - - if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS) -diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt -index d8ebea0bfc..66b5a3d462 100644 ---- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt -+++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt -@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL - - if(LINUX) - install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules -- DESTINATION install_dependencies -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d - COMPONENT myriad) - endif() -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 2fe0fd9742..234110b7d4 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - ie_cpack_add_component(deployment_manager REQUIRED) - - install(DIRECTORY deployment_manager -- DESTINATION tools -+ DESTINATION share/openvino/tools - COMPONENT deployment_manager - USE_SOURCE_PERMISSIONS) - -diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt -index d19eb5cc14..9fc929cbb0 100644 ---- a/tools/compile_tool/CMakeLists.txt -+++ b/tools/compile_tool/CMakeLists.txt -@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) - ie_cpack_add_component(core_tools DEPENDS core) - - install(TARGETS compile_tool -- RUNTIME DESTINATION tools/compile_tool -+ RUNTIME DESTINATION bin - COMPONENT core_tools) - --install(FILES README.md -- DESTINATION tools/compile_tool -- COMPONENT core_tools) -+#install(FILES README.md -+# DESTINATION tools/compile_tool -+# COMPONENT core_tools) --- -2.37.3 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch deleted file mode 100644 index ffb0f95d..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a817386f1d0539a040fbdc02853a73bbcdddf1f1 Mon Sep 17 00:00:00 2001 -From: Yogesh Tyagi <[email protected]> -Date: Fri, 30 Sep 2022 20:26:04 +0800 -Subject: [PATCH] Fix build issues due to gflag and zlib - -Change gflag to shared as we are not building with static library. -We are using zlib from host, so don't add zlib as third party package - -Upstream-Status: Inappropriate - -Signed-off-by: Yogesh Tyagi <[email protected]> ---- - thirdparty/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 4cba1588fe..f82bf3148b 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -39,7 +39,7 @@ if(NOT CMAKE_CROSSCOMPILING) - endif() - - if(NOT zlib_FOUND) -- add_subdirectory(zlib EXCLUDE_FROM_ALL) -+ #add_subdirectory(zlib EXCLUDE_FROM_ALL) - endif() - - # -@@ -85,7 +85,7 @@ ov_install_static_lib(fluid openvino_common) - - if(NOT APPLE) - # on Apple only dynamic libraries are available -- find_package(gflags QUIET COMPONENTS nothreads_static) -+ find_package(gflags QUIET COMPONENTS nothreads_shared) - endif() - - if(gflags_FOUND) --- -2.37.3 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch new file mode 100644 index 00000000..b948a3b1 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch @@ -0,0 +1,89 @@ +Yocto specific tweaks to the build process: + +* Install python modules to site-packages. +* Dont try to detect glibc version as that doesn't work when cross compiling. +* Use shared protobuf and gflags libs. +* Use system installed ocl headers. +* We have va.h in recipe-sysroot and having a va.h here leads to failures. + +Upstream-Status: Inappropriate +Signed-off-by: Anuj Mittal <[email protected]> + +diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake +index 735160b469..26f51229e2 100644 +--- a/cmake/developer_package/packaging/debian/debian.cmake ++++ b/cmake/developer_package/packaging/debian/debian.cmake +@@ -31,7 +31,11 @@ macro(ov_debian_cpack_set_dirs) + set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION}) + set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION}) + set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION}) +- set(OV_CPACK_PYTHONDIR lib/python3/dist-packages) ++ ++ ov_get_pyversion(pyversion) ++ if(pyversion) ++ set(OV_CPACK_PYTHONDIR lib/${pyversion}/site-packages) ++ endif() + + # non-native stuff + set(OV_CPACK_SHAREDIR ${CMAKE_INSTALL_DATADIR}/openvino) # internal +diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake +index 62831fffab..b123bbad75 100644 +--- a/cmake/developer_package/target_flags.cmake ++++ b/cmake/developer_package/target_flags.cmake +@@ -123,4 +123,4 @@ function(ov_glibc_version) + endif() + endfunction() + +-ov_glibc_version() ++#ov_glibc_version() +diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h +deleted file mode 100644 +index 5c8a5c6f6e..0000000000 +--- a/src/plugins/intel_gpu/include/va/va.h ++++ /dev/null +@@ -1,6 +0,0 @@ +-// Copyright (C) 2018-2022 Intel Corporation +-// SPDX-License-Identifier: Apache-2.0 +-// +- +-typedef cl_uint VASurfaceID; +-typedef void* VADisplay; +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 98067991a7..bb19b592ee 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -20,7 +20,7 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS) + endif() + + if(ENABLE_INTEL_GPU) +- add_subdirectory(ocl) ++ #add_subdirectory(ocl) + endif() + + add_subdirectory(xbyak EXCLUDE_FROM_ALL) +@@ -187,11 +187,11 @@ endif() + + if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS) + if(LINUX) +- if(OV_OS_RHEL) +- set(gflag_component nothreads_shared) +- elseif(OV_OS_DEBIAN) +- set(gflag_component nothreads_static) +- endif() ++ #if(OV_OS_RHEL) ++ set(gflag_component nothreads_shared) ++ #elseif(OV_OS_DEBIAN) ++ #set(gflag_component nothreads_static) ++ #endif() + find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component}) + endif() + +@@ -248,7 +248,7 @@ endif() + + if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND) + if(ENABLE_SYSTEM_PROTOBUF) +- set(Protobuf_USE_STATIC_LIBS ON) ++ #set(Protobuf_USE_STATIC_LIBS ON) + if(CMAKE_VERBOSE_MAKEFILE) + set(Protobuf_DEBUG ON) + endif() diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb similarity index 51% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb index 2853100e..e040b623 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb @@ -4,53 +4,44 @@ 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=https;branch=releases/2022/2;lfs=0 \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_20220307_34.zip;name=usb_ma2x8x \ - https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_20220307_34.zip;name=pcie_ma2x8x \ +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/3;lfs=0 \ + https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_20221129_35.zip;name=usb_ma2x8x \ + https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_20221129_35.zip;name=pcie_ma2x8x \ git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ - git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \ - git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \ - git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \ - git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/2 \ - file://0001-Use-system-installed-dependencies.patch \ - file://0002-Fix-installation-of-binaries-and-libraries.patch \ - file://0003-Fix-build-issues-due-to-gflag-and-zlib.patch \ + git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ + git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ + file://fix-build.patch \ file://cython-cmake.patch \ " -SRCREV = "af16ea1d79a494503a54cff67a2856094e447931" -SRCREV_mkl = "2a749c577f8a841a396d4bd46eaf311b7e7dc089" -SRCREV_onednn = "efbf9b5e8c12666314f3484ce279cee0a1a91a44" -SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" -SRCREV_pybind11 = "aa304c9c7d725ffb9d10af08a3b34cb372307020" -SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c" -SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1" -SRCREV_omz = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79" +SRCREV = "9752fafe8ebf7e30dfea7edd447ff3bf0ac1d01d" +SRCREV_mkl = "44de3c3698b687c26e487fc8f0213fa487e8fe2c" +SRCREV_onednn = "fbec3e25a559ee252022ae066817b204e106a6ba" +SRCREV_xbyak = "f8ea5c28dfcdc98585881d0ca9e499580ca077ae" +SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" +SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" -SRC_URI[usb_ma2x8x.sha256sum] = "877c4e1616d14a94dd2764f4f32f1c1aa2180dcd64ad1823b31efdc3f56ad593" -SRC_URI[pcie_ma2x8x.sha256sum] = "aabff3d817431792ef9e17056448979c2cdbb484ad4b0af9e68cb874ee10eef5" +SRC_URI[usb_ma2x8x.sha256sum] = "1ca3566d294c8d269f3a0ad2f5699e9dbb2679a24a455b2cc343612303d867bd" +SRC_URI[pcie_ma2x8x.sha256sum] = "5667eb028290fbec92220031590ba5f87774a7b638b13178e0dcf8447a4ee8ca" LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ + file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ - file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \ - file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \ - file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ + file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ - file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \ " -inherit cmake python3native +inherit cmake python3native pkgconfig S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DENABLE_OPENCV=OFF \ -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \ - -DENABLE_PLUGIN_RPATH=0 \ -DENABLE_INTEL_GNA=OFF \ -DENABLE_SYSTEM_TBB=ON \ -DPYTHON_EXECUTABLE=${PYTHON} \ @@ -61,20 +52,21 @@ EXTRA_OECMAKE += " \ -DENABLE_DATA=FALSE \ -DENABLE_SYSTEM_PUGIXML=TRUE \ -DENABLE_SYSTEM_PROTOBUF=TRUE \ - -DProtobuf_LIBRARIES=protobuf \ - -DProtobuf_LITE_LIBRARIES=protobuf-lite \ - -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \ - -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \ -DENABLE_OV_ONNX_FRONTEND=FALSE \ -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ + -DENABLE_FUZZING=OFF \ + -DENABLE_TBBBIND_2_5=OFF \ + -DCPACK_GENERATOR=DEB \ " + DEPENDS += "libusb1 \ - ade \ opencv \ - pugixml \ protobuf \ protobuf-native \ + protobuf-c \ + pugixml \ + python3-pybind11 \ tbb \ zlib \ " @@ -85,30 +77,18 @@ COMPATIBLE_HOST:libc-musl = "null" PACKAGECONFIG ?= "vpu opencl" PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva," PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython" -PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware" +PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware" PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" do_configure:prepend() { # Dont set PROJECT_ROOT_DIR - sed -i -e 's:\${CMAKE_CURRENT_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt + sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt } do_install:append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then - install -d ${D}${datadir}/openvino - mv ${D}/usr/samples/python ${D}${datadir}/openvino/ - - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/ - - 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 + rm -rf ${D}${prefix}/install_dependencies + rm -rf ${D}${prefix}/setupvars.sh + rm -rf ${D}${datadir}/lintian sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp } @@ -117,15 +97,10 @@ do_install:append() { # 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 \ +FILES:${PN} += "\ + ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ + ${libdir}/openvino-${PV}/plugins.xml \ + ${libdir}/openvino-${PV}/cache.json \ " # Move inference engine samples into a separate package @@ -134,7 +109,7 @@ PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" FILES:${PN}-samples = "${datadir}/openvino \ ${bindir} \ " -FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" +FILES:${PN}-vpu-firmware += "${libdir}/openvino-${PV}/*.mvcmd" # Package for inference engine python API PACKAGES =+ "${PN}-${PYTHON_PN}" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7781): https://lists.yoctoproject.org/g/meta-intel/message/7781 Mute This Topic: https://lists.yoctoproject.org/mt/95950229/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
