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.

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] Support build with OpenCL v2023.12.14+ #36724

Merged
merged 6 commits into from
Feb 14, 2024

Conversation

luncliff
Copy link
Contributor

@luncliff luncliff commented Feb 13, 2024

I got a build error from openvino after OpenCL port updates in my vcpkg registry.

In the source of OpenVINO,

https://github.com/openvinotoolkit/openvino/blob/ceeafaf64f346c6f14a67c612e131da5c27ef620/src/plugins/intel_gpu/src/runtime/ocl/ocl_device_detector.cpp#L226-L231

The type cl::Platform(from device.getInfo<CL_DEVICE_PLATFORM>()) can't be converted to cl_platform_id implicitly.

Changes

Bring the PR to the patch for openvino.
The change seems to be applied in the next 2024 release.

References

Future works of PR

Checklist

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@@ -1,3 +1,9 @@
vcpkg_download_distfile(PR_22011_PATH
URLS "https://patch-diff.githubusercontent.com/raw/openvinotoolkit/openvino/pull/22011.diff"
Copy link
Contributor

Choose a reason for hiding this comment

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

Needs ?full_index=1 for a stable hash, see #33305

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh I knew the issue but couldn't find the PR. Appreciate the comment 👍

Suggested change
URLS "https://patch-diff.githubusercontent.com/raw/openvinotoolkit/openvino/pull/22011.diff"
URLS "https://patch-diff.githubusercontent.com/raw/openvinotoolkit/openvino/pull/22011.diff?full_index=1"

Copy link
Contributor

@dg0yt dg0yt Feb 14, 2024

Choose a reason for hiding this comment

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

Is "patch-diff.githubusercontent.com" really public/stable, or should we prefer a direct "github.com" reference?
git grep full_index for examples.
i.e. https://github.com/openvinotoolkit/openvino/pull/22011.diff?full_index=1

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 just copy-pasted the copied address for raw view. I think github.com is more portable one. let me change it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Applied the changes in e05f5d6

@data-queue data-queue merged commit c8e8310 into microsoft:master Feb 14, 2024
16 checks passed
TomKatom pushed a commit to TomKatom/vcpkg that referenced this pull request Feb 23, 2024
* [openvino] fix cl_platform_id error

* [openvino] update baseline

* [openvino] change from PR 22011

* see openvinotoolkit/openvino#22011

* Update ports/openvino/portfile.cmake

* [openvino] overwrite version

* [openvino] use github.com for patch URL
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants