From 120ad760494eeb513ea957bdbc655b6ad07bce42 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 6 Jan 2025 21:02:39 +0400 Subject: [PATCH] Migrate to OpenCL v2024.10.24 (#28275) ### Details: - Migrate to OpenCL v2024.10.24 - Required for integration with open source package managers - Replacement for https://github.com/openvinotoolkit/openvino/pull/27698 --- .../intel_gpu/src/runtime/ocl/ocl_ext.hpp | 16 +++++++++++++++- thirdparty/ocl/cl_headers | 2 +- thirdparty/ocl/clhpp_headers | 2 +- thirdparty/ocl/icd_loader | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp index 759d796a5e87e8..7246a6f6df74d3 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp @@ -16,6 +16,10 @@ #include #endif +#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ +#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 +#endif + #include #ifdef _WIN32 @@ -45,12 +49,16 @@ typedef cl_va_api_device_set_intel cl_device_set_intel; #endif // cl_intel_required_subgroup_size +#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 + namespace cl { namespace detail { -CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector) +CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector) } // namespace detail } // namespace cl +#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 + /*************************************************************** * cl_intel_command_queue_families ***************************************************************/ @@ -260,11 +268,15 @@ typedef cl_bitfield cl_device_feature_capabilities_intel; #endif // cl_intel_device_attribute_query +#ifndef CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ #define CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(F) \ F(cl_device_info, CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL, cl::vector) \ \ F(cl_command_queue_info, CL_QUEUE_FAMILY_INTEL, cl_uint) \ F(cl_command_queue_info, CL_QUEUE_INDEX_INTEL, cl_uint) +#endif // CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ + +#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 namespace cl { namespace detail { @@ -279,6 +291,8 @@ CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_) } // namespace detail } // namespace cl +#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 + #include namespace { diff --git a/thirdparty/ocl/cl_headers b/thirdparty/ocl/cl_headers index 8275634cf9ec31..4ea6df132107e3 160000 --- a/thirdparty/ocl/cl_headers +++ b/thirdparty/ocl/cl_headers @@ -1 +1 @@ -Subproject commit 8275634cf9ec31b6484c2e6be756237cb583999d +Subproject commit 4ea6df132107e3b4b9407f903204b5522fdffcd6 diff --git a/thirdparty/ocl/clhpp_headers b/thirdparty/ocl/clhpp_headers index 0bdbbfe5ecda42..c7b4aded1cab95 160000 --- a/thirdparty/ocl/clhpp_headers +++ b/thirdparty/ocl/clhpp_headers @@ -1 +1 @@ -Subproject commit 0bdbbfe5ecda42cff50c96cc5e33527f42fcbd45 +Subproject commit c7b4aded1cab9560b226041dd962f63375a9a384 diff --git a/thirdparty/ocl/icd_loader b/thirdparty/ocl/icd_loader index 861b68b290e76d..5907ac1114079d 160000 --- a/thirdparty/ocl/icd_loader +++ b/thirdparty/ocl/icd_loader @@ -1 +1 @@ -Subproject commit 861b68b290e76d08e7241608479c16431f529945 +Subproject commit 5907ac1114079de4383cecddf1c8640e3f52f92b