Skip to content
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

Jump to bottom

spml/ucx: shuffle EPs creation #12907

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

spml/ucx: shuffle EPs creation #12907

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03c59cd
spml/ucx: shuffle EPs creation
michal-shalev Nov 4, 2024
78d0a63
spml/ucx: fix for loop
michal-shalev Nov 5, 2024
32a86a4
spml/ucx: PR fixes
michal-shalev Nov 6, 2024
c421b4a
spml/ucx: fix swap
michal-shalev Nov 7, 2024
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
34 changes: 27 additions & 7 deletions oshmem/mca/spml/ucx/spml_ucx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,6 @@ int mca_spml_ucx_clear_put_op_mask(mca_spml_ucx_ctx_t *ctx)
int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
{
int rc = OSHMEM_ERROR;
int my_rank = oshmem_my_proc_id();
size_t ucp_workers = mca_spml_ucx.ucp_workers;
unsigned int *wk_roffs = NULL;
unsigned int *wk_rsizes = NULL;
Expand All @@ -644,6 +643,8 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
ucp_address_t **wk_local_addr;
unsigned int *wk_addr_len;
ucp_ep_params_t ep_params;
int *indices;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unsigned int?

int proc_index, swap_index, temp_index;

wk_local_addr = calloc(mca_spml_ucx.ucp_workers, sizeof(ucp_address_t *));
wk_addr_len = calloc(mca_spml_ucx.ucp_workers, sizeof(size_t));
Expand Down Expand Up @@ -691,23 +692,40 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
}
}

indices = malloc(nprocs * sizeof(*indices));
if (!indices) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems the convention is compare to NULL

goto error;
}

for (i = 0; i < nprocs; i++) {
indices[i] = i;
gleon99 marked this conversation as resolved.
Show resolved Hide resolved
}

srand((unsigned int)time(NULL));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO can omit (unsigned int)


/* Get the EP connection requests for all the processes from modex */
for (n = 0; n < nprocs; ++n) {
i = (my_rank + n) % nprocs;
for (proc_index = nprocs - 1; proc_index >= 0; --proc_index) {
/* Fisher-Yates shuffle algorithm */
if (proc_index > 0) {
swap_index = rand() % (proc_index + 1);
temp_index = indices[proc_index];
indices[proc_index] = indices[swap_index];
indices[proc_index] = temp_index;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indices[swap_index] = temp_index;

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a fix for it

}

ep_params.field_mask = UCP_EP_PARAM_FIELD_REMOTE_ADDRESS;
ep_params.address = (ucp_address_t *)mca_spml_ucx.remote_addrs_tbl[0][i];
ep_params.address = (ucp_address_t *) mca_spml_ucx.remote_addrs_tbl[0][indices[proc_index]];

err = ucp_ep_create(mca_spml_ucx_ctx_default.ucp_worker[0], &ep_params,
&mca_spml_ucx_ctx_default.ucp_peers[i].ucp_conn);
&mca_spml_ucx_ctx_default.ucp_peers[indices[proc_index]].ucp_conn);
if (UCS_OK != err) {
SPML_UCX_ERROR("ucp_ep_create(proc=%zu/%zu) failed: %s", n, nprocs,
SPML_UCX_ERROR("ucp_ep_create(proc=%d/%zu) failed: %s", proc_index, nprocs,
ucs_status_string(err));
goto error2;
}

/* Initialize mkeys as NULL for all processes */
mca_spml_ucx_peer_mkey_cache_init(&mca_spml_ucx_ctx_default, i);
mca_spml_ucx_peer_mkey_cache_init(&mca_spml_ucx_ctx_default, indices[proc_index]);
}

for (i = 0; i < mca_spml_ucx.ucp_workers; i++) {
Expand All @@ -719,6 +737,7 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
free(wk_roffs);
free(wk_addr_len);
free(wk_local_addr);
free(indices);

SPML_UCX_VERBOSE(50, "*** ADDED PROCS ***");

Expand Down Expand Up @@ -753,6 +772,7 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
free(wk_raddrs);
free(wk_rsizes);
free(wk_roffs);
free(indices);
error:
free(wk_addr_len);
free(wk_local_addr);
Expand Down
Loading