[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-415-gfa89751

[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  fa897516e38b52e3f91abe2da7197630d7d2c639 (commit)
       via  3d1e1a3943bd33184a48517ed87c4dd1883edce4 (commit)
      from  8d4de3bd8d64fb545e9046e6b78ef766a90aaee9 (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/fa897516e38b52e3f91abe2da7197630d7d2c639

commit fa897516e38b52e3f91abe2da7197630d7d2c639
Author: Yanfei Guo <yguo at anl.gov>
Date:   Thu Aug 25 14:11:14 2016 -0500

    CH4: fix getting pid from local_map
    
    No reviewer.

diff --git a/src/mpid/ch4/src/ch4r_proc.h b/src/mpid/ch4/src/ch4r_proc.h
index 65c75bf..91ccfbe 100644
--- a/src/mpid/ch4/src/ch4r_proc.h
+++ b/src/mpid/ch4/src/ch4r_proc.h
@@ -149,8 +149,8 @@ static inline int MPIDIU_comm_rank_to_pid_local(MPIR_Comm * comm, int rank, int
         break;
     case MPIDII_RANK_MAP_STRIDE:
     case MPIDII_RANK_MAP_STRIDE_INTRA:
-        *index = MPIDII_CALC_STRIDE_SIMPLE(rank, MPIDII_COMM(comm, map).reg.stride.stride,
-                                           MPIDII_COMM(comm, map).reg.stride.offset);
+        *index = MPIDII_CALC_STRIDE_SIMPLE(rank, MPIDII_COMM(comm, local_map).reg.stride.stride,
+                                           MPIDII_COMM(comm, local_map).reg.stride.offset);
         break;
     case MPIDII_RANK_MAP_STRIDE_BLOCK:
     case MPIDII_RANK_MAP_STRIDE_BLOCK_INTRA:

http://git.mpich.org/mpich.git/commitdiff/3d1e1a3943bd33184a48517ed87c4dd1883edce4

commit 3d1e1a3943bd33184a48517ed87c4dd1883edce4
Author: Yanfei Guo <yguo at anl.gov>
Date:   Thu Aug 25 14:07:06 2016 -0500

    CH4: fix debug print out in rank map
    
    No reviewer.

diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h
index a5575d7..3e9f6a5 100644
--- a/src/mpid/ch4/src/ch4i_comm.h
+++ b/src/mpid/ch4/src/ch4i_comm.h
@@ -177,7 +177,7 @@ static inline int MPIDII_detect_regular_model(int *lpid, int size,
     if (st < 0 || st <= bs) {
         return MPIDII_SRC_MAPPER_IRREGULAR;
     }
-    MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, "\tdetect model: stride %d", bs));
+    MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE, (MPL_DBG_FDEST, "\tdetect model: stride %d", st));
     for (i = bs; i < size; i++) {
         if (lpid[i] != MPIDII_CALC_STRIDE(i, st, bs, off)) {
             return MPIDII_SRC_MAPPER_IRREGULAR;
@@ -873,9 +873,9 @@ static inline int MPIDII_check_convert_lut_to_regular(MPIDII_rank_map_t * src)
         MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE,
                         (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.offset));
         MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE,
-                        (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.blocksize));
+                        (MPL_DBG_FDEST, "\tblocksize: %d", src->reg.stride.blocksize));
         MPL_DBG_MSG_FMT(MPIDI_CH4_DBG_MAP, VERBOSE,
-                        (MPL_DBG_FDEST, "\toffset: %d", src->reg.stride.stride));
+                        (MPL_DBG_FDEST, "\tstride: %d", src->reg.stride.stride));
         break;
     }
   fn_exit:

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

Summary of changes:
 src/mpid/ch4/src/ch4i_comm.h |    6 +++---
 src/mpid/ch4/src/ch4r_proc.h |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository