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 441d189a37b158c44abeb84c4fd7c505402cfe96 (commit) via 8da3627817dc1c47d9001b2ef26e02edb79c8669 (commit) from 602ef5fc9420c6c0841cf3397dd3f80197ba3389 (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/441d189a37b158c44abeb84c4fd7c50540... commit 441d189a37b158c44abeb84c4fd7c505402cfe96 Author: Pavan Balaji <[email protected]> Date: Thu Sep 26 00:22:40 2013 -0500 Improve test to not rely on the default alloc_shm. We changed the default from FALSE to TRUE for the alloc_shm info flag for MPI_WIN_ALLOCATE. Signed-off-by: Xin Zhao <[email protected]> diff --git a/test/mpi/rma/mcs-mutex.c b/test/mpi/rma/mcs-mutex.c index 835bddf..0ef0b9e 100644 --- a/test/mpi/rma/mcs-mutex.c +++ b/test/mpi/rma/mcs-mutex.c @@ -48,6 +48,8 @@ int MCS_Mutex_create(int tail_rank, MPI_Comm comm, MCS_Mutex * hdl_out) MPI_Win_allocate(2*sizeof(int), sizeof(int), hdl->win_info, hdl->comm, &hdl->base, &hdl->window); #else + MPI_Info_create(&hdl->win_info); + MPI_Info_set(hdl->win_info, "alloc_shm", "false"); MPI_Win_allocate(2*sizeof(int), sizeof(int), MPI_INFO_NULL, hdl->comm, &hdl->base, &hdl->window); #endif http://git.mpich.org/mpich.git/commitdiff/8da3627817dc1c47d9001b2ef26e02edb7... commit 8da3627817dc1c47d9001b2ef26e02edb79c8669 Author: Xin Zhao <[email protected]> Date: Thu Sep 26 00:52:05 2013 -0500 Allocate shared memory by default for WIN_ALLOCATE Flip the default shared memory allocation info argument for MPI_WIN_ALLOCATE. We were alredy doing this for MPI_WIN_ALLOCATE_SHARED, but not for WIN_ALLOCATE. 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 35c1b3c..3c0e86c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -109,12 +109,15 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_ALLOCATE, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } + /* FOR ALLOCATE, alloc_shm info is default to set to TRUE */ + (*win_ptr)->info_args.alloc_shm = TRUE; + if (info != NULL) { int alloc_shm_flag = 0; char shm_alloc_value[MPI_MAX_INFO_VAL+1]; MPIR_Info_get_impl(info, "alloc_shm", MPI_MAX_INFO_VAL, shm_alloc_value, &alloc_shm_flag); - if ((alloc_shm_flag == 1) && (!strncmp(shm_alloc_value, "true", sizeof("true")))) - (*win_ptr)->info_args.alloc_shm = TRUE; + if ((alloc_shm_flag == 1) && (!strncmp(shm_alloc_value, "false", sizeof("false")))) + (*win_ptr)->info_args.alloc_shm = FALSE; } mpi_errno = MPIDI_CH3U_Win_fns.allocate(size, disp_unit, info, comm_ptr, baseptr, win_ptr); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_rma.c | 7 +++++-- test/mpi/rma/mcs-mutex.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository