@@ -80,12 +80,10 @@ static int ompi_osc_rdma_component_select (struct ompi_win_t *win, void **base,
80
80
int flavor , int * model );
81
81
static int ompi_osc_rdma_query_btls (ompi_communicator_t * comm , ompi_osc_rdma_module_t * module );
82
82
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 );
84
83
85
84
static const char * ompi_osc_rdma_set_no_lock_info (opal_infosubscriber_t * obj , const char * key , const char * value );
86
85
87
86
static char * ompi_osc_rdma_full_connectivity_btls ;
88
- static char * ompi_osc_rdma_mtl_names ;
89
87
static char * ompi_osc_rdma_btl_alternate_names ;
90
88
91
89
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)
275
273
MCA_BASE_VAR_SCOPE_GROUP , & ompi_osc_rdma_btl_alternate_names );
276
274
free (description_str );
277
275
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
-
286
276
if (0 == access ("/dev/shm" , W_OK )) {
287
277
mca_osc_rdma_component .backing_directory = "/dev/shm" ;
288
278
} else {
@@ -413,10 +403,6 @@ static int ompi_osc_rdma_component_query (struct ompi_win_t *win, void **base, s
413
403
}
414
404
#endif /* OPAL_CUDA_SUPPORT */
415
405
416
- if (OMPI_SUCCESS == ompi_osc_rdma_query_mtls ()) {
417
- return 5 ;
418
- }
419
-
420
406
if (OMPI_SUCCESS == ompi_osc_rdma_query_btls (comm , NULL )) {
421
407
return mca_osc_rdma_component .priority ;
422
408
}
@@ -865,23 +851,6 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
865
851
return ret ;
866
852
}
867
853
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
-
885
854
/**
886
855
* @brief ensure that all local procs are added to the bml
887
856
*
0 commit comments