From 866c0eefd56f712cfc468d9647bd9088313a8e65 Mon Sep 17 00:00:00 2001 From: luncliff Date: Tue, 13 Feb 2024 22:02:47 +0900 Subject: [PATCH] [openvino] change from PR 22011 * see https://github.com/openvinotoolkit/openvino/pull/22011 --- ports/openvino/003-opencl.patch | 15 --------------- ports/openvino/portfile.cmake | 9 +++++++-- versions/o-/openvino.json | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 ports/openvino/003-opencl.patch diff --git a/ports/openvino/003-opencl.patch b/ports/openvino/003-opencl.patch deleted file mode 100644 index 19acea77fe0515..00000000000000 --- a/ports/openvino/003-opencl.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_device_detector.cpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_device_detector.cpp -index 95b4c0f9..7fd46ba2 100644 ---- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_device_detector.cpp -+++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_device_detector.cpp -@@ -227,7 +227,9 @@ std::vector ocl_device_detector::create_device_list_from_user_conte - auto& device = all_devices[i]; - if (!does_device_match_config(device) || static_cast(i) != ctx_device_id) - continue; -- supported_devices.emplace_back(std::make_shared(device, ctx, device.getInfo())); -+ cl::Platform platform = device.getInfo(); -+ cl_platform_id id = platform(); -+ supported_devices.emplace_back(std::make_shared(device, ctx, id)); - } - - OPENVINO_ASSERT(!supported_devices.empty(), "[GPU] User defined context does not have supported GPU device."); diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index b914bf8c0dc374..0fb1681998d5b1 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(PR_22011_PATH + URLS "https://patch-diff.githubusercontent.com/raw/openvinotoolkit/openvino/pull/22011.diff" + FILENAME "openvino-pr-22011.patch" + SHA512 d0bd6f536f109f9d5a7231c50e2b2a0573b4920d351aa61e3f1bb9f98ee4cb77e65024a281ef28c2ac7e968c5f707c4cc26136ce27cf4e3ad6fed197c6798803 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino @@ -8,8 +14,7 @@ vcpkg_from_github( 001-disable-tools.patch # https://github.com/openvinotoolkit/openvino/pull/22139 002-conditional-enabling-of-js-api.patch - # https://github.com/KhronosGroup/OpenCL-CLHPP/blob/v2023.12.14/include/CL/opencl.hpp#L2342-L2344 - 003-opencl.patch + ${PR_22011_PATH} HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 757f3c91e5211c..4e41d74f8da7a0 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9482846e4d34f577439aa30e40d305c7b53c36c4", + "git-tree": "99d9f6e9474875929ad1e72cee9e661bc9998da8", "version": "2023.3.0", "port-version": 1 },