Skip to content

OMPI/MCA/PML/UCX: Set node local id - v5.0.x #13414

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

Open
wants to merge 1 commit into
base: v5.0.x
Choose a base branch
from
Open

OMPI/MCA/PML/UCX: Set node local id - v5.0.x #13414

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
3 changes: 2 additions & 1 deletion config/ompi_check_ucx.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ AC_DEFUN([OMPI_CHECK_UCX],[
UCP_WORKER_FLAG_IGNORE_REQUEST_LEAK,
UCP_OP_ATTR_FLAG_MULTI_SEND,
UCP_MEM_MAP_SYMMETRIC_RKEY,
UCS_MEMORY_TYPE_RDMA],
UCS_MEMORY_TYPE_RDMA,
UCP_PARAM_FIELD_NODE_LOCAL_ID],
[], [],
[#include <ucp/api/ucp.h>])
AC_CHECK_DECLS([UCP_WORKER_ATTR_FIELD_ADDRESS_FLAGS],
Expand Down
5 changes: 5 additions & 0 deletions ompi/mca/osc/ucx/osc_ucx_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ static int ucp_context_init(bool enable_mt, int proc_world_size) {
context_params.field_mask |= UCP_PARAM_FIELD_ESTIMATED_NUM_PPN;
#endif

#if HAVE_DECL_UCP_PARAM_FIELD_NODE_LOCAL_ID
context_params.node_local_id = opal_process_info.my_local_rank;
context_params.field_mask |= UCP_PARAM_FIELD_NODE_LOCAL_ID;
#endif

status = ucp_init(&context_params, config, &mca_osc_ucx_component.wpool->ucp_ctx);
if (UCS_OK != status) {
OSC_UCX_VERBOSE(1, "ucp_init failed: %d", status);
Expand Down
5 changes: 5 additions & 0 deletions ompi/mca/pml/ucx/pml_ucx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@ int mca_pml_ucx_open(void)
params.field_mask |= UCP_PARAM_FIELD_ESTIMATED_NUM_PPN;
#endif

#if HAVE_DECL_UCP_PARAM_FIELD_NODE_LOCAL_ID
params.node_local_id = opal_process_info.my_local_rank;
params.field_mask |= UCP_PARAM_FIELD_NODE_LOCAL_ID;
#endif

status = ucp_init(&params, config, &ompi_pml_ucx.ucp_context);
ucp_config_release(config);

Expand Down
5 changes: 5 additions & 0 deletions 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 @@ -292,6 +292,11 @@ static int spml_ucx_init(void)
params.field_mask |= UCP_PARAM_FIELD_ESTIMATED_NUM_PPN;
#endif

#if HAVE_DECL_UCP_PARAM_FIELD_NODE_LOCAL_ID
params.node_local_id = opal_process_info.my_local_rank;
params.field_mask |= UCP_PARAM_FIELD_NODE_LOCAL_ID;
#endif

err = ucp_init(&params, ucp_config, &mca_spml_ucx.ucp_context);
ucp_config_release(ucp_config);
if (UCS_OK != err) {
Expand Down