Skip to content

SPML/UCX: Fix compilation warnings with GCC #7353

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
merged 1 commit into from
Feb 4, 2020
Merged

SPML/UCX: Fix compilation warnings with GCC #7353

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
24 changes: 12 additions & 12 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 @@ -101,10 +101,10 @@ int mca_spml_ucx_enable(bool enable)

int mca_spml_ucx_del_procs(ompi_proc_t** procs, size_t nprocs)
{
size_t ucp_workers = mca_spml_ucx.ucp_workers;
opal_common_ucx_del_proc_t *del_procs;
size_t i, w, n;
int ret;
int ucp_workers = mca_spml_ucx.ucp_workers;

oshmem_shmem_barrier();

Expand Down Expand Up @@ -281,16 +281,16 @@ int mca_spml_ucx_clear_put_op_mask(mca_spml_ucx_ctx_t *ctx)

int mca_spml_ucx_add_procs(ompi_proc_t** procs, size_t nprocs)
{
size_t i, j, k, w, n;
int rc = OSHMEM_ERROR;
int my_rank = oshmem_my_proc_id();
int ucp_workers = mca_spml_ucx.ucp_workers;
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;
char *wk_raddrs = NULL;
size_t i, j, w, n;
ucs_status_t err;
ucp_address_t **wk_local_addr;
unsigned int *wk_addr_len;
unsigned int *wk_roffs = NULL;
unsigned int *wk_rsizes = NULL;
char *wk_raddrs = NULL;
ucp_ep_params_t ep_params;

wk_local_addr = calloc(mca_spml_ucx.ucp_workers, sizeof(ucp_address_t *));
Expand Down Expand Up @@ -749,9 +749,9 @@ static int mca_spml_ucx_ctx_create_common(long options, mca_spml_ucx_ctx_t **ucx

int mca_spml_ucx_ctx_create(long options, shmem_ctx_t *ctx)
{
mca_spml_ucx_ctx_t *ucx_ctx = NULL;
mca_spml_ucx_ctx_array_t *idle_array = &mca_spml_ucx.idle_array;
mca_spml_ucx_ctx_t *ucx_ctx = NULL;
mca_spml_ucx_ctx_array_t *active_array = &mca_spml_ucx.active_array;
mca_spml_ucx_ctx_array_t *idle_array = &mca_spml_ucx.idle_array;
int i = 0, rc = OSHMEM_SUCCESS;

/* Take a lock controlling context creation. AUX context may set specific
Expand Down Expand Up @@ -781,8 +781,8 @@ int mca_spml_ucx_ctx_create(long options, shmem_ctx_t *ctx)

if (!(options & SHMEM_CTX_PRIVATE)) {
SHMEM_MUTEX_LOCK(mca_spml_ucx.internal_mutex);
_ctx_add(&mca_spml_ucx.active_array, ucx_ctx);
if (mca_spml_ucx.active_array.ctxs_count == 0) {
_ctx_add(active_array, ucx_ctx);
if (active_array->ctxs_count == 0) {
opal_progress_register(spml_ucx_ctx_progress);
}
SHMEM_MUTEX_UNLOCK(mca_spml_ucx.internal_mutex);
Expand Down