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 a4733053ae0d7291e50bfaee4deda318e2a4a854 (commit) via bef5ec8ed681ec8e9a0b87b2052b3abe496e9959 (commit) from dc1ed4a29881962ee5a87c40f1ecf8de9561cd45 (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/a4733053ae0d7291e50bfaee4deda318e2... commit a4733053ae0d7291e50bfaee4deda318e2a4a854 Author: Pavan Balaji <[email protected]> Date: Thu Aug 8 16:18:17 2013 -0500 Update version and CHANGES for 3.1b2 We might add some MPIX functions to the interface (for active messages), but those are not a part of the libmpich ABI. This value needs to be verified when we are making the actual release. Signed-off-by: Wesley Bland <[email protected]> diff --git a/CHANGES b/CHANGES index 42a3041..a7655f2 100644 --- a/CHANGES +++ b/CHANGES @@ -28,7 +28,7 @@ # Several other minor bug fixes, memory leak fixes, and code cleanup. A full list of changes is available at the following link: - http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1b1 + http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1b2 =============================================================================== diff --git a/maint/version.m4 b/maint/version.m4 index 35fe0aa..4f106a7 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.1b1])dnl +m4_define([MPICH_VERSION_m4],[3.1b2])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: @@ -31,6 +31,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # # 4. If any interfaces have been removed since the last public # release, then set age to 0. -m4_define([libmpich_so_version_m4],[10:5:0])dnl +m4_define([libmpich_so_version_m4],[10:6:0])dnl [#] end of __file__ http://git.mpich.org/mpich.git/commitdiff/bef5ec8ed681ec8e9a0b87b2052b3abe49... commit bef5ec8ed681ec8e9a0b87b2052b3abe496e9959 Author: Xin Zhao <[email protected]> Date: Thu Aug 8 09:35:23 2013 -0500 fix bug on "list_complete" variable Initialize "list_complete" before entering MPIDI_CH3I_RMAListPartialComplete because it is used in that function. Fixes ticket #1906. 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 c16484a..afe4796 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -443,6 +443,7 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) if (nRequest > MPIR_PARAM_CH3_RMA_NREQUEST_THRESHOLD && nRequest - nRequestNew > MPIR_PARAM_CH3_RMA_NREQUEST_NEW_THRESHOLD) { int nDone = 0; + MPIU_INSTR_STMT(list_complete=MPIU_INSTR_GET_VAR(winfence_complete)); MPIDI_CH3I_RMAListPartialComplete(win_ptr, ops_list, curr_ptr, &nDone); /* if (nDone > 0) printf( "nDone = %d\n", nDone ); */ nRequest -= nDone; @@ -1752,6 +1753,7 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) if (nRequest > MPIR_PARAM_CH3_RMA_NREQUEST_THRESHOLD && nRequest - nRequestNew > MPIR_PARAM_CH3_RMA_NREQUEST_NEW_THRESHOLD) { int nDone = 0; + MPIU_INSTR_STMT(list_complete=MPIU_INSTR_GET_VAR(wincomplete_complete)); MPIDI_CH3I_RMAListPartialComplete(win_ptr, ops_list, curr_ptr, &nDone); nRequest -= nDone; nRequestNew = nRequest; @@ -2749,6 +2751,7 @@ static int MPIDI_CH3I_Do_passive_target_rma(MPID_Win *win_ptr, int target_rank, if (nRequest > MPIR_PARAM_CH3_RMA_NREQUEST_THRESHOLD && nRequest - nRequestNew > MPIR_PARAM_CH3_RMA_NREQUEST_NEW_THRESHOLD) { int nDone = 0; + MPIU_INSTR_STMT(list_complete=MPIU_INSTR_GET_VAR(winunlock_complete)); MPIDI_CH3I_RMAListPartialComplete(win_ptr, &win_ptr->targets[target_rank].rma_ops_list, curr_ptr, &nDone); ----------------------------------------------------------------------- Summary of changes: CHANGES | 2 +- maint/version.m4 | 4 ++-- src/mpid/ch3/src/ch3u_rma_sync.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository