-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[opencl] v2024.10.24 release #43124
Merged
+126
−13
Merged
[opencl] v2024.10.24 release #43124
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 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,36 @@ | ||
| diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | ||
| index dfb336d..ef97f82 100644 | ||
| --- a/lib/CMakeLists.txt | ||
| +++ b/lib/CMakeLists.txt | ||
| @@ -114,13 +114,6 @@ foreach(UTIL_LIB_NAME IN ITEMS Utils UtilsCpp) | ||
| DESTINATION ${config_package_location} | ||
| COMPONENT binary | ||
| ) | ||
| - | ||
| - # For packaging the utils libraries | ||
| - install( | ||
| - TARGETS ${UTIL_LIB_TARGET} | ||
| - DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| - COMPONENT binary | ||
| - ) | ||
| endforeach() | ||
|
|
||
| if(OPENCL_SDK_BUILD_SAMPLES) | ||
| diff --git a/lib/src/Extensions/CMakeLists.txt b/lib/src/Extensions/CMakeLists.txt | ||
| index e05d4e7..017f7ad 100644 | ||
| --- a/lib/src/Extensions/CMakeLists.txt | ||
| +++ b/lib/src/Extensions/CMakeLists.txt | ||
| @@ -151,13 +151,6 @@ if (OPENCL_EXTENSION_LOADER_INSTALL) | ||
| DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH} | ||
| COMPONENT binary | ||
| ) | ||
| - | ||
| - # For packaging the extensions library | ||
| - install( | ||
| - TARGETS OpenCLExt | ||
| - DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| - COMPONENT binary | ||
| - ) | ||
| endif() | ||
|
|
||
| if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) |
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
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,64 @@ | ||
| commit 255202328d39490f2cdca0d646b2e12b17ac9b69 | ||
| Author: Ilya Lavrenov <ilya.lavrenov@intel.com> | ||
| Date: Mon Jan 6 09:56:08 2025 +0100 | ||
|
|
||
| Migrate to OpenCL v2024.10.24 | ||
|
|
||
| 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 759d796a5e..7246a6f6df 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 <CL/cl2.hpp> | ||
| #endif | ||
|
|
||
| +#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ | ||
| +#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 | ||
| +#endif | ||
| + | ||
| #include <CL/cl_ext.h> | ||
|
|
||
| #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<size_type>) | ||
| +CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector<size_type>) | ||
| } // 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<cl_queue_family_properties_intel>) \ | ||
| \ | ||
| 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 <memory> | ||
|
|
||
| namespace { |
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
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
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.
fixed in upstream KhronosGroup/OpenCL-SDK#100