Changeset 5664

Timestamp:

11/02/09 17:25:42 (3 weeks ago)

Author:

balaji

Message:

Name-space the PMI2 (and PMI-1.1) process-mapping key value.

Reviewed by goodell.

Location:

mpich2/trunk/src

Files:

• mpid/ch3/src/mpid_vc.c (modified) (4 diffs)
• pm/hydra/pm/pmiserv/pmi_handle_v1.c (modified) (2 diffs)
• pm/hydra/pm/pmiserv/pmi_handle_v2.c (modified) (2 diffs)
• pm/mpd/mpdman.py (modified) (1 diff)

mpich2/trunk/src/mpid/ch3/src/mpid_vc.c

@@ -1003 +1003 @@
 {
     int mpi_errno = MPI_SUCCESS;
-    /* process-mapping is available */
+    /* PMI_process_mapping is available */
     mapping_type_t mt = -1;
     map_block_t *mb = NULL;
@@ -1157 +1157 @@
         int num_nodes = 0;
 
-        mpi_errno = PMI2_Info_GetJobAttr("process-mapping", process_mapping, sizeof(process_mapping), &found);
+        mpi_errno = PMI2_Info_GetJobAttr("PMI_process_mapping", process_mapping, sizeof(process_mapping), &found);
         if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-        MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "process-mapping attribute not found");
+        MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "PMI_process_mapping attribute not found");
         /* this code currently assumes pg is comm_world */
         mpi_errno = populate_ids_from_mapping(process_mapping, &num_nodes, pg, &did_map);
         if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-        MPIU_ERR_CHKINTERNAL(!did_map, mpi_errno, "unable to populate node ids from process-mapping");
+        MPIU_ERR_CHKINTERNAL(!did_map, mpi_errno, "unable to populate node ids from PMI_process_mapping");
         g_num_nodes = num_nodes;
     }
@@ -1186 +1186 @@
     if (mpi_errno) MPIU_ERR_POP(mpi_errno);
 
-    /* See if process manager supports process-mapping keyval */
-
-    /* FIXME 'process-mapping' only applies for the original PG (MPI_COMM_WORLD) */
-    pmi_errno = PMI_KVS_Get(kvs_name, "process-mapping", value, val_max_sz);
+    /* See if process manager supports PMI_process_mapping keyval */
+
+    /* FIXME 'PMI_process_mapping' only applies for the original PG (MPI_COMM_WORLD) */
+    pmi_errno = PMI_KVS_Get(kvs_name, "PMI_process_mapping", value, val_max_sz);
     if (pmi_errno == 0) {
         int did_map = 0;
@@ -1206 +1206 @@
     }
     else {
-        MPIU_DBG_MSG(CH3_OTHER,TERSE,"unable to obtain the 'process-mapping' PMI key");
+        MPIU_DBG_MSG(CH3_OTHER,TERSE,"unable to obtain the 'PMI_process_mapping' PMI key");
     }
 

mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v1.c

@@ -307 +307 @@
         /* Didn't find the job attribute; see if we know how to
          * generate it */
-        if (strcmp(key, "process-mapping") == 0) {
+        if (strcmp(key, "PMI_process_mapping") == 0) {
             /* Create a vector format */
             status = HYD_pmcd_pmi_process_mapping(process, HYD_pmcd_pmi_vector, &node_list);
@@ -316 +316 @@
                                     "key value larger than maximum allowed\n");
 
-            status = HYD_pmcd_pmi_add_kvs("process-mapping", node_list,
+            status = HYD_pmcd_pmi_add_kvs("PMI_process_mapping", node_list,
                                           process->node->pg->kvs, &ret);
             HYDU_ERR_POP(status, "unable to add process_mapping to KVS\n");

mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_handle_v2.c

@@ -506 +506 @@
         /* Didn't find the job attribute; see if we know how to
          * generate it */
-        if (strcmp(key, "process-mapping") == 0) {
+        if (strcmp(key, "PMI_process_mapping") == 0) {
             /* Create a vector format */
             status = HYD_pmcd_pmi_process_mapping(process, HYD_pmcd_pmi_vector, &node_list);
@@ -515 +515 @@
                                     "key value larger than maximum allowed\n");
 
-            status = HYD_pmcd_pmi_add_kvs("process-mapping", node_list,
+            status = HYD_pmcd_pmi_add_kvs("PMI_process_mapping", node_list,
                                           process->node->pg->kvs, &ret);
             HYDU_ERR_POP(status, "unable to add process_mapping to KVS\n");

mpich2/trunk/src/pm/mpd/mpdman.py

@@ -441 +441 @@
                 mpd_print(1,'expected msg to contain a process_mapping key')
                 sys.exit(-1)
-            self.KVSs[self.default_kvsname]['process-mapping'] = msg['process_mapping']
+            self.KVSs[self.default_kvsname]['PMI_process_mapping'] = msg['process_mapping']