Skip to content

Commit b63df59

Browse files
Revert "[UR] Proposal of new API for memory object properties"
This reverts commit a5c6888.
1 parent a5c6888 commit b63df59

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

include/ur.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,9 +2242,9 @@ class ur_program_dditable_t(Structure):
22422242
###############################################################################
22432243
## @brief Function-pointer for urKernelSetArgMemObj
22442244
if __use_win_types:
2245-
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, const ur_mem_obj_properties_t* )
2245+
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t )
22462246
else:
2247-
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, const ur_mem_obj_properties_t* )
2247+
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t )
22482248

22492249
###############################################################################
22502250
## @brief Function-pointer for urKernelSetSpecializationConstants

include/ur_api.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ typedef enum ur_structure_type_t {
252252
UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES = 24, ///< ::ur_sampler_native_properties_t
253253
UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC = 25, ///< ::ur_queue_native_desc_t
254254
UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES = 26, ///< ::ur_device_partition_properties_t
255-
UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES = 27, ///< ::ur_mem_obj_properties_t
256255
/// @cond
257256
UR_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff
258257
/// @endcond
@@ -3838,15 +3837,6 @@ urKernelSetArgSampler(
38383837
ur_sampler_handle_t hArgValue ///< [in] handle of Sampler object.
38393838
);
38403839

3841-
///////////////////////////////////////////////////////////////////////////////
3842-
/// @brief Memory object properties
3843-
typedef struct ur_mem_obj_properties_t {
3844-
ur_structure_type_t stype; ///< [in] type of this structure, must be
3845-
///< ::UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES
3846-
void *pNext; ///< [in,out][optional] pointer to extension-specific structure
3847-
ur_mem_flags_t memory_access; ///< [in] Memory access flag. Allowed values are: UR_MEM_FLAG_READ_WRITE, UR_MEM_FLAG_WRITE_ONLY, UR_MEM_FLAG_READ_ONLY.
3848-
} ur_mem_obj_properties_t;
3849-
38503840
///////////////////////////////////////////////////////////////////////////////
38513841
/// @brief Set a Memory object as the argument value of a Kernel.
38523842
///
@@ -3866,8 +3856,7 @@ UR_APIEXPORT ur_result_t UR_APICALL
38663856
urKernelSetArgMemObj(
38673857
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
38683858
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
3869-
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
3870-
const ur_mem_obj_properties_t* pProperties ///< [in][optional] pointer to memory object usage properties.
3859+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
38713860
);
38723861

38733862
///////////////////////////////////////////////////////////////////////////////
@@ -6472,7 +6461,6 @@ typedef struct ur_kernel_set_arg_mem_obj_params_t {
64726461
ur_kernel_handle_t *phKernel;
64736462
uint32_t *pargIndex;
64746463
ur_mem_handle_t *phArgValue;
6475-
const ur_mem_obj_properties_t* pProperties;
64766464
} ur_kernel_set_arg_mem_obj_params_t;
64776465

64786466
///////////////////////////////////////////////////////////////////////////////

include/ur_ddi.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnKernelSetArgSampler_t)(
509509
typedef ur_result_t(UR_APICALL *ur_pfnKernelSetArgMemObj_t)(
510510
ur_kernel_handle_t,
511511
uint32_t,
512-
ur_mem_handle_t,
513-
const ur_mem_obj_properties_t*);
512+
ur_mem_handle_t);
514513

515514
///////////////////////////////////////////////////////////////////////////////
516515
/// @brief Function-pointer for urKernelSetSpecializationConstants

0 commit comments

Comments
 (0)