-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[openvino] update to 2024.5.0 #42259
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp | ||
| index 5ad28be3654422..5296e5b1b7a506 100644 | ||
| --- a/src/frontends/onnx/frontend/src/frontend.cpp | ||
| +++ b/src/frontends/onnx/frontend/src/frontend.cpp | ||
| @@ -3,6 +3,9 @@ | ||
| // | ||
|
|
||
| #include <google/protobuf/port_def.inc> | ||
| +#ifndef PROTOBUF_VERSION | ||
| +# include <google/protobuf/runtime_version.h> | ||
| +#endif | ||
| #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 | ||
| # define OV_PROTOBUF_ABSL_IS_USED | ||
| #endif | ||
| diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp | ||
| index 163b4d894cb766..2f2ca72418e5dd 100644 | ||
| --- a/src/frontends/paddle/src/frontend.cpp | ||
| +++ b/src/frontends/paddle/src/frontend.cpp | ||
| @@ -5,6 +5,9 @@ | ||
| #include "openvino/frontend/paddle/frontend.hpp" | ||
|
|
||
| #include <google/protobuf/port_def.inc> | ||
| +#ifndef PROTOBUF_VERSION | ||
| +# include <google/protobuf/runtime_version.h> | ||
| +#endif | ||
| #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 | ||
| # define OV_PROTOBUF_ABSL_IS_USED | ||
| #endif |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt | ||
| index ec1cf14bd0e60b..18d176212a0212 100644 | ||
| --- a/docs/snippets/CMakeLists.txt | ||
| +++ b/docs/snippets/CMakeLists.txt | ||
| @@ -122,12 +122,15 @@ set(TARGET_NAME_PY "ov_integration_snippet_py") | ||
| cmake_minimum_required(VERSION 3.10) | ||
| set(CMAKE_CXX_STANDARD 11) | ||
|
|
||
| -find_package(Python3 REQUIRED) | ||
| - execute_process( | ||
| - COMMAND ${Python3_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')" | ||
| - OUTPUT_VARIABLE OpenVINO_DIR_PY | ||
| - ERROR_QUIET | ||
| - ) | ||
| +if(NOT CMAKE_CROSSCOMPILING) | ||
| + find_package(Python3 QUIET COMPONENTS Interpreter) | ||
| + if(Python3_Interpreter_FOUND) | ||
| + execute_process( | ||
| + COMMAND ${Python3_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')" | ||
| + OUTPUT_VARIABLE OpenVINO_DIR_PY | ||
| + ERROR_QUIET) | ||
| + endif() | ||
| +endif() | ||
|
|
||
| find_package(OpenVINO REQUIRED PATHS "${OpenVINO_DIR_PY}") | ||
|
|
||
| diff --git a/src/core/template_extension/CMakeLists.txt b/src/core/template_extension/CMakeLists.txt | ||
| index aa8030e78d7171..3cfcfcd058ff94 100644 | ||
| --- a/src/core/template_extension/CMakeLists.txt | ||
| +++ b/src/core/template_extension/CMakeLists.txt | ||
| @@ -8,12 +8,15 @@ set(CMAKE_CXX_STANDARD 11) | ||
| set(TARGET_NAME "openvino_template_extension") | ||
|
|
||
| # The OpenVINO installed from PyPI can be used to find OpenVINO_DIR | ||
| -find_package(Python3 REQUIRED) | ||
| -execute_process( | ||
| - COMMAND ${Python3_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')" | ||
| - OUTPUT_VARIABLE OpenVINO_DIR_PY | ||
| - ERROR_QUIET | ||
| -) | ||
| +if(NOT CMAKE_CROSSCOMPILING) | ||
| + find_package(Python3 QUIET COMPONENTS Interpreter) | ||
| + if(Python3_Interpreter_FOUND) | ||
| + execute_process( | ||
| + COMMAND ${Python3_EXECUTABLE} -c "from openvino.utils import get_cmake_path; print(get_cmake_path(), end='')" | ||
| + OUTPUT_VARIABLE OpenVINO_DIR_PY | ||
| + ERROR_QUIET) | ||
| + endif() | ||
| +endif() | ||
|
|
||
| find_package(OpenVINO REQUIRED PATHS "${OpenVINO_DIR_PY}") | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | ||
| "name": "openvino", | ||
| "version": "2024.4.0", | ||
| "port-version": 5, | ||
| "version": "2024.5.0", | ||
| "maintainers": "OpenVINO Developers <[email protected]>", | ||
| "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", | ||
| "description": [ | ||
|
|
@@ -37,7 +36,7 @@ | |
| { | ||
| "name": "xbyak", | ||
| "platform": "!(arm | uwp)", | ||
| "version>=": "6.69" | ||
| "version>=": "6.73" | ||
| } | ||
| ], | ||
| "default-features": [ | ||
|
|
@@ -93,7 +92,7 @@ | |
| "dependencies": [ | ||
| { | ||
| "name": "onnx", | ||
| "version>=": "1.13.1" | ||
| "version>=": "1.16.2" | ||
| }, | ||
| { | ||
| "name": "protobuf", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can these be replaced with dependency
spdlog?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried to replace it with a regular dependency, but it requires having "SYSTEM_SPDLOG=ON" variable in level_zero cmake and for some reason when I set this variable in the root project it did not reach level_zero.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LilyWangLL changing dependencies of dependencies is not of current PR
let's separate product update vs work on dependencies
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather not add new vendored dependencies to this port. This should use the vcpkg
spdlogport as a dependency.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
level-zero has an option to use system spdlog via
SYSTEM_SPDLOGlooks like we need to enable it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like it's even better to use level-zero enabled in vcpkg #42904
we can use this patch openvinotoolkit/openvino#27633 to be able to find system version of level-zero
@LilyWangLL @JavierMatosD can we merge current PR as upgrade of OpenVINO to newer version and in next PR will submit patch to vcpkg's level-zero migration?