Skip to content

UCT/CUDA_IPC: fix peer-access-map init #6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosefe merged 1 commit into from
Feb 21, 2021
Merged

UCT/CUDA_IPC: fix peer-access-map init #6360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/uct/cuda/cuda_ipc/cuda_ipc_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static ucs_status_t uct_cuda_ipc_open_memhandle(const uct_cuda_ipc_key_t *key,
status = UCS_OK;
} else {
cuGetErrorString(cuerr, &cu_err_str);
ucs_error("cuIpcOpenMemHandle() failed: %s", cu_err_str);
ucs_debug("cuIpcOpenMemHandle() failed: %s", cu_err_str);
status = (cuerr == CUDA_ERROR_ALREADY_MAPPED) ? UCS_ERR_ALREADY_EXISTS :
UCS_ERR_INVALID_PARAM;
}
Expand Down
7 changes: 5 additions & 2 deletions src/uct/cuda/cuda_ipc/cuda_ipc_md.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ ucs_status_t uct_cuda_ipc_get_unique_index_for_uuid(int* idx,
int i;
int num_devices;
int original_capacity, new_capacity;
int original_count, new_count;

for (i = 0; i < md->uuid_map_size; i++) {
if (uct_cuda_ipc_uuid_equals(&rkey->uuid, &md->uuid_map[i])) {
Expand All @@ -92,6 +93,8 @@ ucs_status_t uct_cuda_ipc_get_unique_index_for_uuid(int* idx,
original_capacity = md->uuid_map_capacity;
new_capacity = md->uuid_map_capacity ?
(md->uuid_map_capacity * 2) : 16;
original_count = original_capacity * num_devices;
new_count = new_capacity * num_devices;
md->uuid_map_capacity = new_capacity;
md->uuid_map = ucs_realloc(md->uuid_map,
new_capacity * sizeof(CUuuid),
Expand All @@ -101,14 +104,14 @@ ucs_status_t uct_cuda_ipc_get_unique_index_for_uuid(int* idx,
}

md->peer_accessible_cache = ucs_realloc(md->peer_accessible_cache,
new_capacity * num_devices *
new_count *
sizeof(ucs_ternary_auto_value_t),
"uct_cuda_ipc_peer_accessible_cache");
if (md->peer_accessible_cache == NULL) {
return UCS_ERR_NO_MEMORY;
}

for (i = original_capacity; i < new_capacity; i++) {
for (i = original_count; i < new_count; i++) {
md->peer_accessible_cache[i] = UCS_TRY;
}
}
Expand Down