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 5d421da641c2547831101fd0140f72ca369b95f7 (commit) via 45dfd81519787ef7559d5429bf92689c4cd58863 (commit) via 0b9a13e29e954a54087cf220bbed7aba4ee60d09 (commit) from 1dc5b1a50233fb7d22490daceaa36f596b49f357 (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/5d421da641c2547831101fd0140f72ca36... commit 5d421da641c2547831101fd0140f72ca369b95f7 Author: Xin Zhao <[email protected]> Date: Fri Jun 19 20:52:20 2015 -0500 Bug-fix: correct SHM memory size in Nemesis Win_gather_info(). In the Nemesis implementation of Win_gather_info(), we allocate a memory region on SHM to store window information for other processes, so that all processes on the same node can share those information. However, previously the memory size was incorrectly set as O(node_comm_size), which should be O(comm_size). This patch fixed this bug. Signed-off-by: Min Si <[email protected]> Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 998aa95..eadd59d 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -350,7 +350,7 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Comm * comm_ptr, MPID_Win ** win_ptr) { MPID_Comm *node_comm_ptr = NULL; - int node_rank, node_size; + int node_rank; int comm_rank, comm_size; MPI_Aint *tmp_buf = NULL; int i, k; @@ -371,10 +371,9 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, node_comm_ptr = (*win_ptr)->comm_ptr->node_comm; MPIU_Assert(node_comm_ptr != NULL); - node_size = node_comm_ptr->local_size; node_rank = node_comm_ptr->rank; - (*win_ptr)->info_shm_segment_len = node_size * sizeof(MPIDI_Win_basic_info_t); + (*win_ptr)->info_shm_segment_len = comm_size * sizeof(MPIDI_Win_basic_info_t); mpi_errno = MPIU_SHMW_Hnd_init(&(*win_ptr)->info_shm_segment_handle); if (mpi_errno != MPI_SUCCESS) http://git.mpich.org/mpich.git/commitdiff/45dfd81519787ef7559d5429bf92689c4c... commit 45dfd81519787ef7559d5429bf92689c4cd58863 Author: Xin Zhao <[email protected]> Date: Tue Jun 23 21:41:09 2015 -0500 Bug-fix: correct local/remote completion in Win_flush_local. The original implementation in Win_flush_local counts number of total local completion and remote completion needed to wait, and then waiting for current local/remote completion count to reach those values. There is a bug that we should initialize the current count to zero in each while loop, otherwise the targets that are already completed will be count again and we failed to wait for some targets to be completed. This patch fixes this issue. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 5fb34d8..c0f5689 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1784,6 +1784,8 @@ int MPIDI_Win_flush_local_all(MPID_Win * win_ptr) /* wait for remote completion for those targets that disable flush_local, * and wait for local completion for other targets */ do { + local_completed_cnt = 0; + remote_completed_cnt = 0; for (i = 0; i < win_ptr->num_slots; i++) { curr_target = win_ptr->slots[i].target_list_head; while (curr_target != NULL) { http://git.mpich.org/mpich.git/commitdiff/0b9a13e29e954a54087cf220bbed7aba4e... commit 0b9a13e29e954a54087cf220bbed7aba4ee60d09 Author: Xin Zhao <[email protected]> Date: Tue Jun 23 18:02:38 2015 -0500 Code format clean up. No reviewer. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 0452fc3..0727994 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -395,7 +395,8 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, if (MPIDI_RMA_Win_list == NULL) { mpi_errno = MPID_Progress_register_hook(MPIDI_CH3I_RMA_Make_progress_global); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); + if (mpi_errno) + MPIU_ERR_POP(mpi_errno); } MPL_LL_APPEND(MPIDI_RMA_Win_list, MPIDI_RMA_Win_list_tail, win_elem); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 5 ++--- src/mpid/ch3/src/ch3u_rma_sync.c | 2 ++ src/mpid/ch3/src/mpid_rma.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository