[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-132-g2e0747a

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  2e0747aac347153bdf4e7bf5efe638a455904bce (commit)
      from  daa5a15154e77a132fecbb56be1c6ba4ff5c16e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/2e0747aac347153bdf4e7bf5efe638a455904bce

commit 2e0747aac347153bdf4e7bf5efe638a455904bce
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Wed Mar 26 12:23:07 2014 -0500

    Bug-fix: MPIR_CVAR_CH3_ODD_EVEN_CLIQUES was not working.
    
    Once the process mapping is complete, we need to make another round of
    node ID updates for the case where MPIR_CVAR_CH3_ODD_EVEN_CLIQUES is
    set.  We were not doing that, so the CVAR variable had no effect.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c
index b9289fe..c5d9a48 100644
--- a/src/mpid/ch3/src/mpid_vc.c
+++ b/src/mpid/ch3/src/mpid_vc.c
@@ -1303,7 +1303,7 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
             if (mpi_errno) MPIU_ERR_POP(mpi_errno);
             g_num_nodes = num_nodes;
             if (did_map) {
-                goto fn_exit;
+                goto odd_even_cliques;
             }
             else {
                 MPIU_DBG_MSG_S(CH3_OTHER,TERSE,"did_map==0, unable to populate node ids from mapping=%s",value);
@@ -1363,6 +1363,7 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
         pg->vct[i].node_id = j;
     }
 
+odd_even_cliques:
     if (odd_even_cliques)
     {
         /* Create new processes for all odd numbered processes. This

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/src/mpid_vc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository