Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[openvino] 2024.5.0 update #43053

Merged
merged 2 commits into from
Jan 15, 2025
Merged

[openvino] 2024.5.0 update #43053

merged 2 commits into from
Jan 15, 2025
+83 −168

Conversation

ilya-lavrenov
Copy link
Contributor

@ilya-lavrenov ilya-lavrenov commented Jan 2, 2025 •
edited
Loading

  • Updated OpenVINO to 2024.5.0 release
  • Use level-zero from vcpkg instead of submodule

@ilya-lavrenov ilya-lavrenov marked this pull request as draft January 2, 2025 07:55
@ilya-lavrenov ilya-lavrenov mentioned this pull request Jan 2, 2025
Merged
@WangWeiLin-MV WangWeiLin-MV added the category:port-update The issue is with a library, which is requesting update new revision label Jan 2, 2025
@WangWeiLin-MV WangWeiLin-MV changed the title openvino 2024.5.0 update [openvino] 2024.5.0 update Jan 2, 2025
@ilya-lavrenov ilya-lavrenov force-pushed the openvino/2024.5.0 branch 4 times, most recently from 24f3234 to d6ff068 Compare January 12, 2025 08:07
@ilya-lavrenov ilya-lavrenov marked this pull request as ready for review January 12, 2025 08:40
@ilya-lavrenov
Copy link
Contributor Author

@WangWeiLin-MV please, have a look

WangWeiLin-MV
WangWeiLin-MV reviewed Jan 13, 2025
View reviewed changes
ports/openvino/portfile.cmake Outdated
Comment on lines 10 to 16
002-protobuf.patch # https://github.com/openvinotoolkit/openvino/pull/27510
003-snippets-templates.patch # https://github.com/openvinotoolkit/openvino/pull/28172
004-add-include-chrono.patch # https://github.com/openvinotoolkit/openvino/pull/28192
005-level-zero.patch # https://github.com/openvinotoolkit/openvino/pull/27633
006-level-zero-runtime.patch # https://github.com/openvinotoolkit/openvino/pull/27659
007-opencl-v2024.10.24.patch # https://github.com/openvinotoolkit/openvino/pull/28275
008-fix-level-zero-system.patch # https://github.com/openvinotoolkit/openvino/pull/28241
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for quoting the upstream, theses patches could be applied by below method:

vcpkg_download_distfile(PATCH_002_PROTOBUF
    URLS https://github.com/openvinotoolkit/openvino/commit/103c3b72259648c990970afb8ce2bec489fcf583.patch?full_index=1
    SHA512 0
    FILENAME openvinotoolkit-openvino-103c3b72259648c990970afb8ce2bec489fcf583.patch
)

then,

vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO openvinotoolkit/openvino
    REF "${VERSION}"
    SHA512 b003647de3de49e605943488ca9b2e5196b20d95b3152f0c2331c283d4cb253d1bbbb9cde04fa82733d3871d7128c6db6210957660bd89f26462798f782eca47
    HEAD_REF master
    PATCHES
        "${PATCH_002_PROTOBUF}"
)

Copy link
Contributor Author

@ilya-lavrenov ilya-lavrenov Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not all patches are applied as is and I have to fix cherry-pick conflicts, because they are for newer OpenVINO versions (upcoming 2025.0), while in current PR we introduce upgrade to 2024.5

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried these patches, and all of these were applied without conflicts, could you please update the PATCHES?

Prefer downloading approved patches over checking them into the port
https://learn.microsoft.com/en-us/vcpkg/contributing/maintainer-guide#prefer-download-patches

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

@ilya-lavrenov ilya-lavrenov force-pushed the openvino/2024.5.0 branch 2 times, most recently from 4c954bf to ab81cb4 Compare January 13, 2025 12:01
@ilya-lavrenov
openvino/2024.5.0 update
30024c2 
Signed-off-by: Ilya Lavrenov <[email protected]>
@ilya-lavrenov
updated version database
2e659a6 
Signed-off-by: Ilya Lavrenov <[email protected]>
WangWeiLin-MV
WangWeiLin-MV reviewed Jan 14, 2025
View reviewed changes
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still in local testing.

ports/openvino/vcpkg.json Show resolved Hide resolved
ports/openvino/portfile.cmake
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patches checked.

WangWeiLin-MV
WangWeiLin-MV reviewed Jan 15, 2025
View reviewed changes
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The port installation tests pass with the following triplets:

  • x64-windows

ports/openvino/vcpkg.json
Comment on lines +55 to +58
{
"name": "npu",
"platform": "x64 & !(osx | uwp)"
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"name": "npu",
"platform": "x64 & !(osx | uwp)"
},

https://learn.microsoft.com/en-us/vcpkg/contributing/maintainer-guide#default-features-should-enable-behaviors-not-apis

Please carefully consider whether a feature should be on by default.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've considered and decided to keep as is

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please comment the reason of the necessary default feature for the further vcpkg team review?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a default OpenVINO configuration in all other distribution types

WangWeiLin-MV
WangWeiLin-MV approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New default feature.

Approve for further review.

@WangWeiLin-MV WangWeiLin-MV added the info:reviewed Pull Request changes follow basic guidelines label Jan 15, 2025
@vicroms vicroms merged commit 3ebdcf4 into microsoft:master Jan 15, 2025
17 checks passed
@ilya-lavrenov ilya-lavrenov deleted the openvino/2024.5.0 branch January 15, 2025 09:45
@ilya-lavrenov ilya-lavrenov mentioned this pull request Jan 15, 2025
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WangWeiLin-MV WangWeiLin-MV WangWeiLin-MV approved these changes

Assignees

@WangWeiLin-MV WangWeiLin-MV

Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ilya-lavrenov @WangWeiLin-MV @vicroms