Changeset 5667

Timestamp:

11/02/09 18:10:03 (3 weeks ago)

Author:

balaji

Message:

Allow users to pick the PMI version they want based on environment
settings. We currently use this to switch between PMI-1 and
PMI-1.1. PMI-2 is still a configure option, but with the recent
changes to use non-conflicting symbols, it can use this code in the
future as well.

Reviewed by goodell.

Location:

mpich2/trunk/src

Files:

• include/mpiimpl.h (modified) (1 diff)
• mpid/ch3/src/mpid_vc.c (modified) (2 diffs)

mpich2/trunk/src/include/mpiimpl.h

@@ -63 +63 @@
 #endif
 
+/* Default PMI version to use */
+#define MPIU_DEFAULT_PMI_VERSION 1
+#define MPIU_DEFAULT_PMI_SUBVERSION 1
 
 /* This allows us to keep names local to a single file when we can use

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

@@ -1086 +1086 @@
     int no_local = 0;
     int odd_even_cliques = 0;
+    int pmi_version = MPIU_DEFAULT_PMI_VERSION, pmi_subversion = MPIU_DEFAULT_PMI_SUBVERSION;
     MPIU_CHKLMEM_DECL(4);
+
+    /* See if the user wants to override our default values */
+    MPIU_GetEnvInt("PMI_VERSION", &pmi_version);
+    MPIU_GetEnvInt("PMI_SUBVERSION", &pmi_subversion);
 
     if (pg->size == 1) {
@@ -1189 +1194 @@
 
     /* 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;
-        int num_nodes = 0;
-        /* this code currently assumes pg is comm_world */
-        mpi_errno = populate_ids_from_mapping(value, &num_nodes, pg, &did_map);
-        if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-        g_num_nodes = num_nodes;
-        if (did_map) {
-            goto fn_exit;
+    if (pmi_version == 1 && pmi_subversion == 1) {
+        pmi_errno = PMI_KVS_Get(kvs_name, "PMI_process_mapping", value, val_max_sz);
+        if (pmi_errno == 0) {
+            int did_map = 0;
+            int num_nodes = 0;
+            /* this code currently assumes pg is comm_world */
+            mpi_errno = populate_ids_from_mapping(value, &num_nodes, pg, &did_map);
+            if (mpi_errno) MPIU_ERR_POP(mpi_errno);
+            g_num_nodes = num_nodes;
+            if (did_map) {
+                goto fn_exit;
+            }
+            else {
+                MPIU_DBG_MSG_S(CH3_OTHER,TERSE,"did_map==0, unable to populate node ids from mapping=%s",value);
+            }
+            /* else fall through to O(N^2) PMI_KVS_Gets version */
         }
         else {
-            MPIU_DBG_MSG_S(CH3_OTHER,TERSE,"did_map==0, unable to populate node ids from mapping=%s",value);
+            MPIU_DBG_MSG(CH3_OTHER,TERSE,"unable to obtain the 'PMI_process_mapping' PMI key");
         }
-        /* else fall through to O(N^2) PMI_KVS_Gets version */
-    }
-    else {
-        MPIU_DBG_MSG(CH3_OTHER,TERSE,"unable to obtain the 'PMI_process_mapping' PMI key");
     }