Refresh patches, update dependencies and licenses for the new components. Release notes: https://github.com/openvinotoolkit/openvino/releases/tag/2022.1.0
Signed-off-by: Anuj Mittal <[email protected]> --- ...nt-install-licenses-and-version-file.patch | 56 -- ...engine-use-system-installed-packages.patch | 423 ++++++------- .../opencv/files/0002-Disable-Werror.patch | 43 -- ...inference-engine-installation-fixes.patch} | 564 +++++++++--------- ...bb => openvino-inference-engine_2022.1.bb} | 88 +-- 5 files changed, 535 insertions(+), 639 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{0003-inference-engine-installation-fixes.patch => 0002-inference-engine-installation-fixes.patch} (15%) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2021.4.2.bb => openvino-inference-engine_2022.1.bb} (48%) 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 deleted file mode 100644 index 3c265652..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Tue, 9 Jun 2020 11:35:59 +0800 -Subject: [PATCH] don't install licenses and version - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <[email protected]> ---- - ngraph/CMakeLists.txt | 8 ++------ - ngraph/test/runtime/CMakeLists.txt | 2 ++ - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index a05ca3b15c..9bc507b4c7 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) - install(EXPORT ngraphTargets - FILE ngraphTargets.cmake - NAMESPACE ngraph:: -- DESTINATION "deployment_tools/ngraph/cmake" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph_dev) - endif() - -@@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake -- DESTINATION "deployment_tools/ngraph/cmake" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph - COMPONENT ngraph_dev) - endif() - -@@ -337,7 +337,3 @@ add_subdirectory(test) - if (NGRAPH_PYTHON_BUILD_ENABLE) - add_subdirectory(python) - endif() -- --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION -- DESTINATION "deployment_tools/ngraph" -- COMPONENT ngraph) -diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt -index be84499ee0..f65357b751 100644 ---- a/ngraph/test/runtime/CMakeLists.txt -+++ b/ngraph/test/runtime/CMakeLists.txt -@@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - - add_subdirectory(interpreter) - add_subdirectory(ie) -+ -+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB}) --- -2.32.0 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch index b16135ee..315385d8 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,51 +1,44 @@ -From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 +From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> -Date: Thu, 8 Apr 2021 14:19:51 +0800 -Subject: [PATCH] inference-engine: use system installed packages +Date: Thu, 7 Apr 2022 21:39:26 +0800 +Subject: [PATCH] Use system installed dependencies -Use installed versions of ade, protobuf, zlib and tbb. - -Don't fetch pybind11 at runtime and use the one that we have fetched while -running do_fetch. +Use the system versions of libva, tbb, OpenCV, ade and zlib. Upstream-Status: Inappropriate - Signed-off-by: Anuj Mittal <[email protected]> + --- - cmake/dependencies.cmake | 19 -------- - inference-engine/CMakeLists.txt | 6 +-- - inference-engine/cmake/dependencies.cmake | 45 ------------------- - inference-engine/cmake/ie_parallel.cmake | 2 +- - .../templates/InferenceEngineConfig.cmake.in | 10 ----- - inference-engine/samples/CMakeLists.txt | 3 +- - .../src/inference_engine/CMakeLists.txt | 4 +- - .../common_test_utils/CMakeLists.txt | 4 +- - .../unit_test_utils/CMakeLists.txt | 3 +- - inference-engine/thirdparty/CMakeLists.txt | 5 +-- - ngraph/python/CMakeLists.txt | 12 +---- - tests/fuzz/src/CMakeLists.txt | 1 - - thirdparty/CMakeLists.txt | 1 - - thirdparty/cnpy/CMakeLists.txt | 4 +- - 14 files changed, 14 insertions(+), 105 deletions(-) + cmake/dependencies.cmake | 75 ------------------------- + cmake/extra_modules.cmake | 4 +- + cmake/templates/OpenVINOConfig.cmake.in | 9 --- + src/cmake/ie_parallel.cmake | 2 +- + src/plugins/intel_gpu/include/va/va.h | 6 -- + tests/fuzz/src/CMakeLists.txt | 3 +- + thirdparty/CMakeLists.txt | 26 ++++----- + thirdparty/cnpy/CMakeLists.txt | 2 +- + 8 files changed, 15 insertions(+), 112 deletions(-) + delete mode 100644 src/plugins/intel_gpu/include/va/va.h diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake -index 6cb15a077e..74d4ac4124 100644 +index e2f941fcd..1fcc358ef 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake -@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") - if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(protoc_version "3.7.1") +@@ -29,26 +29,6 @@ endif() + 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 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" +- SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21" - ) - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) - - reset_deps_cache(SYSTEM_PROTOC) - -- find_program( +- find_host_program( - SYSTEM_PROTOC - NAMES protoc - PATHS "${SYSTEM_PROTOC_ROOT}/bin" @@ -56,57 +49,29 @@ index 6cb15a077e..74d4ac4124 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 1ac7fd8bf6..0615873110 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -18,7 +18,7 @@ function(ie_developer_export_targets) - endfunction() - - function(ie_developer_export) -- set(all_dev_targets gflags ie_libraries) -+ set(all_dev_targets ie_libraries) - foreach(component IN LISTS openvino_export_components) - export(TARGETS ${${component}} NAMESPACE IE:: - APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") -@@ -142,7 +142,7 @@ endif() - # Developer package - # - --openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils) -+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) - - # for Template plugin - if(NGRAPH_INTERPRETER_ENABLE) -@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config) - configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" - INSTALL_DESTINATION share # not used -- PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR" -+ PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR" - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" -diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake -index b270c46f2d..5f85197a85 100644 ---- a/inference-engine/cmake/dependencies.cmake -+++ b/inference-engine/cmake/dependencies.cmake -@@ -81,51 +81,6 @@ endif () - if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") - reset_deps_cache(TBBROOT TBB_DIR) + if(ENABLE_INTEL_MYRIAD) +@@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") + set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") + endif() -- if (WIN32 AND X86_64) -- #TODO: add target_path to be platform specific as well, to avoid following if +- if(WIN32 AND X86_64) +- # TODO: add target_path to be platform specific as well, to avoid following if - RESOLVE_DEPENDENCY(TBB - ARCHIVE_WIN "tbb2020_20200415_win.zip" - TARGET_PATH "${TEMP}/tbb" - ENVIRONMENT "TBBROOT" - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") -- RESOLVE_DEPENDENCY(TBBBIND_2_4 -- ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" -- TARGET_PATH "${TEMP}/tbbbind_2_4" -- ENVIRONMENT "TBBBIND_2_4_ROOT" -- SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") +- if(ENABLE_TBBBIND_2_5) +- RESOLVE_DEPENDENCY(TBBBIND_2_5 +- ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip" +- TARGET_PATH "${TEMP}/tbbbind_2_5" +- ENVIRONMENT "TBBBIND_2_5_ROOT" +- SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1") +- else() +- message(WARNING "prebuilt TBBBIND_2_5 is not available. +- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") +- endif() - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well - RESOLVE_DEPENDENCY(TBB - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" @@ -119,11 +84,16 @@ index b270c46f2d..5f85197a85 100644 - TARGET_PATH "${TEMP}/tbb" - ENVIRONMENT "TBBROOT" - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") -- RESOLVE_DEPENDENCY(TBBBIND_2_4 -- ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" -- TARGET_PATH "${TEMP}/tbbbind_2_4" -- ENVIRONMENT "TBBBIND_2_4_ROOT" -- SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") +- if(ENABLE_TBBBIND_2_5) +- RESOLVE_DEPENDENCY(TBBBIND_2_5 +- ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz" +- TARGET_PATH "${TEMP}/tbbbind_2_5" +- ENVIRONMENT "TBBBIND_2_5_ROOT" +- SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4") +- else() +- message(WARNING "prebuilt TBBBIND_2_5 is not available. +- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") +- endif() - elseif(LINUX AND AARCH64) - RESOLVE_DEPENDENCY(TBB - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" @@ -141,193 +111,186 @@ index b270c46f2d..5f85197a85 100644 - endif() - update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") - update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") + if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake") + # oneTBB case +diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake +index e33e4378f..f0cacdf6f 100644 +--- a/cmake/extra_modules.cmake ++++ b/cmake/extra_modules.cmake +@@ -18,7 +18,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) -diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake -index edf3d2f2b2..6579d0f7ea 100644 ---- a/inference-engine/cmake/ie_parallel.cmake -+++ b/inference-engine/cmake/ie_parallel.cmake -@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) - find_dependency(TBB COMPONENTS tbb tbbmalloc) - endif() - set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) -- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) -+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) - set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) - if (NOT TBB_FOUND) - ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ -diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -index 261edbf3d7..bf217a789a 100644 ---- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in -@@ -86,16 +86,6 @@ endfunction() - set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}") + configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" +@@ -45,7 +45,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/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in +index 00e892f2b..7c686fa07 100644 +--- a/cmake/templates/OpenVINOConfig.cmake.in ++++ b/cmake/templates/OpenVINOConfig.cmake.in +@@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}") set(THREADING "@THREADING@") --if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) + if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND) - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") -- _ie_find_dependency(TBB +- _ov_find_dependency(TBB - COMPONENTS tbb tbbmalloc - CONFIG - PATHS ${TBBROOT}/cmake - ${_tbb_dir} - NO_CMAKE_FIND_ROOT_PATH - NO_DEFAULT_PATH) --endif() - - set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") - _ie_find_dependency(ngraph -diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index 7924c56779..ae93857944 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") - add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) - set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) - endfunction() -- add_gflags() -+ #add_gflags() - endif() - - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") -- add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) - endif() - - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") -diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index e8ed1a5c4c..2fcb0bed4a 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf - INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" - PATH_VARS ${PATH_VARS}) - --set(IE_INCLUDE_DIR "include") --set(IE_NGRAPH_DIR "../ngraph/cmake") -+set(IE_INCLUDE_DIR "../../include") -+set(IE_NGRAPH_DIR "ngraph") - set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") - set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") - -diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt -index 5e8643dc5d..031557efc3 100644 ---- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt -+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt -@@ -43,7 +43,7 @@ function(add_gtest_libraries) - PROPERTIES FOLDER thirdparty) - endfunction() +- + set(install_tbbbind "@install_tbbbind@") + if(install_tbbbind) + set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@") +diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake +index a036b019c..031f1ea48 100644 +--- a/src/cmake/ie_parallel.cmake ++++ b/src/cmake/ie_parallel.cmake +@@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME) + endforeach() + endif() + set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) +- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) ++ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) + set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) + if (NOT TBB_FOUND) + set(THREADING "SEQ" PARENT_SCOPE) +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 5c8a5c6f6..000000000 +--- 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 5e6b7b168..a81c51bb7 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_gtest_libraries() -+#add_gtest_libraries() + add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) +-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) - if (MSVC) - set(PUGI pugixml_mt) -@@ -52,8 +52,6 @@ else () - endif () + foreach(test_source ${tests}) + get_filename_component(test_name ${test_source} NAME_WE) + add_fuzzer(${test_name} ${test_source}) - list(APPEND EXPORT_DEPENDENCIES -- gtest -- gtest_main - ) + target_link_libraries(${test_name} PRIVATE +- openvino::runtime cnpy zlib) ++ openvino::runtime cnpy z) - set(TARGET_NAME commonTestUtils) -diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt -index 7c1d89eabf..2fbd8fc324 100644 ---- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt -+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt -@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) + add_dependencies(fuzz ${test_name}) - list(APPEND EXPORT_DEPENDENCIES - commonTestUtils_s -- inference_engine_s -- gmock) -+ inference_engine_s) +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 2d61c5fd7..97b372998 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -12,10 +12,9 @@ endif() - addIeTarget( - NAME ${TARGET_NAME} -diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index f028ebdd8a..9c5bd53466 100644 ---- a/inference-engine/thirdparty/CMakeLists.txt -+++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -62,14 +62,13 @@ else() - target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>") + add_subdirectory(ittapi) + add_subdirectory(itt_collector EXCLUDE_FROM_ALL) +-add_subdirectory(zlib EXCLUDE_FROM_ALL) + add_subdirectory(cnpy EXCLUDE_FROM_ALL) + if(ENABLE_INTEL_GPU) +- add_subdirectory(ocl) ++ #add_subdirectory(ocl) endif() --add_subdirectory(ade EXCLUDE_FROM_ALL) - add_subdirectory(fluid/modules/gapi) + add_subdirectory(xbyak EXCLUDE_FROM_ALL) +@@ -52,21 +51,16 @@ 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) -+set_target_properties(fluid PROPERTIES FOLDER thirdparty) - - # developer package - -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) - if (NOT USE_SYSTEM_PUGIXML) - set_target_properties(pugixml PROPERTIES FOLDER thirdparty) -diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt -index 501bfffb4b..b45612c19c 100644 ---- a/ngraph/python/CMakeLists.txt -+++ b/ngraph/python/CMakeLists.txt -@@ -17,17 +17,7 @@ endif() +-ov_install_static_lib(ade openvino_common) + ov_install_static_lib(fluid openvino_common) - include(FetchContent) + # + # Gflags + # --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY "https://github.com/pybind/pybind11.git"; -- GIT_TAG "v2.5.0" --) +-add_subdirectory(gflags EXCLUDE_FROM_ALL) +-openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags) - --FetchContent_GetProperties(pybind11) --if(NOT pybind11_POPULATED) -- FetchContent_Populate(pybind11) -- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) --endif() -+add_subdirectory(pybind11) - - # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 - set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) -diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt -index b9400d9e7e..669938526c 100644 ---- a/tests/fuzz/src/CMakeLists.txt -+++ b/tests/fuzz/src/CMakeLists.txt -@@ -10,7 +10,6 @@ add_custom_target(fuzz) - FILE(GLOB tests "*-fuzzer.cc") + # + # Google Tests framework + # +@@ -89,13 +83,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}) - add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) --add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) + 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) +@@ -104,8 +98,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) - foreach(test_source ${tests}) - get_filename_component(test_name ${test_source} NAME_WE) -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 2c6b656408..4e86bd21ef 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -5,6 +5,5 @@ - add_subdirectory(ittapi) - add_subdirectory(itt_collector) - add_subdirectory(xbyak EXCLUDE_FROM_ALL) --add_subdirectory(zlib EXCLUDE_FROM_ALL) - add_subdirectory(cnpy EXCLUDE_FROM_ALL) - openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak) +@@ -116,7 +110,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 5571cd5f78..e30604927a 100644 +index 041031e92..793de9845 100644 --- a/thirdparty/cnpy/CMakeLists.txt +++ b/thirdparty/cnpy/CMakeLists.txt -@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") - target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) +@@ -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) +target_link_libraries(${TARGET_NAME} PUBLIC z) - target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/..") + target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") --set_target_properties(cnpy PROPERTIES FOLDER thirdparty) -\ No newline at end of file -+set_target_properties(cnpy PROPERTIES FOLDER thirdparty) + set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) -- -2.32.0 +2.35.1 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch deleted file mode 100644 index 5e7cfb38..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Wed, 10 Jun 2020 09:45:48 +0800 -Subject: [PATCH] Disable Werror - -Don't treat warnings as errors. This just leads to failures every time -we upgrade the compiler. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <[email protected]> ---- - inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 - - ngraph/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt -index d14da47860..08ed695c0d 100644 ---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt -+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt -@@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") - MultiProcessorCompilation - DeadCodeEliminate - ExtensionsEnabled -- TreatWarnAsErrorEnabled - WarnLevel4 - NoFastMath - StackProtector -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index a05ca3b15c..ae888c4cb2 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -197,7 +197,6 @@ if (WIN32) - endif() - - if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") - endif() - - if(WIN32) --- -2.32.0 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch similarity index 15% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch index 145f2585..9e2b46fd 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/0002-inference-engine-installation-fixes.patch @@ -1,326 +1,348 @@ -From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001 +From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> -Date: Thu, 11 Jun 2020 14:24:04 +0800 -Subject: [PATCH] cmake installation fixes +Date: Mon, 11 Apr 2022 11:11:23 +0800 +Subject: [PATCH] Fix installation of binaries and libraries -Make sure that libraries/samples/binaries are installed correctly. +Make sure binaries are installed correctly. + +Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- - CMakeLists.txt | 15 -------- - .../IEDevScriptsConfig.cmake | 2 +- - cmake/developer_package/packaging.cmake | 8 +++-- - cmake/developer_package/plugins/plugins.cmake | 2 +- - .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++ - inference-engine/samples/CMakeLists.txt | 4 ++- - .../common/format_reader/CMakeLists.txt | 4 ++- - .../src/inference_engine/CMakeLists.txt | 35 ++----------------- - .../src/preprocessing/CMakeLists.txt | 2 +- - .../src/readers/ir_reader/CMakeLists.txt | 2 +- - .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- - .../tests/unit/cpu/CMakeLists.txt | 2 ++ - .../unit/inference_engine/CMakeLists.txt | 2 ++ - .../tests/unit/vpu/CMakeLists.txt | 2 ++ - .../tools/compile_tool/CMakeLists.txt | 2 +- - ngraph/CMakeLists.txt | 8 ++--- - 16 files changed, 32 insertions(+), 62 deletions(-) + 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 e0706a72e8..7920de9a42 100644 +index fe62c6318..344d9398f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}" - - # install setupvars - --ie_cpack_add_component(setupvars REQUIRED) -- - if(UNIX) -- install(PROGRAMS scripts/setupvars/setupvars.sh -- DESTINATION bin -- COMPONENT setupvars) - elseif(WIN32) - install(PROGRAMS scripts/setupvars/setupvars.bat - DESTINATION bin -@@ -195,22 +190,12 @@ endif() - # install install_dependencies - - if(UNIX) -- ie_cpack_add_component(install_dependencies REQUIRED) -- install(DIRECTORY scripts/install_dependencies/ -- DESTINATION install_dependencies -- COMPONENT install_dependencies) - endif() +@@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake) + add_subdirectory(docs) + add_subdirectory(tools) + add_subdirectory(scripts) +-add_subdirectory(licensing) ++#add_subdirectory(licensing) - # install files for demo + # + # CPack +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index 39b23fe65..aa638c077 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 + # --ie_cpack_add_component(demo_scripts DEPENDS core) +-set(FRONTEND_INSTALL_INCLUDE "runtime/include/") ++set(FRONTEND_INSTALL_INCLUDE "include/") + set(FRONTEND_NAME_PREFIX "openvino_") + set(FRONTEND_NAME_SUFFIX "_frontend") - if(UNIX) -- install(DIRECTORY scripts/demo/ -- DESTINATION deployment_tools/demo -- COMPONENT demo_scripts -- USE_SOURCE_PERMISSIONS -- PATTERN *.bat EXCLUDE) - elseif(WIN32) - install(DIRECTORY scripts/demo/ - DESTINATION deployment_tools/demo -diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake -index 0e1fe76db2..97867a24f8 100644 ---- a/cmake/developer_package/IEDevScriptsConfig.cmake -+++ b/cmake/developer_package/IEDevScriptsConfig.cmake -@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT) - if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) - message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") - endif() -- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR}) -+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR}) - endif() - - # Enable postfixes for Debug/Release builds diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake -index 2b5e945b17..adc4bef0bc 100644 +index cc287ff1f..2daee6611 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake -@@ -5,7 +5,9 @@ - include(CPackComponent) - unset(IE_CPACK_COMPONENTS_ALL CACHE) - --set(IE_CPACK_IE_DIR deployment_tools/inference_engine) -+if (NOT DEFINED IE_CPACK_IE_DIR) -+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine) -+endif() - - # - # ie_cpack_set_library_dir() -@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir) - set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE) +@@ -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 ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) -- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE) +- set(IE_CPACK_LIBRARY_PATH 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 ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} 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 aae1dbb7fb..e6dac2a478 100644 +index a630d6c35..779c43631 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake -@@ -124,7 +124,7 @@ function(ie_add_plugin) +@@ -138,7 +138,7 @@ function(ie_add_plugin) - install(TARGETS ${IE_PLUGIN_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) - endif() - endfunction() - -diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt -index 45b2b3e9ed..55f7dfd214 100644 ---- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt -+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt -@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) - if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) + 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 86b0e8652..4f31d3cc4 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 8101b5e32..6abe8c20c 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 a8e6e5172..aa3d2fe0e 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/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt -index ae93857944..fba24c6fed 100644 ---- a/inference-engine/samples/CMakeLists.txt -+++ b/inference-engine/samples/CMakeLists.txt -@@ -33,7 +33,7 @@ endif() +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 3433dee0e..0c0fa0723 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -222,6 +222,8 @@ macro(ie_add_sample) + EXCLUDE_FROM_ALL + ) - if(IE_MAIN_SOURCE_DIR) - # in case if samples are built from IE repo -- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR}) -+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR}) - # hint for find_package(InferenceEngine in the samples folder) - set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") - # hint for find_package(ngraph in the samples folder) -@@ -256,6 +256,8 @@ macro(ie_add_sample) - if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT) - add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS}) - endif() -+ + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) - endmacro() ++ + # 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 9ad26ba95..0853e2370 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" - # 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 d75061e56c..a2f8bd6397 100644 ---- a/inference-engine/samples/common/format_reader/CMakeLists.txt -+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt -@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} + # install setupvars - if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) --endif() -\ No newline at end of file -+endif() -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt -index 5d044e097c..103c187913 100644 ---- a/inference-engine/src/inference_engine/CMakeLists.txt -+++ b/inference-engine/src/inference_engine/CMakeLists.txt -@@ -227,35 +227,6 @@ list(APPEND core_components ngraph) - list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR" - "IE_PARALLEL_CMAKE") +-ie_cpack_add_component(setupvars REQUIRED) ++#ie_cpack_add_component(setupvars REQUIRED) --if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP}) -- ie_cpack_add_component(tbb REQUIRED) -- list(APPEND core_components tbb) -- -- install(DIRECTORY "${TBB}/include" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- install(DIRECTORY "${TBB}/lib" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- if(EXISTS "${TBB}/bin") -- install(DIRECTORY "${TBB}/bin" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- endif() -- install(FILES "${TBB}/LICENSE" -- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb -- COMPONENT tbb) -- -- set(IE_TBB_DIR_INSTALL "external/tbb/cmake") -- set(IE_TBB_DIR "${TBB_DIR}") -- list(APPEND PATH_VARS "IE_TBB_DIR") -- -- install(FILES "${TBB}/cmake/TBBConfig.cmake" -- "${TBB}/cmake/TBBConfigVersion.cmake" -- DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL} -- COMPONENT tbb) --endif() -- - # Install Inference Engine + if(UNIX) + set(_setupvars_file setupvars/setupvars.sh) +@@ -43,13 +43,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) - ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) -@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + # install install_dependencies - install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml -- DESTINATION ${IE_CPACK_RUNTIME_PATH} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT core) +-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 9200d0bda..b3636e071 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 cmake scripts -@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml - install(EXPORT InferenceEngineTargets - FILE InferenceEngineTargets.cmake - NAMESPACE IE:: -- DESTINATION ${IE_CPACK_IE_DIR}/share -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine + 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 c46548468..3d65a20a5 100644 +--- a/src/cmake/openvino.cmake ++++ b/src/cmake/openvino.cmake +@@ -59,8 +59,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) + + # --------------- OpenVINO runtime library dev ------------------------------ + add_library(${TARGET_NAME}_dev INTERFACE) +@@ -96,7 +96,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 +@@ -115,7 +115,7 @@ endif() + install(EXPORT OpenVINOTargets + FILE OpenVINOTargets.cmake + NAMESPACE openvino:: +- DESTINATION runtime/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO COMPONENT core_dev) - set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph") -@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers + set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core") +@@ -161,10 +161,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" - "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" -- DESTINATION ${IE_CPACK_IE_DIR}/share + "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake" +- DESTINATION runtime/cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine COMPONENT core_dev) -diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt -index f9548339d1..2670a04b60 100644 ---- a/inference-engine/src/preprocessing/CMakeLists.txt -+++ b/inference-engine/src/preprocessing/CMakeLists.txt -@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME}) - install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) -diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt -index 6d2bd39f3c..0722702055 100644 ---- a/inference-engine/src/readers/ir_reader/CMakeLists.txt -+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt -@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) + install(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 e41e286c9..11aaffca6 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}) - install(TARGETS ${TARGET_NAME} - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core -- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) -diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -index a3e0182ed9..1b0e241485 100644 ---- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt -@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL + 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 cc64b94ca..5f0dcf20c 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -114,7 +114,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" +@@ -130,5 +130,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 ddd2fdcbc..f4ad1e623 100644 +--- a/src/inference/CMakeLists.txt ++++ b/src/inference/CMakeLists.txt +@@ -204,7 +204,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 3993bd973..99287bad5 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 5bba4235f..69c1470a7 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 12a2f15e4..893146294 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 # install if (LINUX) - install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules -- DESTINATION ${IE_CPACK_IE_DIR}/external + install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules +- DESTINATION runtime/3rdparty + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d COMPONENT myriad) endif() -diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt -index dfa8ce9d3f..88e7fbf67f 100644 ---- a/inference-engine/tests/unit/cpu/CMakeLists.txt -+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt -@@ -25,3 +25,5 @@ addIeTargetTest( - ie_faster_build(${TARGET_NAME} - UNITY - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -index 5c38c77b9b..927f93484f 100644 ---- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt -+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt -@@ -26,3 +26,5 @@ addIeTargetTest( - 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 fcb9f567bb..d4ac1952b8 100644 ---- a/inference-engine/tests/unit/vpu/CMakeLists.txt -+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt -@@ -33,3 +33,5 @@ addIeTargetTest( - VPU - MYRIAD - ) -+ -+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt -index 6e6f384289..a76ba55e64 100644 ---- a/inference-engine/tools/compile_tool/CMakeLists.txt -+++ b/inference-engine/tools/compile_tool/CMakeLists.txt -@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index c8638f7fd..ba30641c5 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 d19eb5cc1..9fc929cbb 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 deployment_tools/tools/compile_tool -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- RUNTIME DESTINATION tools/compile_tool ++ RUNTIME DESTINATION bin COMPONENT core_tools) - install(FILES README.md -diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt -index 830fb3eb36..3093596e4a 100644 ---- a/ngraph/CMakeLists.txt -+++ b/ngraph/CMakeLists.txt -@@ -183,10 +183,10 @@ endif() - message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}") - - # Destinations --set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}") --set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}") --set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}") --set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}") -+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") -+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") -+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") -+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") - - #----------------------------------------------------------------------------------------------- - # Compile Flags for nGraph... +-install(FILES README.md +- DESTINATION tools/compile_tool +- COMPONENT core_tools) ++#install(FILES README.md ++# DESTINATION tools/compile_tool ++# COMPONENT core_tools) -- -2.32.0 +2.35.1 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb similarity index 48% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb index 14a3c8ee..f0db80e8 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb @@ -4,64 +4,80 @@ 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/2021/4;lfs=0 \ +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \ https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \ https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \ - git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ + git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \ + git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \ 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/ngraph/python/pybind11;name=pybind11;branch=master \ + git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \ + git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \ + 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=master \ + git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \ file://0001-inference-engine-use-system-installed-packages.patch \ - file://0002-Disable-Werror.patch \ - file://0003-inference-engine-installation-fixes.patch \ - file://0001-dont-install-licenses-and-version-file.patch \ + file://0002-inference-engine-installation-fixes.patch \ " -SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8" -SRCREV_mkl = "60f41b3a9988ce7b1bc85c4f1ce7f9443bc91c9d" +SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e" +SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8" +SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6" SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" -SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" +SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b" +SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea" +SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c" +SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1" +SRCREV_omz = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1" SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf" SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5" -LICENSE = "Apache-2.0 & ISSL & MIT" +LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \ file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ - file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ + file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ + 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://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ + file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ + file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \ " -LICENSE:${PN}-vpu-firmware = "ISSL" inherit cmake python3native S = "${WORKDIR}/git" - EXTRA_OECMAKE += " \ - -DENABLE_OPENCV=0 \ + -DENABLE_OPENCV=OFF \ + -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \ -DENABLE_PLUGIN_RPATH=0 \ - -DENABLE_GNA=0 \ + -DENABLE_INTEL_GNA=OFF \ -DPYTHON_EXECUTABLE=${PYTHON} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \ - -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 \ + -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ + -DENABLE_SAMPLES=ON \ -DTREAT_WARNING_AS_ERROR=FALSE \ - -DENABLE_SPEECH_DEMO=FALSE \ -DENABLE_DATA=FALSE \ - -DUSE_SYSTEM_PUGIXML=TRUE \ + -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 \ " DEPENDS += "libusb1 \ ade \ opencv \ pugixml \ + protobuf \ protobuf-native \ tbb \ zlib \ + ocl-icd \ " COMPATIBLE_HOST = '(x86_64).*-linux' @@ -72,25 +88,19 @@ COMPATIBLE_HOST:libc-musl = "null" #compile with LLVM13. Enable it after upstream has fixed it. #PACKAGECONFIG ?= "vpu opencl" 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-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" +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[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-ma2x8x.mvcmd ${D}${libdir}/ - install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.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}${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}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ - mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/ + mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/ rm -rf ${D}${prefix}/python fi @@ -119,7 +129,7 @@ FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ # Move inference engine samples into a separate package PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" -FILES:${PN}-samples = "${datadir}/inference_engine \ +FILES:${PN}-samples = "${datadir}/openvino \ ${bindir} \ " FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" @@ -127,6 +137,6 @@ FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" # Package for inference engine python API PACKAGES =+ "${PN}-${PYTHON_PN}" -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" +FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" -- 2.35.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7491): https://lists.yoctoproject.org/g/meta-intel/message/7491 Mute This Topic: https://lists.yoctoproject.org/mt/90434424/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
