Skip to content

Commit 6935b17

Browse files
DBDuncanDBDuncan
committed
Remote 'interop' keyword
1 parent b9bd031 commit 6935b17

File tree

15 files changed

+56
-52
lines changed

15 files changed

+56
-52
lines changed

‎include/ur_api.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7964,7 +7964,7 @@ urBindlessImagesMapExternalArrayExp(
79647964
);
79657965

79667966
///////////////////////////////////////////////////////////////////////////////
7967-
/// @brief Map an interop memory handle to a device memory region described by
7967+
/// @brief Map an external memory handle to a device memory region described by
79687968
/// void*
79697969
///
79707970
/// @returns
@@ -7975,7 +7975,7 @@ urBindlessImagesMapExternalArrayExp(
79757975
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
79767976
/// + `NULL == hContext`
79777977
/// + `NULL == hDevice`
7978-
/// + `NULL == hInteropMem`
7978+
/// + `NULL == hExternalMem`
79797979
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
79807980
/// + `NULL == ppRetMem`
79817981
/// - ::UR_RESULT_ERROR_INVALID_CONTEXT
@@ -7985,12 +7985,12 @@ urBindlessImagesMapExternalArrayExp(
79857985
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
79867986
UR_APIEXPORT ur_result_t UR_APICALL
79877987
urBindlessImagesMapExternalLinearMemoryExp(
7988-
ur_context_handle_t hContext, ///< [in] handle of the context object
7989-
ur_device_handle_t hDevice, ///< [in] handle of the device object
7990-
uint64_t offset, ///< [in] offset into memory region to map
7991-
uint64_t size, ///< [in] size of memory region to map
7992-
ur_exp_interop_mem_handle_t hInteropMem, ///< [in] interop memory handle to the external memory
7993-
void **ppRetMem ///< [out] pointer of the externally allocated memory
7988+
ur_context_handle_t hContext, ///< [in] handle of the context object
7989+
ur_device_handle_t hDevice, ///< [in] handle of the device object
7990+
uint64_t offset, ///< [in] offset into memory region to map
7991+
uint64_t size, ///< [in] size of memory region to map
7992+
ur_exp_external_mem_handle_t hExternalMem, ///< [in] external memory handle to the external memory
7993+
void **ppRetMem ///< [out] pointer of the externally allocated memory
79947994
);
79957995

79967996
///////////////////////////////////////////////////////////////////////////////
@@ -11271,7 +11271,7 @@ typedef struct ur_bindless_images_map_external_linear_memory_exp_params_t {
1127111271
ur_device_handle_t *phDevice;
1127211272
uint64_t *poffset;
1127311273
uint64_t *psize;
11274-
ur_exp_interop_mem_handle_t *phInteropMem;
11274+
ur_exp_external_mem_handle_t *phExternalMem;
1127511275
void ***pppRetMem;
1127611276
} ur_bindless_images_map_external_linear_memory_exp_params_t;
1127711277

‎include/ur_ddi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesMapExternalLinearMemoryExp_t
16461646
ur_device_handle_t,
16471647
uint64_t,
16481648
uint64_t,
1649-
ur_exp_interop_mem_handle_t,
1649+
ur_exp_external_mem_handle_t,
16501650
void **);
16511651

16521652
///////////////////////////////////////////////////////////////////////////////

‎include/ur_print.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15221,10 +15221,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1522115221
os << *(params->psize);
1522215222

1522315223
os << ", ";
15224-
os << ".hInteropMem = ";
15224+
os << ".hExternalMem = ";
1522515225

1522615226
ur::details::printPtr(os,
15227-
*(params->phInteropMem));
15227+
*(params->phExternalMem));
1522815228

1522915229
os << ", ";
1523015230
os << ".ppRetMem = ";

‎scripts/core/exp-bindless-images.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ returns:
737737
- $X_RESULT_ERROR_OUT_OF_RESOURCES
738738
--- #--------------------------------------------------------------------------
739739
type: function
740-
desc: "Map an interop memory handle to a device memory region described by void*"
740+
desc: "Map an external memory handle to a device memory region described by void*"
741741
class: $xBindlessImages
742742
name: MapExternalLinearMemoryExp
743743
ordinal: "0"
@@ -754,9 +754,9 @@ params:
754754
- type: uint64_t
755755
name: size
756756
desc: "[in] size of memory region to map"
757-
- type: $x_exp_interop_mem_handle_t
758-
name: hInteropMem
759-
desc: "[in] interop memory handle to the external memory"
757+
- type: $x_exp_external_mem_handle_t
758+
name: hExternalMem
759+
desc: "[in] external memory handle to the external memory"
760760
- type: void**
761761
name: ppRetMem
762762
desc: "[out] pointer of the externally allocated memory"

