Skip to content

Commit 2e4d3a0

Browse files
committed
osc/rdma: Add OFI as a full connectivity BTL
Add ofi to the list of btls that do not need to verify connectivity, since the most common use case of OFI does provide this property. Rename the list of btls with full connectivity from ompi_osc_rdma_btls to ompi_osc_rdma_full_connectivity_btls to make it a little more clear what the list represents. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent bcc3b72 commit 2e4d3a0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

ompi/mca/osc/rdma/osc_rdma_component.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
1919
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
2020
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
21-
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
21+
* Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates.
22+
* All Rights reserved.
2223
* Copyright (c) 2019 Research Organization for Information Science
2324
* and Technology (RIST). All rights reserved.
2425
* Copyright (c) 2020-2021 Google, LLC. All rights reserved.
@@ -83,7 +84,7 @@ static int ompi_osc_rdma_query_mtls (void);
8384

8485
static const char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value);
8586

86-
static char *ompi_osc_rdma_btl_names;
87+
static char *ompi_osc_rdma_full_connectivity_btls;
8788
static char *ompi_osc_rdma_mtl_names;
8889
static char *ompi_osc_rdma_btl_alternate_names;
8990

@@ -256,14 +257,14 @@ static int ompi_osc_rdma_component_register (void)
256257
MCA_BASE_VAR_SCOPE_GROUP, &mca_osc_rdma_component.locking_mode);
257258
OBJ_RELEASE(new_enum);
258259

259-
ompi_osc_rdma_btl_names = "ugni,uct";
260+
ompi_osc_rdma_full_connectivity_btls = "ugni,uct,ofi";
260261
opal_asprintf(&description_str, "Comma-delimited list of BTL component names to allow without verifying "
261262
"connectivity. Do not add a BTL to to this list unless it can reach all "
262263
"processes in any communicator used with an MPI window (default: %s)",
263-
ompi_osc_rdma_btl_names);
264+
ompi_osc_rdma_full_connectivity_btls);
264265
(void) mca_base_component_var_register (&mca_osc_rdma_component.super.osc_version, "btls", description_str,
265266
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, OPAL_INFO_LVL_3,
266-
MCA_BASE_VAR_SCOPE_GROUP, &ompi_osc_rdma_btl_names);
267+
MCA_BASE_VAR_SCOPE_GROUP, &ompi_osc_rdma_full_connectivity_btls);
267268
free(description_str);
268269

269270
ompi_osc_rdma_btl_alternate_names = "sm,tcp";
@@ -986,7 +987,7 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, ompi_osc_rdma_mo
986987
char **btls_to_use;
987988
void *tmp;
988989

989-
btls_to_use = opal_argv_split (ompi_osc_rdma_btl_names, ',');
990+
btls_to_use = opal_argv_split (ompi_osc_rdma_full_connectivity_btls, ',');
990991

991992
if (module) {
992993
ompi_osc_rdma_selected_btl_insert(module, NULL, 0);

0 commit comments

Comments
 (0)