pmix: removed pmix_base_direct modex mca parameter, renamed orte_full_modex_cutoff and ompi_hostname_cutoff to direct_modex_cutoff

ompi/mca/rte/orte/rte_orte.h

@@ -137,7 +137,7 @@ static inline orte_process_name_t * OMPI_CAST_RTE_NAME(opal_process_name_t * nam
 }
 #endif
 
-#define ompi_hostname_cutoff orte_full_modex_cutoff
+#define ompi_direct_modex_cutoff orte_direct_modex_cutoff
 
 END_C_DECLS
 

ompi/proc/proc.c

@@ -165,7 +165,7 @@ int ompi_proc_complete_init(void)
             }
             OPAL_LIST_DESTRUCT(&myvals);
 
-            if (ompi_process_info.num_procs < ompi_hostname_cutoff) {
+            if (ompi_process_info.num_procs < ompi_direct_modex_cutoff) {
                 /* IF the number of procs falls below the specified cutoff,
                  * then we assume the job is small enough that retrieving
                  * the hostname (which will typically cause retrieval of
@@ -433,7 +433,7 @@ int ompi_proc_refresh(void)
             }
             OPAL_LIST_DESTRUCT(&myvals);
 
-            if (ompi_process_info.num_procs < ompi_hostname_cutoff) {
+            if (ompi_process_info.num_procs < ompi_direct_modex_cutoff) {
                 /* IF the number of procs falls below the specified cutoff,
                  * then we assume the job is small enough that retrieving
                  * the hostname (which will typically cause retrieval of
@@ -723,7 +723,7 @@ ompi_proc_unpack(opal_buffer_t* buf,
 #else
                 new_arch = opal_local_arch;
 #endif
-                if (ompi_process_info.num_procs < ompi_hostname_cutoff) {
+                if (ompi_process_info.num_procs < ompi_direct_modex_cutoff) {
                     /* retrieve the hostname */
                     OBJ_CONSTRUCT(&myvals, opal_list_t);
                     rc = opal_dstore.fetch(opal_dstore_internal,

ompi/runtime/params.h

@@ -126,7 +126,7 @@ OMPI_DECLSPEC extern bool ompi_use_sparse_group_storage;
 /*
  * Cutoff point for retrieving hostnames
  */
-OMPI_DECLSPEC extern uint32_t ompi_hostname_cutoff;
+OMPI_DECLSPEC extern uint32_t ompi_direct_modex_cutoff;
 
 /**
  * Register MCA parameters used by the MPI layer.

opal/mca/pmix/base/pmix_base_frame.c

@@ -32,16 +32,6 @@ bool opal_pmix_base_allow_delayed_server = false;
 
 static int opal_pmix_base_frame_register(mca_base_register_flag_t flags)
 {
-    opal_pmix_use_collective = true;
-    (void)mca_base_var_register("opal", "pmix", "base", "direct_modex",
-                                "Default to direct modex (default: false)",
-                                MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
-                                OPAL_INFO_LVL_9,
-                                MCA_BASE_VAR_SCOPE_READONLY,
-                                &opal_pmix_use_collective);
-    if (opal_pmix_use_collective) {
-        setenv("OMPI_MTL_MXM_CONNECT_ON_FIRST_COMM", "true", 0);
-    }
     return OPAL_SUCCESS;
 }
 

orte/orted/pmix/pmix_server_sendrecv.c

@@ -752,7 +752,7 @@ static void process_message(pmix_server_peer_t *peer)
         /* if we are in a group collective mode, then we need to prep
          * the data as it should be included in the modex */
         OBJ_CONSTRUCT(&save, opal_buffer_t);
-        if (orte_process_info.num_procs < orte_full_modex_cutoff) {
+        if (orte_process_info.num_procs < orte_direct_modex_cutoff) {
             /* need to include the id of the sender for later unpacking */
             opal_dss.pack(&save, &id, 1, OPAL_UINT64);
             opal_dss.copy_payload(&save, &xfer);

orte/runtime/orte_globals.c

@@ -197,7 +197,7 @@ opal_thread_t orte_progress_thread;
 char *orte_base_user_debugger = NULL;
 
 /* modex cutoff */
-uint32_t orte_full_modex_cutoff = UINT32_MAX;
+uint32_t orte_direct_modex_cutoff = UINT32_MAX;
 
 int orte_debug_output = -1;
 bool orte_debug_daemons_flag = false;

orte/runtime/orte_globals.h

@@ -578,7 +578,7 @@ ORTE_DECLSPEC extern char *orte_base_user_debugger;
 ORTE_DECLSPEC extern char *orte_daemon_cores;
 
 /* cutoff for collective modex */
-ORTE_DECLSPEC extern uint32_t orte_full_modex_cutoff;
+ORTE_DECLSPEC extern uint32_t orte_direct_modex_cutoff;
 
 END_C_DECLS
 

orte/runtime/orte_mca_params.c

@@ -733,15 +733,15 @@ int orte_register_params(void)
                                   &orte_daemon_cores);
 
     /* cutoff for full modex */
-    orte_full_modex_cutoff = UINT32_MAX;
-    id = mca_base_var_register ("orte", "orte", NULL, "full_modex_cutoff",
+    orte_direct_modex_cutoff = UINT32_MAX;
+    id = mca_base_var_register ("orte", "orte", NULL, "direct_modex_cutoff",
                                 "If the number of processes in the application exceeds the provided value,"
                                 "modex will be done upon demand [default: UINT32_MAX]",
                                 MCA_BASE_VAR_TYPE_UNSIGNED_INT, NULL, 0, 0,
                                 OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
-                                &orte_full_modex_cutoff);
+                                &orte_direct_modex_cutoff);
     /* register a synonym for old name */
-    mca_base_var_register_synonym (id, "ompi", "hostname", "cutoff", NULL, MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
+    mca_base_var_register_synonym (id, "ompi", "direct_modex", "cutoff", NULL, MCA_BASE_VAR_SYN_FLAG_DEPRECATED);
 
     return ORTE_SUCCESS;
 }