* 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 <[email protected]> --- ...pecific-tweaks-to-the-build-process.patch} | 65 ++++++----------- ...g-directory-to-source-to-workaround.patch} | 18 +++-- ...3-cmake-Fix-overloaded-virtual-error.patch | 33 +++++++++ ...buf-allow-target-protoc-to-be-built.patch} | 26 +++---- ...c9138b89e1946e3e515727bb69b2ab119806.patch | 32 --------- .../opencv/files/fix-build-with-gcc13.patch | 69 ------------------- .../files/onednn-fix-build-with-gcc13.patch | 17 ----- ... => openvino-inference-engine_2023.2.0.bb} | 32 +++++---- 8 files changed, 98 insertions(+), 194 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{fix-build.patch => 0001-cmake-yocto-specific-tweaks-to-the-build-process.patch} (59%) rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{cython-cmake.patch => 0002-Change-the-working-directory-to-source-to-workaround.patch} (63%) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/files/{0001-protobuf-allow-target-protoc-to-be-built.patch => 0004-protobuf-allow-target-protoc-to-be-built.patch} (67%) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/7cecc9138b89e1946e3e515727bb69b2ab119806.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/onednn-fix-build-with-gcc13.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/{openvino-inference-engine_2023.1.0.bb => openvino-inference-engine_2023.2.0.bb} (81%) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch similarity index 59% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch index 292c534a..7ab31309 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch @@ -1,10 +1,9 @@ -From a704afcc9e238dceafb3b1bc91b0b8abed3593eb Mon Sep 17 00:00:00 2001 +From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> -Date: Thu, 21 Sep 2023 14:07:28 +0800 -Subject: [PATCH] cmake: yocto specific tweaks to the build process +Date: Wed, 29 Nov 2023 12:42:57 +0530 +Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process * Dont try to detect glibc version as that doesn't work when cross compiling. -* Use shared gflags libs. * Install sample binaries as well. * Dont strip binaries. * Dont try to write triggers for CPack. We package ourselves. @@ -14,19 +13,18 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> --- - cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- - cmake/developer_package/target_flags.cmake | 2 +- - samples/cpp/CMakeLists.txt | 6 +++--- - src/bindings/python/CMakeLists.txt | 2 +- - src/bindings/python/wheel/setup.py | 1 - - thirdparty/dependencies.cmake | 10 +++++----- - 6 files changed, 11 insertions(+), 12 deletions(-) + cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- + cmake/developer_package/target_flags.cmake | 2 +- + samples/cpp/CMakeLists.txt | 6 +++--- + src/bindings/python/CMakeLists.txt | 2 +- + src/bindings/python/wheel/setup.py | 1 - + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake -index 0609750054f..0f5c7765197 100644 +index a7c0ec2cf61..40448e8a962 100644 --- a/cmake/developer_package/packaging/rpm/rpm.cmake +++ b/cmake/developer_package/packaging/rpm/rpm.cmake -@@ -161,7 +161,7 @@ ov_rpm_specific_settings() +@@ -154,7 +154,7 @@ ov_rpm_specific_settings() # needed to add triggers for packages with libraries set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") @@ -46,13 +44,13 @@ index 29f23e713e1..942dd445b19 100644 -ov_glibc_version() +#ov_glibc_version() diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index 8849aaf47d1..450b57c18d6 100644 +index c814cc37e2c..431e7bd2ed3 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt -@@ -223,9 +223,9 @@ macro(ie_add_sample) - target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES}) +@@ -206,9 +206,9 @@ macro(ov_add_sample) + target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) - install(TARGETS ${IE_SAMPLE_NAME} + install(TARGETS ${SAMPLE_NAME} - RUNTIME DESTINATION samples_bin/ - COMPONENT samples_bin - EXCLUDE_FROM_ALL) @@ -61,12 +59,12 @@ index 8849aaf47d1..450b57c18d6 100644 + # create global target with all samples / demo apps - if(NOT TARGET ie_samples) + if(NOT TARGET ov_samples) diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt -index f337f403189..21012162093 100644 +index 58ff9b74302..4763994ba56 100644 --- a/src/bindings/python/CMakeLists.txt +++ b/src/bindings/python/CMakeLists.txt -@@ -314,7 +314,7 @@ if(ENABLE_PYTHON_PACKAGING) +@@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING) endif() set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") @@ -76,38 +74,17 @@ index f337f403189..21012162093 100644 set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO") diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py -index 04323a8ba49..0498dcdc126 100644 +index 4b056912212..5f05d891310 100644 --- a/src/bindings/python/wheel/setup.py +++ b/src/bindings/python/wheel/setup.py @@ -270,7 +270,6 @@ class CustomBuild(build): self.spawn(["cmake", "--install", binary_dir, "--prefix", prefix, - "--config", "Release", + "--config", CONFIG, - "--strip", "--component", cpack_comp_name]) def run(self): -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 43e0ed671a9..b39479fdd6b 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -338,11 +338,11 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS) - elseif(APPLE OR WIN32) - # on Windows and macOS we don't use gflags, because will be dynamically linked - elseif(CMAKE_HOST_LINUX AND 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() - -- -2.37.3 +2.34.1 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch similarity index 63% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch index 45ed0d27..e6fe3271 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch @@ -1,14 +1,21 @@ -Change the working directory to source to workaround cython -embedding absolute path to the pyx file in output. +From a0ea332df477480f90d9dc841faf71f4b5be892e Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Wed, 29 Nov 2023 12:45:59 +0530 +Subject: [PATCH 2/4] Change the working directory to source to workaround + cython embedding absolute path to the pyx file in output. Upstream-Status: Inappropriate [OE build specific] + Signed-off-by: Anuj Mittal <[email protected]> +--- + .../python/src/compatibility/openvino/cmake/UseCython.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake -index f14662ad50..8d199fe328 100644 +index 03a208f03c2..be9af591b34 100644 --- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake +++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake -@@ -259,7 +259,7 @@ function( compile_pyx _name generated_file ) +@@ -258,7 +258,7 @@ function( compile_pyx _name generated_file ) add_custom_command( OUTPUT ${_generated_file} COMMAND ${CYTHON_EXECUTABLE} ARGS ${cxx_arg} ${include_directory_arg} ${version_arg} @@ -17,3 +24,6 @@ index f14662ad50..8d199fe328 100644 --output-file ${_generated_file} ${pyx_locations} DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies} IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies} +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch new file mode 100644 index 00000000..e0967d55 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch @@ -0,0 +1,33 @@ +From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Wed, 29 Nov 2023 12:49:35 +0530 +Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error + +* 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; +| | + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <[email protected]> +--- + src/plugins/intel_gpu/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt +index b0c66a435d6..a3037147cc2 100644 +--- a/src/plugins/intel_gpu/CMakeLists.txt ++++ b/src/plugins/intel_gpu/CMakeLists.txt +@@ -38,7 +38,7 @@ add_subdirectory(thirdparty) + include(thirdparty/cmake/rapidjson.cmake) + + if(CMAKE_COMPILER_IS_GNUCXX) +- ov_add_compiler_flags(-Werror) ++ #ov_add_compiler_flags(-Werror) + endif() + + add_subdirectory(src/runtime) +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch similarity index 67% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch rename to dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch index 6bc54335..59095133 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch @@ -1,7 +1,7 @@ -From 450a1ba74eb5a6cf3946d8ae84b7de5bc97ccb35 Mon Sep 17 00:00:00 2001 +From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <[email protected]> -Date: Tue, 13 Jun 2023 12:34:08 +0800 -Subject: [PATCH] protobuf: allow target protoc to be built +Date: Wed, 29 Nov 2023 12:55:19 +0530 +Subject: [PATCH 4/4] protobuf: allow target protoc to be built We can run target binaries using a qemu wrapper so allow these to be built and run. @@ -15,23 +15,23 @@ Signed-off-by: Anuj Mittal <[email protected]> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake -index 897e6f8e3a6..32b136fcea9 100644 +index 49c5b881030..2a1ea8562bc 100644 --- a/cmake/developer_package/frontends/frontends.cmake +++ b/cmake/developer_package/frontends/frontends.cmake -@@ -146,7 +146,7 @@ macro(ov_add_frontend) - set(GENERATED_PROTO ${INFILE}) +@@ -143,7 +143,7 @@ macro(ov_add_frontend) + set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) add_custom_command( OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" -- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto -+ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto - DEPENDS ${PROTOC_DEPENDENCY} ${GENERATED_PROTO} - COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}" +- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} ++ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} + DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} + COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" VERBATIM diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt -index 79e69a47b09..087f9e838c2 100644 +index 4b6d6da87f3..409e492a5b3 100644 --- a/thirdparty/protobuf/CMakeLists.txt +++ b/thirdparty/protobuf/CMakeLists.txt -@@ -27,7 +27,7 @@ set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE) +@@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen if(CMAKE_CROSSCOMPILING OR (APPLE AND (HOST_X86_64 AND AARCH64)) OR (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) @@ -41,5 +41,5 @@ index 79e69a47b09..087f9e838c2 100644 set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) endif() -- -2.37.3 +2.34.1 diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/7cecc9138b89e1946e3e515727bb69b2ab119806.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/7cecc9138b89e1946e3e515727bb69b2ab119806.patch deleted file mode 100644 index f744bd19..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/7cecc9138b89e1946e3e515727bb69b2ab119806.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7cecc9138b89e1946e3e515727bb69b2ab119806 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Thu, 26 May 2022 07:11:37 +0100 -Subject: [PATCH] add missing <cstdint> header inclusion (gcc-13 support) - -Without the change ade build fails on this week's gcc-13 snapshot as: - - [ 77%] Building CXX object sources/ade/CMakeFiles/ade.dir/source/topological_sort.cpp.o - In file included from ade/sources/ade/include/ade/passes/topological_sort.hpp:17, - from ade/sources/ade/source/topological_sort.cpp:7: - ade/sources/ade/include/ade/typed_graph.hpp:101:10: error: 'uintptr_t' in namespace 'std' does not name a type - 101 | std::uintptr_t m_srcGraph; - | ^~~~~~~~~ - -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <[email protected]> ---- - sources/ade/include/ade/typed_graph.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sources/ade/include/ade/typed_graph.hpp b/sources/ade/include/ade/typed_graph.hpp -index d9676e6..8a27578 100644 ---- a/sources/ade/include/ade/typed_graph.hpp -+++ b/sources/ade/include/ade/typed_graph.hpp -@@ -9,6 +9,7 @@ - #ifndef ADE_TYPED_GRAPH_HPP - #define ADE_TYPED_GRAPH_HPP - -+#include <cstdint> - #include <unordered_set> - #include <string> - 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 <[email protected]> -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 <[email protected]> - ---- - 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 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/onednn-fix-build-with-gcc13.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/onednn-fix-build-with-gcc13.patch deleted file mode 100644 index 3063dc93..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/onednn-fix-build-with-gcc13.patch +++ /dev/null @@ -1,17 +0,0 @@ -include cstdint header for gcc13 - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal <[email protected]> - -diff --git a/src/gpu/jit/gemm/kernel_catalog.hpp b/src/gpu/jit/gemm/kernel_catalog.hpp -index 8e6e1f3b6..3c8e29981 100644 ---- a/src/gpu/jit/gemm/kernel_catalog.hpp -+++ b/src/gpu/jit/gemm/kernel_catalog.hpp -@@ -20,6 +20,7 @@ - #include <string> - #include <tuple> - #include <vector> -+#include <cstdint> - - #include "gen_gemm_kernel_common.hpp" - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.2.0.bb similarity index 81% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.1.0.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.2.0.bb index 1b93b0ce..7df511f0 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.1.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.2.0.bb @@ -4,36 +4,40 @@ 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;name=openvino;branch=releases/2023/1;lfs=0 \ +SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2023/2;lfs=0 \ 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/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 \ git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ - file://fix-build.patch \ - file://cython-cmake.patch \ - file://7cecc9138b89e1946e3e515727bb69b2ab119806.patch;patchdir=thirdparty/ade \ - file://fix-build-with-gcc13.patch \ - file://onednn-fix-build-with-gcc13.patch;patchdir=src/plugins/intel_gpu/thirdparty/onednn_gpu \ - file://0001-protobuf-allow-target-protoc-to-be-built.patch \ + git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \ + git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \ + file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ + file://0002-Change-the-working-directory-to-source-to-workaround.patch \ + file://0003-cmake-Fix-overloaded-virtual-error.patch \ + file://0004-protobuf-allow-target-protoc-to-be-built.patch \ " -SRCREV_openvino = "47b736f63edda256d66e2bbb572f42a9d6549f6e" -SRCREV_mkl = "ae825539bd850d1ad5c83d4bb0d56c65d46d5842" -SRCREV_onednn = "4b82a66ed38ecaa993352e5cc6ed7753656b8a26" +SRCREV_openvino = "7e18bd074a2487a7a98adcd313abd09c58d88072" +SRCREV_mkl = "2ead5d4fe5993a797d9a7a4b8b5557b96f6ec90e" +SRCREV_onednn = "284ad4574939fa784e4ddaa1f4aa577b8eb7a017" SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" -SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" +SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" -SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf" +SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" +SRCREV_zlib = "04f42ceca40f73e2978b50e93806c2a18c1281fc" +SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib" -LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" +LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \ + file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \ file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ " @@ -64,14 +68,12 @@ EXTRA_OECMAKE += " \ DEPENDS += "\ flatbuffers-native \ - gflags \ pugixml \ python3-pybind11 \ python3-pybind11-native \ qemu-native \ snappy \ tbb \ - zlib \ " COMPATIBLE_HOST = '(x86_64).*-linux' -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8174): https://lists.yoctoproject.org/g/meta-intel/message/8174 Mute This Topic: https://lists.yoctoproject.org/mt/102908746/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
