Skip to content

Commit 5fb2f28

Browse files
committed
Use std::get<BufferMem>
This is required after oneapi-src/unified-runtime#961
1 parent df79dad commit 5fb2f28

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

source/adapters/cuda/command_buffer.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
280280
CUgraphNode GraphNode;
281281
std::vector<CUgraphNode> DepsList;
282282

283-
UR_ASSERT(size + dstOffset <= hDstMem->Mem.BufferMem.getSize(),
283+
UR_ASSERT(size + dstOffset <= std::get<BufferMem>(hDstMem->Mem).getSize(),
284284
UR_RESULT_ERROR_INVALID_SIZE);
285-
UR_ASSERT(size + srcOffset <= hSrcMem->Mem.BufferMem.getSize(),
285+
UR_ASSERT(size + srcOffset <= std::get<BufferMem>(hSrcMem->Mem).getSize(),
286286
UR_RESULT_ERROR_INVALID_SIZE);
287287

288288
UR_CALL(getNodesFromSyncPoints(hCommandBuffer, numSyncPointsInWaitList,
@@ -294,8 +294,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyExp(
294294
}
295295

296296
try {
297-
auto Src = hSrcMem->Mem.BufferMem.get() + srcOffset;
298-
auto Dst = hDstMem->Mem.BufferMem.get() + dstOffset;
297+
auto Src = std::get<BufferMem>(hSrcMem->Mem).get() + srcOffset;
298+
auto Dst = std::get<BufferMem>(hDstMem->Mem).get() + dstOffset;
299299

300300
CUDA_MEMCPY3D NodeParams = {};
301301
setCopyParams(&Src, CU_MEMORYTYPE_DEVICE, &Dst, CU_MEMORYTYPE_DEVICE, size,
@@ -334,8 +334,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendMembufferCopyRectExp(
334334
}
335335

336336
try {
337-
CUdeviceptr SrcPtr = hSrcMem->Mem.BufferMem.get();
338-
CUdeviceptr DstPtr = hDstMem->Mem.BufferMem.get();
337+
CUdeviceptr SrcPtr = std::get<BufferMem>(hSrcMem->Mem).get();
338+
CUdeviceptr DstPtr = std::get<BufferMem>(hDstMem->Mem).get();
339339
CUDA_MEMCPY3D NodeParams = {};
340340

341341
setCopyRectParams(region, &SrcPtr, CU_MEMORYTYPE_DEVICE, srcOrigin,
@@ -374,7 +374,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteExp(
374374
}
375375

376376
try {
377-
auto Dst = hBuffer->Mem.BufferMem.get() + offset;
377+
auto Dst = std::get<BufferMem>(hBuffer->Mem).get() + offset;
378378

379379
CUDA_MEMCPY3D NodeParams = {};
380380
setCopyParams(pSrc, CU_MEMORYTYPE_HOST, &Dst, CU_MEMORYTYPE_DEVICE, size,
@@ -411,7 +411,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadExp(
411411
}
412412

413413
try {
414-
auto Src = hBuffer->Mem.BufferMem.get() + offset;
414+
auto Src = std::get<BufferMem>(hBuffer->Mem).get() + offset;
415415

416416
CUDA_MEMCPY3D NodeParams = {};
417417
setCopyParams(&Src, CU_MEMORYTYPE_DEVICE, pDst, CU_MEMORYTYPE_HOST, size,
@@ -451,7 +451,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferWriteRectExp(
451451
}
452452

453453
try {
454-
CUdeviceptr DstPtr = hBuffer->Mem.BufferMem.get();
454+
CUdeviceptr DstPtr = std::get<BufferMem>(hBuffer->Mem).get();
455455
CUDA_MEMCPY3D NodeParams = {};
456456

457457
setCopyRectParams(region, pSrc, CU_MEMORYTYPE_HOST, hostOffset,
@@ -493,7 +493,7 @@ ur_result_t UR_APICALL urCommandBufferAppendMembufferReadRectExp(
493493
}
494494

495495
try {
496-
CUdeviceptr SrcPtr = hBuffer->Mem.BufferMem.get();
496+
CUdeviceptr SrcPtr = std::get<BufferMem>(hBuffer->Mem).get();
497497
CUDA_MEMCPY3D NodeParams = {};
498498

499499
setCopyRectParams(region, &SrcPtr, CU_MEMORYTYPE_DEVICE, bufferOffset,

0 commit comments

Comments
 (0)