|
18 | 18 | * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. |
19 | 19 | * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. |
20 | 20 | * 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. |
22 | 23 | * Copyright (c) 2019 Research Organization for Information Science |
23 | 24 | * and Technology (RIST). All rights reserved. |
24 | 25 | * Copyright (c) 2020-2021 Google, LLC. All rights reserved. |
@@ -83,7 +84,7 @@ static int ompi_osc_rdma_query_mtls (void); |
83 | 84 |
|
84 | 85 | static const char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value); |
85 | 86 |
|
86 | | -static char *ompi_osc_rdma_btl_names; |
| 87 | +static char *ompi_osc_rdma_full_connectivity_btls; |
87 | 88 | static char *ompi_osc_rdma_mtl_names; |
88 | 89 | static char *ompi_osc_rdma_btl_alternate_names; |
89 | 90 |
|
@@ -256,14 +257,14 @@ static int ompi_osc_rdma_component_register (void) |
256 | 257 | MCA_BASE_VAR_SCOPE_GROUP, &mca_osc_rdma_component.locking_mode); |
257 | 258 | OBJ_RELEASE(new_enum); |
258 | 259 |
|
259 | | - ompi_osc_rdma_btl_names = "ugni,uct"; |
| 260 | + ompi_osc_rdma_full_connectivity_btls = "ugni,uct,ofi"; |
260 | 261 | opal_asprintf(&description_str, "Comma-delimited list of BTL component names to allow without verifying " |
261 | 262 | "connectivity. Do not add a BTL to to this list unless it can reach all " |
262 | 263 | "processes in any communicator used with an MPI window (default: %s)", |
263 | | - ompi_osc_rdma_btl_names); |
| 264 | + ompi_osc_rdma_full_connectivity_btls); |
264 | 265 | (void) mca_base_component_var_register (&mca_osc_rdma_component.super.osc_version, "btls", description_str, |
265 | 266 | 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); |
267 | 268 | free(description_str); |
268 | 269 |
|
269 | 270 | 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 |
986 | 987 | char **btls_to_use; |
987 | 988 | void *tmp; |
988 | 989 |
|
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, ','); |
990 | 991 |
|
991 | 992 | if (module) { |
992 | 993 | ompi_osc_rdma_selected_btl_insert(module, NULL, 0); |
|
0 commit comments