From 348511101c7095fef20aa46e21104e98bdaf44ba Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Thu, 8 Jun 2023 12:28:23 +0530 Subject: openvino-inference-engine: upgrade 2022.3.0 -> 2023.0.0 * OpenVINO no longer supports vpu so remove the vpu PACKAGECONFIG and references. * Now allows snappy compression to be used for TF frontend so allow system installed snappy. * Flatbuffers is now needed for TF Lite frontend. * Refresh patches. Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- .../opencv/files/fix-build-with-gcc13.patch | 64 +++++++--------------- .../recipes-support/opencv/files/fix-build.patch | 46 ++++------------ 2 files changed, 31 insertions(+), 79 deletions(-) (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch index 7089bc9c..4157c846 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch @@ -1,4 +1,4 @@ -From aac55921864fa91fe8e394a25fc565f28ae5fc64 Mon Sep 17 00:00:00 2001 +From f8ad3f859aadc6c81ccc667eee1439cc2e6113cf Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 30 May 2023 09:31:09 +0800 Subject: [PATCH] fix build with gcc13 @@ -29,50 +29,12 @@ https://gcc.gnu.org/gcc-13/porting_to.html Upstream-Status: Pending Signed-off-by: Anuj Mittal --- - src/common/itt/include/openvino/itt.hpp | 1 + - src/common/preprocessing/ie_preprocess_gapi_kernels.hpp | 1 + - src/common/util/include/openvino/util/file_util.hpp | 1 + src/inference/include/ie/ie_precision.hpp | 2 +- src/plugins/intel_gpu/CMakeLists.txt | 6 +++--- + .../include/intel_gpu/graph/serialization/helpers.hpp | 1 + .../intel_gpu/include/intel_gpu/runtime/device_info.hpp | 1 + - 6 files changed, 8 insertions(+), 4 deletions(-) + 4 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/src/common/itt/include/openvino/itt.hpp b/src/common/itt/include/openvino/itt.hpp -index c978ca1b138..f01d59a652a 100644 ---- a/src/common/itt/include/openvino/itt.hpp -+++ b/src/common/itt/include/openvino/itt.hpp -@@ -8,6 +8,7 @@ - */ - - #pragma once -+#include - #include - #include - #include -diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp b/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp -index dfbb182b7a0..0887cc60e34 100644 ---- a/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp -+++ b/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp -@@ -8,6 +8,7 @@ - # error non standalone GAPI - # endif - -+#include - #include - - #include -diff --git a/src/common/util/include/openvino/util/file_util.hpp b/src/common/util/include/openvino/util/file_util.hpp -index d2f2e00ff60..88e641526ab 100644 ---- a/src/common/util/include/openvino/util/file_util.hpp -+++ b/src/common/util/include/openvino/util/file_util.hpp -@@ -4,6 +4,7 @@ - - #pragma once - -+#include - #include - #include - #include diff --git a/src/inference/include/ie/ie_precision.hpp b/src/inference/include/ie/ie_precision.hpp index 48bdd945b13..96c29b73159 100644 --- a/src/inference/include/ie/ie_precision.hpp @@ -87,10 +49,10 @@ index 48bdd945b13..96c29b73159 100644 } diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt -index ab4d7618c30..4c93024eb3c 100644 +index 948aecfcfec..a1b9783068b 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt -@@ -34,9 +34,9 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") +@@ -36,9 +36,9 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") add_subdirectory(thirdparty) @@ -103,8 +65,20 @@ index ab4d7618c30..4c93024eb3c 100644 add_subdirectory(src/runtime) add_subdirectory(src/kernel_selector) +diff --git a/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp b/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp +index 391629baba2..40efe7011c6 100644 +--- a/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp ++++ b/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp +@@ -5,6 +5,7 @@ + #pragma once + #include + #include ++#include + + namespace cldnn { + template diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp -index 0c5a7177d30..7119417185c 100644 +index 387a319cbe1..e2a7b1fc0fa 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp @@ -4,6 +4,7 @@ @@ -116,5 +90,5 @@ index 0c5a7177d30..7119417185c 100644 #include #include -- -2.37.3 +2.34.1 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 index 86ed2a96..4e3a4b02 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch @@ -8,31 +8,20 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake -index e6c72540288..fec9996db14 100644 +index 0a37c910ae8..44444970ce1 100644 --- a/cmake/developer_package/target_flags.cmake +++ b/cmake/developer_package/target_flags.cmake -@@ -123,4 +123,4 @@ function(ov_glibc_version) +@@ -136,4 +136,4 @@ function(ov_glibc_version) endif() endfunction() -ov_glibc_version() +#ov_glibc_version() -diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt -index 40c29d3c297..f6800592de9 100644 ---- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt -+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt -@@ -32,5 +32,4 @@ endif() - install( - TARGETS ${TARGET_NAME} - RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL -- LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL --) -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin) diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index 1fe54c602e8..01c86d418d9 100644 +index d2a65618071..80133c4aeb6 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt -@@ -230,9 +230,8 @@ macro(ie_add_sample) +@@ -221,9 +221,9 @@ macro(ie_add_sample) target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES}) install(TARGETS ${IE_SAMPLE_NAME} @@ -41,42 +30,31 @@ index 1fe54c602e8..01c86d418d9 100644 - EXCLUDE_FROM_ALL) + DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT samples_bin) ++ # create global target with all samples / demo apps if(NOT TARGET ie_samples) -diff --git a/samples/cpp/common/format_reader/CMakeLists.txt b/samples/cpp/common/format_reader/CMakeLists.txt -index 7c07bf07dbb..4cd566749e5 100644 ---- a/samples/cpp/common/format_reader/CMakeLists.txt -+++ b/samples/cpp/common/format_reader/CMakeLists.txt -@@ -44,5 +44,5 @@ endif() - install( - TARGETS ${TARGET_NAME} - RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL -- LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL -+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin - ) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index cf2863438c7..3ec5c5ed86b 100644 +index edbcb824f4b..9d24dcec560 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -268,11 +268,11 @@ endif() - +@@ -291,11 +291,11 @@ endif() if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS) - if(LINUX) + # on Windows and macOS we don't use gflags, because will be dynamically linked + if(CMAKE_HOST_LINUX AND LINUX) - if(OV_OS_RHEL) -- set(gflag_component nothreads_shared) ++ #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() -@@ -329,7 +329,7 @@ endif() +@@ -352,7 +352,7 @@ endif() if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND) if(ENABLE_SYSTEM_PROTOBUF) -- cgit v1.2.3-54-g00ecf