Skip to content

SPML/UCX: removed direct dependency to SPML UCX #8567

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
Mar 11, 2021
Merged

SPML/UCX: removed direct dependency to SPML UCX #8567

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
11 changes: 6 additions & 5 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 @@ -78,14 +78,14 @@ mca_spml_ucx_t mca_spml_ucx = {
.num_disconnect = 1,
.heap_reg_nb = 0,
.enabled = 0,
.get_mkey_slow = NULL,
.synchronized_quiet = false
.get_mkey_slow = NULL
};

mca_spml_ucx_ctx_t mca_spml_ucx_ctx_default = {
.ucp_worker = NULL,
.ucp_peers = NULL,
.options = 0
.ucp_worker = NULL,
.ucp_peers = NULL,
.options = 0,
.synchronized_quiet = false
};

#if HAVE_DECL_UCP_ATOMIC_OP_NBX
Expand Down Expand Up @@ -673,6 +673,7 @@ static int mca_spml_ucx_ctx_create_common(long options, mca_spml_ucx_ctx_t **ucx
ucx_ctx->options = options;
ucx_ctx->ucp_worker = calloc(1, sizeof(ucp_worker_h));
ucx_ctx->ucp_workers = 1;
ucx_ctx->synchronized_quiet = mca_spml_ucx_ctx_default.synchronized_quiet;

params.field_mask = UCP_WORKER_PARAM_FIELD_THREAD_MODE;
if (oshmem_mpi_thread_provided == SHMEM_THREAD_SINGLE || options & SHMEM_CTX_PRIVATE || options & SHMEM_CTX_SERIALIZED) {
Expand Down
3 changes: 2 additions & 1 deletion oshmem/mca/spml/ucx/spml_ucx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct mca_spml_ucx_ctx {
unsigned int ucp_workers;
int *put_proc_indexes;
unsigned put_proc_count;
bool synchronized_quiet;
};
typedef struct mca_spml_ucx_ctx mca_spml_ucx_ctx_t;

Expand Down Expand Up @@ -256,7 +257,7 @@ static inline int ucx_status_to_oshmem_nb(ucs_status_t status)

static inline void mca_spml_ucx_remote_op_posted(mca_spml_ucx_ctx_t *ctx, int dst)
{
if (OPAL_UNLIKELY(mca_spml_ucx.synchronized_quiet)) {
if (OPAL_UNLIKELY(ctx->synchronized_quiet)) {
if (!opal_bitmap_is_set_bit(&ctx->put_op_bitmap, dst)) {
ctx->put_proc_indexes[ctx->put_proc_count++] = dst;
opal_bitmap_set_bit(&ctx->put_op_bitmap, dst);
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/spml/ucx/spml_ucx_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static int mca_spml_ucx_component_register(void)

mca_spml_ucx_param_register_bool("synchronized_quiet", 0,
"Use synchronized quiet on shmem_quiet or shmem_barrier_all operations",
&mca_spml_ucx.synchronized_quiet);
&mca_spml_ucx_ctx_default.synchronized_quiet);

mca_spml_ucx_param_register_ulong("nb_progress_thresh_global", 0,
"Number of nb_put or nb_get operations before ucx progress is triggered. Disabled by default (0). Setting this value will override nb_put/get_progress_thresh.",
Expand Down