ocl_ext.hpp: Remove duplicates with new clhpp headers 2024.10.24

openvinotoolkit · Nov 27, 2024 · 9736b18 · 9736b18
1 parent 45779c2
commit 9736b18
Showing 1 changed file with 23 additions and 29 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
@@ -39,18 +39,10 @@ typedef cl_va_api_device_set_intel    cl_device_set_intel;
 
 #if !defined(cl_intel_required_subgroup_size)
 #define cl_intel_required_subgroup_size 1
-
 // cl_intel_required_subgroup_size
 #define CL_DEVICE_SUB_GROUP_SIZES_INTEL           0x4108
-
 #endif // cl_intel_required_subgroup_size
 
-namespace cl {
-namespace detail {
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector<size_type>)
-}  // namespace detail
-}  // namespace cl
-
 /***************************************************************
 * cl_intel_command_queue_families
 ***************************************************************/
@@ -250,34 +242,36 @@ typedef cl_bitfield         cl_device_feature_capabilities_intel;
 #define CL_DEVICE_FEATURE_FLAG_DPAS_INTEL                   (1 << 1)
 
 /* cl_device_info */
+#ifndef CL_DEVICE_IP_VERSION_INTEL
 #define CL_DEVICE_IP_VERSION_INTEL                          0x4250
+#endif
+
+#ifndef CL_DEVICE_ID_INTEL
 #define CL_DEVICE_ID_INTEL                                  0x4251
+#endif
+
+#ifndef CL_DEVICE_NUM_SLICES_INTEL
 #define CL_DEVICE_NUM_SLICES_INTEL                          0x4252
+#endif
+
+#ifndef CL_DEVICE_NUM_SUB_SLICES_PER_SLICE_INTEL
 #define CL_DEVICE_NUM_SUB_SLICES_PER_SLICE_INTEL            0x4253
-#define CL_DEVICE_NUM_EUS_PER_SUB_SLICE_INTEL               0x4254
-#define CL_DEVICE_NUM_THREADS_PER_EU_INTEL                  0x4255
-#define CL_DEVICE_FEATURE_CAPABILITIES_INTEL                0x4256
+#endif
 
-#endif // cl_intel_device_attribute_query
+#ifndef CL_DEVICE_NUM_EUS_PER_SUB_SLICE_INTEL
+#define CL_DEVICE_NUM_EUS_PER_SUB_SLICE_INTEL            0x4254
+#endif
 
-#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)
+#ifndef CL_DEVICE_NUM_THREADS_PER_EU_INTEL
+#define CL_DEVICE_NUM_THREADS_PER_EU_INTEL            0x4255
+#endif
+
+#ifndef CL_DEVICE_FEATURE_CAPABILITIES_INTEL
+#define CL_DEVICE_FEATURE_CAPABILITIES_INTEL            0x4256
+#endif
+
+#endif // cl_intel_device_attribute_query
 
-namespace cl {
-namespace detail {
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_IP_VERSION_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_ID_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_NUM_SLICES_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_NUM_SUB_SLICES_PER_SLICE_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_NUM_EUS_PER_SUB_SLICE_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_NUM_THREADS_PER_EU_INTEL, cl_uint)
-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_FEATURE_CAPABILITIES_INTEL, cl_device_feature_capabilities_intel)
-CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_)
-}  // namespace detail
-}  // namespace cl
 
 #include <memory>