‎source/adapters/cuda/image.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalArrayExp(
11711171

11721172
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
11731173
ur_context_handle_t hContext, ur_device_handle_t hDevice, uint64_t offset,
1174-
uint64_t size, ur_exp_interop_mem_handle_t hInteropMem, void **ppRetMem) {
1174+
uint64_t size, ur_exp_external_mem_handle_t hExternalMem, void **ppRetMem) {
11751175
UR_ASSERT(std::find(hContext->getDevices().begin(),
11761176
hContext->getDevices().end(),
11771177
hDevice) != hContext->getDevices().end(),
@@ -1187,7 +1187,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
11871187

11881188
CUdeviceptr retMem;
11891189
UR_CHECK_ERROR(cuExternalMemoryGetMappedBuffer(
1190-
&retMem, (CUexternalMemory)hInteropMem, &BufferDesc));
1190+
&retMem, (CUexternalMemory)hExternalMem, &BufferDesc));
11911191

11921192
*ppRetMem = (void *)retMem;
11931193

‎source/adapters/hip/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
136136
[[maybe_unused]] ur_context_handle_t hContext,
137137
[[maybe_unused]] ur_device_handle_t hDevice,
138138
[[maybe_unused]] uint64_t offset, [[maybe_unused]] uint64_t size,
139-
[[maybe_unused]] ur_exp_interop_mem_handle_t hInteropMem,
139+
[[maybe_unused]] ur_exp_external_mem_handle_t hExternalMem,
140140
[[maybe_unused]] void **phRetMem) {
141141
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
142142
}

‎source/adapters/level_zero/image.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,12 +1085,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalArrayExp(
10851085

10861086
UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
10871087
ur_context_handle_t hContext, ur_device_handle_t hDevice, uint64_t offset,
1088-
uint64_t size, ur_exp_interop_mem_handle_t hInteropMem, void **phRetMem) {
1088+
uint64_t size, ur_exp_external_mem_handle_t hExternalMem, void **phRetMem) {
10891089
std::ignore = hContext;
10901090
std::ignore = hDevice;
10911091
std::ignore = size;
10921092
std::ignore = offset;
1093-
std::ignore = hInteropMem;
1093+
std::ignore = hExternalMem;
10941094
std::ignore = phRetMem;
10951095
logger::error(logger::LegacyMessage("[UR][L0] {} function not implemented!"),
10961096
"{} function not implemented!", __FUNCTION__);

‎source/adapters/mock/ur_mockddi.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7812,14 +7812,14 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
78127812
ur_device_handle_t hDevice, ///< [in] handle of the device object
78137813
uint64_t offset, ///< [in] offset into memory region to map
78147814
uint64_t size, ///< [in] size of memory region to map
7815-
ur_exp_interop_mem_handle_t
7816-
hInteropMem, ///< [in] interop memory handle to the external memory
7817-
void **ppRetMem ///< [out] pointer of the externally allocated memory
7815+
ur_exp_external_mem_handle_t
7816+
hExternalMem, ///< [in] external memory handle to the external memory
7817+
void **ppRetMem ///< [out] pointer of the externally allocated memory
78187818
) try {
78197819
ur_result_t result = UR_RESULT_SUCCESS;
78207820

78217821
ur_bindless_images_map_external_linear_memory_exp_params_t params = {
7822-
&hContext, &hDevice, &offset, &size, &hInteropMem, &ppRetMem};
7822+
&hContext, &hDevice, &offset, &size, &hExternalMem, &ppRetMem};
78237823

78247824
auto beforeCallback = reinterpret_cast<ur_mock_callback_t>(
78257825
mock::getCallbacks().get_before_callback(

‎source/adapters/native_cpu/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
136136
[[maybe_unused]] ur_context_handle_t hContext,
137137
[[maybe_unused]] ur_device_handle_t hDevice,
138138
[[maybe_unused]] uint64_t offset, [[maybe_unused]] uint64_t size,
139-
[[maybe_unused]] ur_exp_interop_mem_handle_t hInteropMem,
139+
[[maybe_unused]] ur_exp_external_mem_handle_t hExternalMem,
140140
[[maybe_unused]] void **phRetMem) {
141141
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
142142
}

‎source/adapters/opencl/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urBindlessImagesMapExternalLinearMemoryExp(
136136
[[maybe_unused]] ur_context_handle_t hContext,
137137
[[maybe_unused]] ur_device_handle_t hDevice,
138138
[[maybe_unused]] uint64_t offset, [[maybe_unused]] uint64_t size,
139-
[[maybe_unused]] ur_exp_interop_mem_handle_t hInteropMem,
139+
[[maybe_unused]] ur_exp_external_mem_handle_t hExternalMem,
140140
[[maybe_unused]] void **phRetMem) {
141141
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
142142
}

0 commit comments

Comments
 (0)