Skip to content

v4.1.x: Fix OFI build warnings #13270

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

Closed
wants to merge 2 commits into from
Closed

v4.1.x: Fix OFI build warnings #13270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995bd30
btl/ofi: Use internal macros for FI_MR_BASIC and FI_MR_SCALABLE
shijin-aws May 20, 2025
b097ff7
mtl/ofi: Remove special patch for gni provider
shijin-aws May 20, 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
11 changes: 0 additions & 11 deletions ompi/mca/mtl/ofi/mtl_ofi_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,17 +897,6 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
goto error;
}

/**
* Unfortunately the attempt to implement FI_MR_SCALABLE in the GNI provider
* doesn't work, at least not well. Since we're asking for the 1.5 libfabric
* API now, we have to tell GNI we want to use Mr. Basic. Using FI_MR_BASIC
* rather than FI_MR_VIRT_ADDR | FI_MR_ALLOCATED | FI_MR_PROV_KEY to stay
* compatible with older libfabrics.
*/
if (!strncmp(prov->fabric_attr->prov_name,"gni",3)) {
prov->domain_attr->mr_mode = FI_MR_BASIC;
}

#if OPAL_CUDA_SUPPORT
/**
* Some providers do not require the use of the CUDA convertor
Expand Down
14 changes: 12 additions & 2 deletions opal/mca/btl/ofi/btl_ofi_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@

#define MCA_BTL_OFI_REQUESTED_MR_MODE (FI_MR_ALLOCATED | FI_MR_PROV_KEY | FI_MR_VIRT_ADDR)

/**
* FI_MR_BASIC (1<<0) and FI_MR_SCALABLE (1<<1) are deprecated
* since Libfabric 1.5 and the symbols will get removed in
* future Libfabric 2.x versions. Use the internal mode bits
* for backward compatibilities without breaking compilation
* with newer libfabric.
*/
#define MCA_BTL_OFI_MR_BASIC (1 << 0)
#define MCA_BTL_OFI_MR_SCALABLE (1 << 1)

static char *ofi_progress_mode;
static bool disable_sep;
static int mca_btl_ofi_init_device(struct fi_info *info);
Expand Down Expand Up @@ -107,7 +117,7 @@ static int validate_info(struct fi_info *info, uint64_t required_caps,

mr_mode = info->domain_attr->mr_mode;

if (!(mr_mode == FI_MR_BASIC || mr_mode == FI_MR_SCALABLE ||
if (!(mr_mode == MCA_BTL_OFI_MR_BASIC || mr_mode == MCA_BTL_OFI_MR_SCALABLE ||
(mr_mode & ~(FI_MR_VIRT_ADDR | FI_MR_ALLOCATED | FI_MR_PROV_KEY)) == 0)) {
BTL_VERBOSE(("unsupported MR mode"));
return OPAL_ERROR;
Expand Down Expand Up @@ -609,7 +619,7 @@ static int mca_btl_ofi_init_device(struct fi_info *info)
module->outstanding_rdma = 0;
module->use_virt_addr = false;

if (ofi_info->domain_attr->mr_mode == FI_MR_BASIC ||
if (ofi_info->domain_attr->mr_mode == MCA_BTL_OFI_MR_BASIC ||
ofi_info->domain_attr->mr_mode & FI_MR_VIRT_ADDR) {
module->use_virt_addr = true;
}
Expand Down