Skip to content

Commit 800bf88

Browse files
callumfarecallumfare
committed
Tidy and move common adapter code to ur_common 
1 parent 8007b22 commit 800bf88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+664
-696
lines changed

Diff for: ‎source/adapters/cuda/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ add_ur_adapter(${TARGET_NAME}
4141
${CMAKE_CURRENT_SOURCE_DIR}/usm.cpp
4242
${CMAKE_CURRENT_SOURCE_DIR}/usm_p2p.cpp
4343
${CMAKE_CURRENT_SOURCE_DIR}/virtual_mem.cpp
44-
${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.cpp
45-
${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.hpp
4644
)
4745

4846
set_target_properties(${TARGET_NAME} PROPERTIES
@@ -83,7 +81,3 @@ target_link_libraries(${TARGET_NAME} PRIVATE
8381
Threads::Threads
8482
cudadrv
8583
)
86-
87-
target_include_directories(${TARGET_NAME} PRIVATE
88-
"${CMAKE_CURRENT_SOURCE_DIR}/../../"
89-
)

Diff for: ‎source/adapters/cuda/adapter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetInfo(ur_adapter_handle_t,
6767
size_t propSize,
6868
void *pPropValue,
6969
size_t *pPropSizeRet) {
70-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
70+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
7171

7272
switch (propName) {
7373
case UR_ADAPTER_INFO_BACKEND:

Diff for: ‎source/adapters/cuda/command_buffer.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11-
#include <ur/ur.hpp>
1211
#include <ur_api.h>
1312

1413
#include "context.hpp"

Diff for: ‎source/adapters/cuda/common.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#pragma once
1111

1212
#include <cuda.h>
13-
#include <ur/ur.hpp>
13+
#include <ur_util.hpp>
1414

1515
ur_result_t mapErrorUR(CUresult Result);
1616

Diff for: ‎source/adapters/cuda/context.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ urContextCreate(uint32_t DeviceCount, const ur_device_handle_t *phDevices,
6868
UR_APIEXPORT ur_result_t UR_APICALL urContextGetInfo(
6969
ur_context_handle_t hContext, ur_context_info_t ContextInfoType,
7070
size_t propSize, void *pContextInfo, size_t *pPropSizeRet) {
71-
UrReturnHelper ReturnValue(propSize, pContextInfo, pPropSizeRet);
71+
ur::ReturnHelper ReturnValue(propSize, pContextInfo, pPropSizeRet);
7272

7373
switch (static_cast<uint32_t>(ContextInfoType)) {
7474
case UR_CONTEXT_INFO_NUM_DEVICES:

Diff for: ‎source/adapters/cuda/device.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
4242
size_t propSize,
4343
void *pPropValue,
4444
size_t *pPropSizeRet) try {
45-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
45+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
4646

4747
static constexpr uint32_t MaxWorkItemDimensions = 3u;
4848

Diff for: ‎source/adapters/cuda/device.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//===----------------------------------------------------------------------===//
1010
#pragma once
1111

12-
#include <ur/ur.hpp>
12+
#include <ur_api.h>
1313

1414
#include "common.hpp"
1515

Diff for: ‎source/adapters/cuda/event.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,
162162
size_t propValueSize,
163163
void *pPropValue,
164164
size_t *pPropValueSizeRet) {
165-
UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
165+
ur::ReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
166166

167167
switch (propName) {
168168
case UR_EVENT_INFO_COMMAND_QUEUE:
@@ -187,7 +187,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,
187187
UR_APIEXPORT ur_result_t UR_APICALL urEventGetProfilingInfo(
188188
ur_event_handle_t hEvent, ur_profiling_info_t propName,
189189
size_t propValueSize, void *pPropValue, size_t *pPropValueSizeRet) {
190-
UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
190+
ur::ReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
191191

192192
ur_queue_handle_t Queue = hEvent->getQueue();
193193
if (Queue == nullptr || !(Queue->URFlags & UR_QUEUE_FLAG_PROFILING_ENABLE)) {

Diff for: ‎source/adapters/cuda/event.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#pragma once
1111

1212
#include <cuda.h>
13-
#include <ur/ur.hpp>
13+
#include <ur_api.h>
1414

1515
#include "common.hpp"
1616
#include "queue.hpp"

Diff for: ‎source/adapters/cuda/image.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "memory.hpp"
2121
#include "queue.hpp"
2222
#include "sampler.hpp"
23-
#include "ur/ur.hpp"
2423
#include "ur_api.h"
2524

2625
ur_result_t urCalculateNumChannels(ur_image_channel_order_t order,

Diff for: ‎source/adapters/cuda/kernel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ UR_APIEXPORT ur_result_t UR_APICALL
6262
urKernelGetGroupInfo(ur_kernel_handle_t hKernel, ur_device_handle_t hDevice,
6363
ur_kernel_group_info_t propName, size_t propSize,
6464
void *pPropValue, size_t *pPropSizeRet) {
65-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
65+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
6666

6767
switch (propName) {
6868
case UR_KERNEL_GROUP_INFO_GLOBAL_WORK_SIZE: {
@@ -205,7 +205,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelGetInfo(ur_kernel_handle_t hKernel,
205205
size_t propSize,
206206
void *pKernelInfo,
207207
size_t *pPropSizeRet) {
208-
UrReturnHelper ReturnValue(propSize, pKernelInfo, pPropSizeRet);
208+
ur::ReturnHelper ReturnValue(propSize, pKernelInfo, pPropSizeRet);
209209

210210
switch (propName) {
211211
case UR_KERNEL_INFO_FUNCTION_NAME:
@@ -237,7 +237,7 @@ UR_APIEXPORT ur_result_t UR_APICALL
237237
urKernelGetSubGroupInfo(ur_kernel_handle_t hKernel, ur_device_handle_t hDevice,
238238
ur_kernel_sub_group_info_t propName, size_t propSize,
239239
void *pPropValue, size_t *pPropSizeRet) {
240-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
240+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
241241
switch (propName) {
242242
case UR_KERNEL_SUB_GROUP_INFO_MAX_SUB_GROUP_SIZE: {
243243
// Sub-group size is equivalent to warp size

Diff for: ‎source/adapters/cuda/memory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemGetInfo(ur_mem_handle_t hMemory,
175175
size_t *pPropSizeRet) {
176176
UR_ASSERT(hMemory->isBuffer(), UR_RESULT_ERROR_INVALID_MEM_OBJECT);
177177

178-
UrReturnHelper ReturnValue(propSize, pMemInfo, pPropSizeRet);
178+
ur::ReturnHelper ReturnValue(propSize, pMemInfo, pPropSizeRet);
179179

180180
ScopedContext Active(hMemory->getContext());
181181

Diff for: ‎source/adapters/cuda/physical_mem.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//===----------------------------------------------------------------------===//
1010
#pragma once
1111

12-
#include <ur/ur.hpp>
12+
#include <ur_api.h>
1313

1414
#include <cuda.h>
1515

Diff for: ‎source/adapters/cuda/platform.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urPlatformGetInfo(
2222
size_t Size, void *pPlatformInfo, size_t *pSizeRet) {
2323

2424
UR_ASSERT(hPlatform, UR_RESULT_ERROR_INVALID_NULL_HANDLE);
25-
UrReturnHelper ReturnValue(Size, pPlatformInfo, pSizeRet);
25+
ur::ReturnHelper ReturnValue(Size, pPlatformInfo, pSizeRet);
2626

2727
switch (PlatformInfoType) {
2828
case UR_PLATFORM_INFO_NAME:

Diff for: ‎source/adapters/cuda/platform.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//===----------------------------------------------------------------------===//
1010
#pragma once
1111

12-
#include <ur/ur.hpp>
12+
13+
#include "ur_api.h"
14+
#include <memory>
1315
#include <vector>
1416

1517
struct ur_platform_handle_t_ {

Diff for: ‎source/adapters/cuda/program.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ urProgramGetBuildInfo(ur_program_handle_t hProgram, ur_device_handle_t hDevice,
339339
void *pPropValue, size_t *pPropSizeRet) {
340340
std::ignore = hDevice;
341341

342-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
342+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
343343

344344
switch (propName) {
345345
case UR_PROGRAM_BUILD_INFO_STATUS: {
@@ -361,7 +361,7 @@ urProgramGetBuildInfo(ur_program_handle_t hProgram, ur_device_handle_t hDevice,
361361
UR_APIEXPORT ur_result_t UR_APICALL
362362
urProgramGetInfo(ur_program_handle_t hProgram, ur_program_info_t propName,
363363
size_t propSize, void *pProgramInfo, size_t *pPropSizeRet) {
364-
UrReturnHelper ReturnValue(propSize, pProgramInfo, pPropSizeRet);
364+
ur::ReturnHelper ReturnValue(propSize, pProgramInfo, pPropSizeRet);
365365

366366
switch (propName) {
367367
case UR_PROGRAM_INFO_REFERENCE_COUNT:

Diff for: ‎source/adapters/cuda/queue.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueGetInfo(ur_queue_handle_t hQueue,
291291
size_t propValueSize,
292292
void *pPropValue,
293293
size_t *pPropSizeRet) {
294-
UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropSizeRet);
294+
ur::ReturnHelper ReturnValue(propValueSize, pPropValue, pPropSizeRet);
295295

296296
switch (propName) {
297297
case UR_QUEUE_INFO_CONTEXT:

Diff for: ‎source/adapters/cuda/queue.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
//===----------------------------------------------------------------------===//
1010
#pragma once
1111

12-
#include <ur/ur.hpp>
12+
#include <ur_api.h>
1313

1414
#include <algorithm>
15+
#include <atomic>
1516
#include <cuda.h>
17+
#include <mutex>
1618
#include <vector>
1719

1820
using ur_stream_guard_ = std::unique_lock<std::mutex>;

Diff for: ‎source/adapters/cuda/sampler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ urSamplerCreate(ur_context_handle_t hContext, const ur_sampler_desc_t *pDesc,
4949
UR_APIEXPORT ur_result_t UR_APICALL
5050
urSamplerGetInfo(ur_sampler_handle_t hSampler, ur_sampler_info_t propName,
5151
size_t propValueSize, void *pPropValue, size_t *pPropSizeRet) {
52-
UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropSizeRet);
52+
ur::ReturnHelper ReturnValue(propValueSize, pPropValue, pPropSizeRet);
5353

5454
switch (propName) {
5555
case UR_SAMPLER_INFO_REFERENCE_COUNT:

Diff for: ‎source/adapters/cuda/sampler.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11-
#include <ur/ur.hpp>
11+
#include <ur_api.h>
12+
13+
#include <atomic>
1214

1315
/// Implementation of samplers for CUDA
1416
///

Diff for: ‎source/adapters/cuda/usm.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
196196
void *pPropValue, size_t *pPropValueSizeRet) {
197197
ur_result_t Result = UR_RESULT_SUCCESS;
198198

199-
UrReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
199+
ur::ReturnHelper ReturnValue(propValueSize, pPropValue, pPropValueSizeRet);
200200

201201
try {
202202
ScopedContext Active(hContext);
@@ -486,7 +486,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolGetInfo(
486486
size_t *pPropSizeRet ///< [out][optional] size in bytes returned in pool
487487
///< property value
488488
) {
489-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
489+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
490490

491491
switch (propName) {
492492
case UR_USM_POOL_INFO_REFERENCE_COUNT: {

Diff for: ‎source/adapters/cuda/usm_p2p.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urUsmP2PPeerAccessGetInfoExp(
4242
ur_exp_peer_info_t propName, size_t propSize, void *pPropValue,
4343
size_t *pPropSizeRet) {
4444

45-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
45+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
4646

4747
int value;
4848
CUdevice_P2PAttribute cu_attr;

Diff for: ‎source/adapters/cuda/virtual_mem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urVirtualMemGranularityGetInfo(
2020
ur_context_handle_t hContext, ur_device_handle_t hDevice,
2121
ur_virtual_mem_granularity_info_t propName, size_t propSize,
2222
void *pPropValue, size_t *pPropSizeRet) {
23-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
23+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
2424

2525
ScopedContext Active(hContext);
2626
switch (propName) {
@@ -108,7 +108,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urVirtualMemGetInfo(
108108
ur_context_handle_t hContext, const void *pStart,
109109
[[maybe_unused]] size_t size, ur_virtual_mem_info_t propName,
110110
size_t propSize, void *pPropValue, size_t *pPropSizeRet) {
111-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
111+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
112112

113113
ScopedContext Active(hContext);
114114
switch (propName) {

Diff for: ‎source/adapters/hip/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ add_ur_adapter(${TARGET_NAME}
8383
${CMAKE_CURRENT_SOURCE_DIR}/usm.cpp
8484
${CMAKE_CURRENT_SOURCE_DIR}/usm_p2p.cpp
8585
${CMAKE_CURRENT_SOURCE_DIR}/virtual_mem.cpp
86-
${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.cpp
87-
${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.hpp
8886
)
8987

9088
if(NOT MSVC)
@@ -184,7 +182,3 @@ elseif("${UR_HIP_PLATFORM}" STREQUAL "NVIDIA")
184182
else()
185183
message(FATAL_ERROR "Unspecified UR HIP platform please set UR_HIP_PLATFORM to 'AMD' or 'NVIDIA'")
186184
endif()
187-
188-
target_include_directories(${TARGET_NAME} PRIVATE
189-
"${CMAKE_CURRENT_SOURCE_DIR}/../../"
190-
)

Diff for: ‎source/adapters/hip/adapter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urAdapterGetInfo(ur_adapter_handle_t,
5656
size_t propSize,
5757
void *pPropValue,
5858
size_t *pPropSizeRet) {
59-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
59+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
6060

6161
switch (propName) {
6262
case UR_ADAPTER_INFO_BACKEND:

Diff for: ‎source/adapters/hip/command_buffer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11-
#include <ur/ur.hpp>
11+
#include <ur_api.h>
1212

1313
/// Stub implementation of command-buffers for HIP
1414

Diff for: ‎source/adapters/hip/common.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#endif
1818
#endif
1919
#include <hip/hip_runtime.h>
20-
#include <ur/ur.hpp>
20+
#include <ur_api.h>
21+
#include <ur_util.hpp>
2122

2223
// Before ROCm 6, hipify doesn't support cuArrayGetDescriptor, on AMD the
2324
// hipArray can just be indexed, but on NVidia it is an opaque type and needs to

Diff for: ‎source/adapters/hip/context.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ UR_APIEXPORT ur_result_t UR_APICALL
7272
urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
7373
size_t propSize, void *pPropValue, size_t *pPropSizeRet) {
7474

75-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
75+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
7676

7777
switch (uint32_t{propName}) {
7878
case UR_CONTEXT_INFO_NUM_DEVICES:

Diff for: ‎source/adapters/hip/device.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
2525
size_t propSize,
2626
void *pPropValue,
2727
size_t *pPropSizeRet) {
28-
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
28+
ur::ReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
2929

3030
static constexpr uint32_t MaxWorkItemDimensions = 3u;
3131

Diff for: ‎source/adapters/hip/device.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "common.hpp"
1313

14-
#include <ur/ur.hpp>
14+
#include <ur_api.h>
1515

1616
/// UR device mapping to a hipDevice_t.
1717
/// Includes an observer pointer to the platform,

Diff for: ‎source/adapters/hip/enqueue.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferRead(
185185

186186
std::unique_ptr<ur_event_handle_t_> RetImplEvent{nullptr};
187187

188-
ur_lock MemoryMigrationLock{hBuffer->MemoryMigrationMutex};
188+
ur::Lock MemoryMigrationLock{hBuffer->MemoryMigrationMutex};
189189
auto Device = hQueue->getDevice();
190190
hipStream_t HIPStream = hQueue->getNextTransferStream();
191191

@@ -254,7 +254,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
254254

255255
std::vector<ur_event_handle_t> DepEvents(
256256
phEventWaitList, phEventWaitList + numEventsInWaitList);
257-
std::vector<std::pair<ur_mem_handle_t, ur_lock>> MemMigrationLocks;
257+
std::vector<std::pair<ur_mem_handle_t, ur::Lock>> MemMigrationLocks;
258258

259259
// phEventWaitList only contains events that are handed to UR by the SYCL
260260
// runtime. However since UR handles memory dependencies within a context
@@ -277,8 +277,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
277277
[MemArg](auto &Lock) {
278278
return Lock.first == MemArg.Mem;
279279
}) == MemMigrationLocks.end())
280-
MemMigrationLocks.emplace_back(
281-
std::pair{MemArg.Mem, ur_lock{MemArg.Mem->MemoryMigrationMutex}});
280+
MemMigrationLocks.emplace_back(std::pair{
281+
MemArg.Mem, ur::Lock{MemArg.Mem->MemoryMigrationMutex}});
282282
}
283283
}
284284
}
@@ -632,7 +632,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferReadRect(
632632
std::unique_ptr<ur_event_handle_t_> RetImplEvent{nullptr};
633633

634634
ur_result_t Result = UR_RESULT_SUCCESS;
635-
ur_lock MemoryMigrationLock(hBuffer->MemoryMigrationMutex);
635+
ur::Lock MemoryMigrationLock(hBuffer->MemoryMigrationMutex);
636636
auto Device = hQueue->getDevice();
637637
hipStream_t HIPStream = hQueue->getNextTransferStream();
638638

@@ -1026,7 +1026,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemImageRead(
10261026
const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
10271027
UR_ASSERT(hImage->isImage(), UR_RESULT_ERROR_INVALID_MEM_OBJECT);
10281028

1029-
ur_lock MemoryMigrationLock{hImage->MemoryMigrationMutex};
1029+
ur::Lock MemoryMigrationLock{hImage->MemoryMigrationMutex};
10301030
auto Device = hQueue->getDevice();
10311031
hipStream_t HIPStream = hQueue->getNextTransferStream();
10321032

0 commit comments

Comments
 (0)