Skip to content

Commit 9c74047

Browse files
committed
osc/rdma: Remove MTL check
When the rdma and pt2pt onesided components both existed, there was a use case for lowering the priority of the RDMA component when certain MTLs are in use. With the pt2pt component removed, this is dead code. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 2e4d3a0 commit 9c74047

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

ompi/mca/osc/rdma/osc_rdma_component.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,10 @@ static int ompi_osc_rdma_component_select (struct ompi_win_t *win, void **base,
8080
int flavor, int *model);
8181
static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, ompi_osc_rdma_module_t *module);
8282
static int ompi_osc_rdma_query_alternate_btls (ompi_communicator_t *comm, ompi_osc_rdma_module_t *module);
83-
static int ompi_osc_rdma_query_mtls (void);
8483

8584
static const char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value);
8685

8786
static char *ompi_osc_rdma_full_connectivity_btls;
88-
static char *ompi_osc_rdma_mtl_names;
8987
static char *ompi_osc_rdma_btl_alternate_names;
9088

9189
static const mca_base_var_enum_value_t ompi_osc_rdma_locking_modes[] = {
@@ -275,14 +273,6 @@ static int ompi_osc_rdma_component_register (void)
275273
MCA_BASE_VAR_SCOPE_GROUP, &ompi_osc_rdma_btl_alternate_names);
276274
free(description_str);
277275

278-
ompi_osc_rdma_mtl_names = "psm2";
279-
opal_asprintf(&description_str, "Comma-delimited list of MTL component names to lower the priority of rdma "
280-
"osc component (default: %s)", ompi_osc_rdma_mtl_names);
281-
(void) mca_base_component_var_register (&mca_osc_rdma_component.super.osc_version, "mtls", description_str,
282-
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, OPAL_INFO_LVL_3,
283-
MCA_BASE_VAR_SCOPE_GROUP, &ompi_osc_rdma_mtl_names);
284-
free(description_str);
285-
286276
if (0 == access ("/dev/shm", W_OK)) {
287277
mca_osc_rdma_component.backing_directory = "/dev/shm";
288278
} else {
@@ -413,10 +403,6 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t *win, void **base, s
413403
}
414404
#endif /* OPAL_CUDA_SUPPORT */
415405

416-
if (OMPI_SUCCESS == ompi_osc_rdma_query_mtls ()) {
417-
return 5;
418-
}
419-
420406
if (OMPI_SUCCESS == ompi_osc_rdma_query_btls (comm, NULL)) {
421407
return mca_osc_rdma_component.priority;
422408
}
@@ -865,23 +851,6 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
865851
return ret;
866852
}
867853

868-
static int ompi_osc_rdma_query_mtls (void)
869-
{
870-
char **mtls_to_use;
871-
872-
mtls_to_use = opal_argv_split (ompi_osc_rdma_mtl_names, ',');
873-
if (mtls_to_use && ompi_mtl_base_selected_component) {
874-
for (int i = 0 ; mtls_to_use[i] ; ++i) {
875-
if (0 == strcmp (mtls_to_use[i], ompi_mtl_base_selected_component->mtl_version.mca_component_name)) {
876-
opal_argv_free(mtls_to_use);
877-
return OMPI_SUCCESS;
878-
}
879-
}
880-
}
881-
opal_argv_free(mtls_to_use);
882-
return -1;
883-
}
884-
885854
/**
886855
* @brief ensure that all local procs are added to the bml
887856
*

0 commit comments

Comments
 (0)