Merge pull request #13090 from edgargabriel/pr/hmem-fix-for-cxi-5.0.x

janjust · web-flow · commit 83829b1a8e7b · 2025-02-14T14:31:15.000-06:00
mtl: ofi change to allow cxi anywhere in provname -v5.0.x
diff --git a/ompi/mca/mtl/ofi/mtl_ofi_component.c b/ompi/mca/mtl/ofi/mtl_ofi_component.c
@@ -832,7 +832,8 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
          * have a problem here since it uses fi_mr_regattr only within the context of an rcache, and manages the
          * requested_key field in this way.
          */
-         if (!strncasecmp(prov->fabric_attr->prov_name, "cxi", 3)) {
+         if ((NULL != strstr(prov->fabric_attr->prov_name, "cxi")) ||
+             (NULL != strstr(prov->fabric_attr->prov_name, "CXI")) ) {
              ompi_mtl_ofi.hmem_needs_reg = false;
          }
 

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,8 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,`
`832`	`832`	`* have a problem here since it uses fi_mr_regattr only within the context of an rcache, and manages the`
`833`	`833`	`* requested_key field in this way.`
`834`	`834`	`*/`
`835`		`- if (!strncasecmp(prov->fabric_attr->prov_name, "cxi", 3)) {`
	`835`	`+ if ((NULL != strstr(prov->fabric_attr->prov_name, "cxi")) \|\|`
	`836`	`+ (NULL != strstr(prov->fabric_attr->prov_name, "CXI")) ) {`
`836`	`837`	`ompi_mtl_ofi.hmem_needs_reg = false;`
`837`	`838`	`}`
`838`	`839`