[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-417-g637da5d

[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  637da5d8e537d70680fa1394a5fd3f988f2e5b2d (commit)
      from  bfefee88130f464b8037b9250a6394d1f7a14dc6 (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/637da5d8e537d70680fa1394a5fd3f988f2e5b2d

commit 637da5d8e537d70680fa1394a5fd3f988f2e5b2d
Author: Yanfei Guo <yguo at anl.gov>
Date:   Wed Aug 31 16:59:44 2016 -0500

    CH4: Fix mlut create for intercomm_merge
    
    Old code is incorrectly optimized for intercomm_merge.
    
    No reviewer.

diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h
index 3e9f6a5..d837115 100644
--- a/src/mpid/ch4/src/ch4i_comm.h
+++ b/src/mpid/ch4/src/ch4i_comm.h
@@ -950,22 +950,11 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap,
         MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE,
                         (MPL_DBG_FDEST, " check map_size %d, src_comm_size %d",
                          MPIDII_map_size(*mapper), src_comm_size));
-        if (src_mode == MPIDII_RANK_MAP_MLUT) {
-            MPIDII_src_comm_to_mlut(src_rmap, dest_rmap, src_comm_size,
-                                    total_mapper_size, mapper_offset);
-        }
-        else {  /* src_mode != MPIDII_RANK_MAP_MLUT */
-            MPIDII_src_comm_to_lut(src_rmap, dest_rmap, src_comm_size,
-                                   total_mapper_size, mapper_offset);
-        }
+        MPIDII_src_comm_to_mlut(src_rmap, dest_rmap, src_comm_size,
+                                total_mapper_size, mapper_offset);
     }
     else {      /* mapper->type == MPIR_COMM_MAP_TYPE__IRREGULAR */
-        if (src_mode == MPIDII_RANK_MAP_MLUT) {
-            MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset);
-        }
-        else {  /* src_mode != MPIDII_RANK_MAP_MLUT */
-            MPIDII_src_map_to_lut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset);
-        }
+        MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset);
     }
 
   fn_exit:

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

Summary of changes:
 src/mpid/ch4/src/ch4i_comm.h |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
MPICH primary repository