Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/mpl/src/gpu/mpl_gpu_cuda.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,15 @@ int MPL_gpu_ipc_handle_create(const void *ptr, MPL_gpu_device_attr * ptr_attr,
MPL_gpu_ipc_mem_handle_t * ipc_handle)
{
int mpl_err = MPL_SUCCESS;
cudaError_t ret;

cudaError_t ret;
ret = cudaIpcGetMemHandle(&ipc_handle->handle, (void *) ptr);
CUDA_ERR_CHECK(ret);

ret = cuPointerGetAttribute(&ipc_handle->id, CU_POINTER_ATTRIBUTE_BUFFER_ID, (CUdeviceptr) ptr);
CUDA_ERR_CHECK(ret);
CUresult curet;
curet =
cuPointerGetAttribute(&ipc_handle->id, CU_POINTER_ATTRIBUTE_BUFFER_ID, (CUdeviceptr) ptr);
CU_ERR_CHECK(curet);

fn_exit:
return mpl_err;
Expand Down Expand Up @@ -197,7 +199,7 @@ MPL_gpu_buffer_id_t MPL_gpu_get_buffer_id(void *ptr)
MPL_gpu_buffer_id_t buffer_id;

ret = cuPointerGetAttribute(&buffer_id, CU_POINTER_ATTRIBUTE_BUFFER_ID, (CUdeviceptr) ptr);
assert(ret == cudaSuccess);
assert(ret == CUDA_SUCCESS);

return buffer_id;
}
Expand All @@ -208,7 +210,7 @@ bool MPL_gpu_ipc_handle_is_valid(MPL_gpu_ipc_mem_handle_t * handle, void *ptr)
MPL_gpu_buffer_id_t buffer_id;

ret = cuPointerGetAttribute(&buffer_id, CU_POINTER_ATTRIBUTE_BUFFER_ID, (CUdeviceptr) ptr);
assert(ret == cudaSuccess);
assert(ret == CUDA_SUCCESS);

return buffer_id == handle->id;
}
Expand Down
8 changes: 3 additions & 5 deletions src/mpl/src/gpu/mpl_gpu_hip.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <assert.h>
#ifdef MPL_HAVE_HIP
#define HIP_ERR_CHECK(ret) if (unlikely((ret) != hipSuccess)) goto fn_fail
#define HI_ERR_CHECK(ret) if (unlikely((ret) != HIP_SUCCESS)) goto fn_fail

static int gpu_initialized = 0;
static int device_count = -1;
Expand Down Expand Up @@ -355,7 +354,6 @@ int MPL_gpu_init(int debug_summary)
char *free_ptr = devices;
memcpy(devices, visible_devices, len + 1);
for (int i = 0; i < device_count; i++) {
int global_dev_id;
char *tmp = strtok(devices, ",");
assert(tmp);
local_to_global_map[i] = atoi(tmp);
Expand Down Expand Up @@ -442,10 +440,10 @@ int MPL_gpu_get_root_device(int dev_id)
int MPL_gpu_get_buffer_bounds(const void *ptr, void **pbase, uintptr_t * len)
{
int mpl_err = MPL_SUCCESS;
hipError_t hiret;
hipError_t ret;

hiret = hipMemGetAddressRange((hipDeviceptr_t *) pbase, (size_t *) len, (hipDeviceptr_t) ptr);
HI_ERR_CHECK(hiret);
ret = hipMemGetAddressRange((hipDeviceptr_t *) pbase, (size_t *) len, (hipDeviceptr_t) ptr);
HIP_ERR_CHECK(ret);

fn_exit:
return mpl_err;
Expand Down