From c93900c6ed774496dd7a4974e76e9767e87591d3 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Fri, 1 Dec 2023 08:48:36 +0530 Subject: openvino-inference-engine: upgrade 2023.1.0 -> 2023.2.0 * Release notes: https://github.com/openvinotoolkit/openvino/releases/tag/2023.2.0 * Drop the patches which included header cstdint to fix build issues with gcc13 as these changes are already incorporated in the upstream code. * gflags and zlib are now used as bundled dependencies https://github.com/openvinotoolkit/openvino/pull/20762 * Refresh the patches Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- .../opencv/files/fix-build-with-gcc13.patch | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch') 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 deleted file mode 100644 index 9e1aa93c..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 - -* Include the headers as per: -https://gcc.gnu.org/gcc-13/porting_to.html - -* Remove -Werror for: -|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] -| 129 | virtual JitDefinitions GetDefinitions() const = 0; -| | ^~~~~~~~~~~~~~ - -* Fix: -| /data/poky/build/tmp/work/x86-64-v3-poky-linux/openvino-inference-engine/2022.3.0-r0/git/src/inference/include/ie/ie_precision.hpp: In member function 'bool InferenceEngine::Precision::operator==(const InferenceEngine::Precision&) const': -| /data/poky/build/tmp/work/x86-64-v3-poky-linux/openvino-inference-engine/2022.3.0-r0/git/src/inference/include/ie/ie_precision.hpp:153:36: error: ambiguous overload for 'operator==' (operand types are 'const InferenceEngine::Precision::ePrecision' and 'const InferenceEngine::Precision') -| 153 | return precisionInfo.value == p && precisionInfo.bitsSize == p.precisionInfo.bitsSize && -| | ~~~~~~~~~~~~~~~~~~~ ^~ ~ -| | | | -| | | const InferenceEngine::Precision -| | const InferenceEngine::Precision::ePrecision -| /data/poky/build/tmp/work/x86-64-v3-poky-linux/openvino-inference-engine/2022.3.0-r0/git/src/inference/include/ie/ie_precision.hpp:152:10: note: candidate: 'bool InferenceEngine::Precision::operator==(const InferenceEngine::Precision&) const' (reversed) -| 152 | bool operator==(const Precision& p) const noexcept { -| | ^~~~~~~~ -| /data/poky/build/tmp/work/x86-64-v3-poky-linux/openvino-inference-engine/2022.3.0-r0/git/src/inference/include/ie/ie_precision.hpp:153:36: note: candidate: 'operator==(InferenceEngine::Precision::ePrecision, InferenceEngine::Precision::ePrecision)' (built-in) -| 153 | return precisionInfo.value == p && precisionInfo.bitsSize == p.precisionInfo.bitsSize && -| | ~~~~~~~~~~~~~~~~~~~~^~~~ - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal - ---- - src/inference/include/ie/ie_precision.hpp | 2 +- - src/plugins/intel_gpu/CMakeLists.txt | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -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 -+++ b/src/inference/include/ie/ie_precision.hpp -@@ -149,7 +149,7 @@ public: - * @return `true` if values represent the same precisions, `false` otherwise - */ - bool operator==(const Precision& p) const noexcept { -- return precisionInfo.value == p && precisionInfo.bitsSize == p.precisionInfo.bitsSize && -+ return precisionInfo.value == p.precisionInfo.value && precisionInfo.bitsSize == p.precisionInfo.bitsSize && - areSameStrings(precisionInfo.name, p.precisionInfo.name); - } - -diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt -index 948aecfcfec..a1b9783068b 100644 ---- a/src/plugins/intel_gpu/CMakeLists.txt -+++ b/src/plugins/intel_gpu/CMakeLists.txt -@@ -36,9 +36,9 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") - - add_subdirectory(thirdparty) - --if(CMAKE_COMPILER_IS_GNUCXX) -- ie_add_compiler_flags(-Werror) --endif() -+#if(CMAKE_COMPILER_IS_GNUCXX) -+# ie_add_compiler_flags(-Werror) -+#endif() - - add_subdirectory(src/runtime) - add_subdirectory(src/kernel_selector) --- -2.34.1 - -- cgit v1.2.3-54-g00ecf