Skip to content

Stopgap measure for deprecated libfabric macros #4690

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
eisenhauer merged 3 commits into from
Oct 24, 2025
Merged

Stopgap measure for deprecated libfabric macros #4690

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b08819
Stopgap measure of deprecated libfabric macros
eisenhauer Oct 23, 2025
08635c2
minimize macros, fix missing, add comment
eisenhauer Oct 24, 2025
becfb50
Merge branch 'master' into RDMAUp
eisenhauer Oct 24, 2025
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
22 changes: 17 additions & 5 deletions source/adios2/toolkit/sst/dp/rdma_dp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ static pthread_mutex_t fabric_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t wsr_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t ts_mutex = PTHREAD_MUTEX_INITIALIZER;

/*
* Internal version of deprecated APIs.
* These are used internally to avoid compiler warnings.
*/

#define ADIOS_FI_MR_UNSPEC 0
#define ADIOS_FI_MR_BASIC (1 << 0)
#define ADIOS_FI_MR_SCALABLE (1 << 1)

#define ADIOS_FI_LOCAL_MR (1ULL << 55)
#define ADIOS_FI_REG_MR (1ULL << 59)

/*
* Wrapper for fi_mr_reg() with additional parameters endpoint and mr_mode.
* If mr_mode includes FI_MR_ENDPOINT, the memory region must be bound to the
Expand Down Expand Up @@ -400,7 +412,7 @@ static void init_fabric(struct fabric_state *fabric, struct _SstParams *Params,
hints->caps =
FI_MSG | FI_SEND | FI_RECV | FI_REMOTE_READ | FI_REMOTE_WRITE | FI_RMA | FI_READ | FI_WRITE;
hints->mode =
FI_CONTEXT | FI_LOCAL_MR | FI_CONTEXT2 | FI_MSG_PREFIX | FI_ASYNC_IOV | FI_RX_CQ_DATA;
FI_CONTEXT | ADIOS_FI_LOCAL_MR | FI_CONTEXT2 | FI_MSG_PREFIX | FI_ASYNC_IOV | FI_RX_CQ_DATA;
hints->ep_attr->type = FI_EP_RDM;
hints->domain_attr->threading = FI_THREAD_SAFE;

Expand Down Expand Up @@ -564,7 +576,7 @@ static void init_fabric(struct fabric_state *fabric, struct _SstParams *Params,
fabric->ctx = NULL;
}

if (info->mode & FI_LOCAL_MR)
if (info->mode & ADIOS_FI_LOCAL_MR)
{
fabric->local_mr_req = 1;
}
Expand Down Expand Up @@ -605,7 +617,7 @@ static void init_fabric(struct fabric_state *fabric, struct _SstParams *Params,
* So we propagate the bit value currently contained in the mr_mode
* for these flags.
*/
if (info->domain_attr->mr_mode != FI_MR_BASIC)
if (info->domain_attr->mr_mode != ADIOS_FI_MR_BASIC)
{
info->domain_attr->mr_mode = FI_MR_ALLOCATED | FI_MR_PROV_KEY | FI_MR_LOCAL |
(FI_MR_ENDPOINT & info->domain_attr->mr_mode) |
Expand Down Expand Up @@ -2507,7 +2519,7 @@ static int RdmaGetPriority(CP_Services Svcs, void *CP_Stream, struct _SstParams
hints->caps =
FI_MSG | FI_SEND | FI_RECV | FI_REMOTE_READ | FI_REMOTE_WRITE | FI_RMA | FI_READ | FI_WRITE;
hints->mode =
FI_CONTEXT | FI_LOCAL_MR | FI_CONTEXT2 | FI_MSG_PREFIX | FI_ASYNC_IOV | FI_RX_CQ_DATA;
FI_CONTEXT | ADIOS_FI_LOCAL_MR | FI_CONTEXT2 | FI_MSG_PREFIX | FI_ASYNC_IOV | FI_RX_CQ_DATA;
hints->ep_attr->type = FI_EP_RDM;

char const *vni_env_str = getenv("SLINGSHOT_VNIS");
Expand Down Expand Up @@ -2537,7 +2549,7 @@ static int RdmaGetPriority(CP_Services Svcs, void *CP_Stream, struct _SstParams

fi_version = FI_VERSION(1, 5);

hints->domain_attr->mr_mode = FI_MR_BASIC;
hints->domain_attr->mr_mode = ADIOS_FI_MR_BASIC;
hints->domain_attr->control_progress = FI_PROGRESS_AUTO;
// data progress unspecified, both are fine
// hints->domain_attr->data_progress = FI_PROGRESS_AUTO;
Expand Down
Loading