Merge pull request #7678 from rhc54/topic/nit

Ensure proper handling of default MCA param files

Author: rhc54

ompi/runtime/ompi_mpi_finalize.c

@@ -276,7 +276,7 @@ int ompi_mpi_finalize(void)
         ompi_communicator_t *comm = &ompi_mpi_comm_world.comm;
         comm->c_coll->coll_barrier(comm, comm->c_coll->coll_barrier_module);
 
-        if (PMIX_SUCCESS != (rc = PMIx_Fence(NULL, 0))) {
+        if (PMIX_SUCCESS != (rc = PMIx_Fence(NULL, 0, NULL, 0))) {
             ret = opal_pmix_convert_status(rc);
             OMPI_ERROR_LOG(ret);
         }

ompi/runtime/ompi_rte.c

@@ -755,28 +755,6 @@ int ompi_rte_init(int *pargc, char ***pargv)
         opal_process_info.proc_is_bound = false;
     }
 
-    /* get our numa rank from PMIx */
-    if (opal_process_info.proc_is_bound) {
-        OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_NUMA_RANK,
-                                       &opal_process_info.my_name, &u16ptr, PMIX_UINT16);
-        if (PMIX_SUCCESS != rc) {
-            if (ompi_singleton) {
-                /* just assume the numa_rank is invalid, set to UINT16_MAX */
-                u16 = UINT16_MAX;
-            } else {
-                ret = opal_pmix_convert_status(rc);
-                error = "numa rank";
-                goto error;
-            }
-        }
-        opal_process_info.my_numa_rank = u16;
-    } else {
-        /* If processes are not bound, the numa_rank is not available
-         * Assign UINT16_MAX to the numa_rank to indicate an invalid value
-         */
-        opal_process_info.my_numa_rank = UINT16_MAX;
-    }
-
     /* get our local peers */
     if (0 < opal_process_info.num_local_peers) {
         /* if my local rank if too high, then that's an error */

opal/mca/base/mca_base_var.c

@@ -297,6 +297,11 @@ int mca_base_var_init(void)
             return OPAL_ERROR;
         }
 
+        if( NULL == (cwd = getcwd(NULL, 0) )) {
+            opal_output(0, "Error: Unable to get the current working directory\n");
+            cwd = strdup(".");
+        }
+
         /* Set this before we register the parameter, below */
 
         mca_base_var_initialized = true;
@@ -410,20 +415,15 @@ int mca_base_var_cache_files(bool rel_path_search)
     char *tmp;
     int ret;
 
-    if (NULL == cwd) {
-        cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
-        if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
-            opal_output(0, "Error: Unable to get the current working directory\n");
-            cwd = strdup(".");
-        }
+    if (NULL != getenv("OPAL_USER_PARAMS_GIVEN")) {
+        /* PMIx already provided the params for us */
+        return OPAL_SUCCESS;
     }
 
 #if OPAL_WANT_HOME_CONFIG_FILES
-    if (NULL == getenv("OPAL_USER_PARAMS_GIVEN")) {
-        opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
-                 "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
-                 home, ',', opal_install_dirs.sysconfdir);
-    }
+    opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
+             "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
+             home, ',', opal_install_dirs.sysconfdir);
 #else
     opal_asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
              opal_install_dirs.sysconfdir);

opal/mca/pmix/pmix4x/openpmix

@@ -40,7 +40,6 @@ opal_process_info_t opal_process_info = {
     .num_local_peers = 0,  /* there is nobody else but me */
     .my_local_rank = 0,    /* I'm the only process around here */
     .my_node_rank = 0,
-    .my_numa_rank = UINT16_MAX,     /* Assume numa_rank is unavailable, set to UINT16_MAX */
     .cpuset = NULL,
     .pid = 0,
     .num_procs = 0,

opal/util/proc.c

@@ -114,7 +114,6 @@ typedef struct opal_process_info_t {
     uint32_t num_local_peers;           /**< number of procs from my job that share my node with me */
     uint16_t my_local_rank;             /**< local rank on this node within my job */
     uint16_t my_node_rank;
-    uint16_t my_numa_rank;              /**< rank on this processes NUMA node. A value of UINT16_MAX indicates unavailable numa_rank */
     char *cpuset;                       /**< String-representation of bitmap where we are bound */
     pid_t pid;
     uint32_t num_procs;