openvino-inference-engine: upgrade 2023.0.0 -> 2023.0.1

* Refresh patches.
* Drop Protobuf change which disabled use of static protobuf
  libs from system. This is not needed anymore as we are now
  building Protobuf as bundled dependency.

Release Notes:
https://github.com/openvinotoolkit/openvino/releases/tag/2023.0.1

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Yogesh Tyagi 2023-07-04 20:46:52 +05:30 committed by Naveen Saini
parent 1bf139602b
commit 7515d740e6
3 changed files with 22 additions and 48 deletions

View File

@ -28,12 +28,11 @@ https://gcc.gnu.org/gcc-13/porting_to.html
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
--- ---
src/inference/include/ie/ie_precision.hpp | 2 +- src/inference/include/ie/ie_precision.hpp | 2 +-
src/plugins/intel_gpu/CMakeLists.txt | 6 +++--- src/plugins/intel_gpu/CMakeLists.txt | 6 +++---
.../include/intel_gpu/graph/serialization/helpers.hpp | 1 + 2 files changed, 4 insertions(+), 4 deletions(-)
.../intel_gpu/include/intel_gpu/runtime/device_info.hpp | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/inference/include/ie/ie_precision.hpp b/src/inference/include/ie/ie_precision.hpp diff --git a/src/inference/include/ie/ie_precision.hpp b/src/inference/include/ie/ie_precision.hpp
index 48bdd945b13..96c29b73159 100644 index 48bdd945b13..96c29b73159 100644
@ -65,30 +64,6 @@ index 948aecfcfec..a1b9783068b 100644
add_subdirectory(src/runtime) add_subdirectory(src/runtime)
add_subdirectory(src/kernel_selector) 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 <utility>
#include <type_traits>
+#include <cstdint>
namespace cldnn {
template <typename T>
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 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 @@
#pragma once
+#include <cstdint>
#include <string>
#include <vector>
#include <tuple>
-- --
2.34.1 2.34.1

View File

@ -1,27 +1,32 @@
Yocto specific tweaks to the build process: Yocto specific tweaks to the build process:
* Dont try to detect glibc version as that doesn't work when cross compiling. * Dont try to detect glibc version as that doesn't work when cross compiling.
* Use shared protobuf and gflags libs. * Use shared protobuf and gflags libs.
* Install sample binaries as well. * Install sample binaries as well.
Upstream-Status: Inappropriate Upstream-Status: Inappropriate
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
cmake/developer_package/target_flags.cmake | 2 +-
samples/cpp/CMakeLists.txt | 6 +++---
thirdparty/CMakeLists.txt | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
index 0a37c910ae8..44444970ce1 100644 index ced8d519da3..505c1fa5b14 100644
--- a/cmake/developer_package/target_flags.cmake --- a/cmake/developer_package/target_flags.cmake
+++ b/cmake/developer_package/target_flags.cmake +++ b/cmake/developer_package/target_flags.cmake
@@ -136,4 +136,4 @@ function(ov_glibc_version) @@ -145,4 +145,4 @@ function(ov_glibc_version)
endif() endif()
endfunction() endfunction()
-ov_glibc_version() -ov_glibc_version()
+#ov_glibc_version() +#ov_glibc_version()
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index d2a65618071..80133c4aeb6 100644 index 37eb0250112..35ec6a3368a 100644
--- a/samples/cpp/CMakeLists.txt --- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt
@@ -221,9 +221,9 @@ macro(ie_add_sample) @@ -219,9 +219,9 @@ macro(ie_add_sample)
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES}) target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES})
install(TARGETS ${IE_SAMPLE_NAME} install(TARGETS ${IE_SAMPLE_NAME}
@ -35,10 +40,10 @@ index d2a65618071..80133c4aeb6 100644
# create global target with all samples / demo apps # create global target with all samples / demo apps
if(NOT TARGET ie_samples) if(NOT TARGET ie_samples)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index edbcb824f4b..9d24dcec560 100644 index 95d80a6fbd4..963c9a5d60a 100644
--- a/thirdparty/CMakeLists.txt --- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt
@@ -291,11 +291,11 @@ endif() @@ -353,11 +353,11 @@ endif()
if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS) if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
# on Windows and macOS we don't use gflags, because will be dynamically linked # on Windows and macOS we don't use gflags, because will be dynamically linked
if(CMAKE_HOST_LINUX AND LINUX) if(CMAKE_HOST_LINUX AND LINUX)
@ -52,14 +57,8 @@ index edbcb824f4b..9d24dcec560 100644
+ #set(gflag_component nothreads_static) + #set(gflag_component nothreads_static)
+ #endif() + #endif()
find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component}) find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
endif() else()
# conan case
@@ -352,7 +352,7 @@ endif() --
2.34.1
if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
if(ENABLE_SYSTEM_PROTOBUF)
- set(Protobuf_USE_STATIC_LIBS ON)
+ #set(Protobuf_USE_STATIC_LIBS ON)
if(CMAKE_VERBOSE_MAKEFILE)
set(Protobuf_DEBUG ON)
endif()

View File

@ -19,7 +19,7 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=r
file://0001-protobuf-allow-target-protoc-to-be-built.patch \ file://0001-protobuf-allow-target-protoc-to-be-built.patch \
" "
SRCREV = "b4452d5630442e91cf84db5acd3d991f3d1f34c2" SRCREV = "fa1c41994f3f84329491de93ce572f1401bc75ae"
SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54" SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54"
SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15" SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15"
SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"