- commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-359-g05fd0e1
by noreply＠mpich.org 24 Jul '13

24 Jul '13

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 05fd0e1b5e1822cd98eafa3cbde20140ee98fb33 (commit) from 95439bc8cac289f5db90aa0022a4a39ba447d932 (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/05fd0e1b5e1822cd98eafa3cbde20140e… commit 05fd0e1b5e1822cd98eafa3cbde20140ee98fb33 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 24 21:13:48 2013 -0500 fix bug: return info=false in MPIDI_Win_get_info if that info is not set by user. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index fba9694..b44bae2 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -353,7 +353,7 @@ int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used) if (win->info_args.no_locks) mpi_errno = MPIR_Info_set_impl(*info_used, "no_locks", "true"); else - mpi_errno = MPIR_Info_set_impl(*info_used, "no_locks", ""); + mpi_errno = MPIR_Info_set_impl(*info_used, "no_locks", "false"); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } @@ -386,7 +386,7 @@ int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used) if (win->info_args.alloc_shared_noncontig) mpi_errno = MPIR_Info_set_impl(*info_used, "alloc_shared_noncontig", "true"); else - mpi_errno = MPIR_Info_set_impl(*info_used, "alloc_shared_noncontig", ""); + mpi_errno = MPIR_Info_set_impl(*info_used, "alloc_shared_noncontig", "false"); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } @@ -394,7 +394,7 @@ int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used) if (win->info_args.same_size) mpi_errno = MPIR_Info_set_impl(*info_used, "same_size", "true"); else - mpi_errno = MPIR_Info_set_impl(*info_used, "same_size", ""); + mpi_errno = MPIR_Info_set_impl(*info_used, "same_size", "false"); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_win_fns.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-358-g95439bc
by noreply＠mpich.org 23 Jul '13

23 Jul '13

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 95439bc8cac289f5db90aa0022a4a39ba447d932 (commit) from ca9bc18873432f252658610688ab897a1599c3f9 (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/95439bc8cac289f5db90aa0022a4a39ba… commit 95439bc8cac289f5db90aa0022a4a39ba447d932 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Jul 22 13:50:29 2013 -0500 Removing unmatched quotation sign in configure.ac. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/configure.ac b/configure.ac index 803184b..b5ee69f 100644 --- a/configure.ac +++ b/configure.ac @@ -4496,7 +4496,7 @@ AC_CHECK_SIZEOF(MPIR_Bsend_data_t,0,[ #include "${master_top_srcdir}/src/include/mpibsend.h"] ) if test "$ac_cv_sizeof_MPIR_Bsend_data_t" = "0" ; then - AC_MSG_ERROR([Unable to determine the size of MPI_BSEND_OVERHEAD"]) + AC_MSG_ERROR([Unable to determine the size of MPI_BSEND_OVERHEAD]) # In the past, a default of 128 was used (still likely good enough), # but the autoconf SIZEOF macro has been changed to ignore the second # argument, so code that depended on the prior defined behavior now ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-357-gca9bc18
by noreply＠mpich.org 23 Jul '13

23 Jul '13

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 ca9bc18873432f252658610688ab897a1599c3f9 (commit) from 179b03af7a175fb24bc112f06ff3e7fcf5f71fc3 (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/ca9bc18873432f252658610688ab897a1… commit ca9bc18873432f252658610688ab897a1599c3f9 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Jul 16 17:54:26 2013 +0000 memory leak in blue gene aggregator selection This parameter gets allocated and broadcasted but near as I can tell it's never actually used for anything. diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c b/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c index 2596b87..0d6ab5b 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c +++ b/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c @@ -29,9 +29,6 @@ #define AGG_DEBUG 1 #endif -static int aggrsInPsetSize=0; -static int *aggrsInPset=NULL; - /* Comments copied from common: * This file contains four functions: * @@ -67,8 +64,7 @@ static int *aggrsInPset=NULL; static void ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd, const ADIOI_BG_ConfInfo_t *confInfo, - ADIOI_BG_ProcInfo_t *all_procInfo, - int *aggrsInPset ); + ADIOI_BG_ProcInfo_t *all_procInfo); /* * Compute the aggregator-related parameters that are required in 2-phase collective IO of ADIO. @@ -97,13 +93,6 @@ ADIOI_BG_gen_agg_ranklist(ADIO_File fd, int n_aggrs_per_pset) /* Gather BG personality infomation onto process 0 */ /* if (r == 0) */ all_procInfo = ADIOI_BG_ProcInfo_new_n (s); - if(s > aggrsInPsetSize) - { - if(aggrsInPset) ADIOI_Free(aggrsInPset); - aggrsInPset = (int *) ADIOI_Malloc (s *sizeof(int)); - aggrsInPsetSize = s; - } - MPI_Gather( (void *)procInfo, sizeof(ADIOI_BG_ProcInfo_t), MPI_BYTE, (void *)all_procInfo, sizeof(ADIOI_BG_ProcInfo_t), MPI_BYTE, @@ -112,7 +101,7 @@ ADIOI_BG_gen_agg_ranklist(ADIO_File fd, int n_aggrs_per_pset) /* Compute a list of the ranks of chosen IO proxy CN on process 0 */ if (r == 0) { - ADIOI_BG_compute_agg_ranklist_serial (fd, confInfo, all_procInfo, aggrsInPset); + ADIOI_BG_compute_agg_ranklist_serial (fd, confInfo, all_procInfo); /* ADIOI_BG_ProcInfo_free (all_procInfo);*/ } ADIOI_BG_ProcInfo_free (all_procInfo); @@ -121,12 +110,6 @@ ADIOI_BG_gen_agg_ranklist(ADIO_File fd, int n_aggrs_per_pset) Declared in adio_cb_config_list.h */ ADIOI_cb_bcast_rank_map(fd); - /* Broadcast the BG-GPFS related file domain info */ - MPI_Bcast( (void *)aggrsInPset, - fd->hints->cb_nodes * sizeof(int), MPI_BYTE, - 0, - fd->comm ); - ADIOI_BG_persInfo_free( confInfo, procInfo ); TRACE_ERR("Leaving ADIOI_BG_gen_agg_ranklist\n"); return 0; @@ -160,7 +143,6 @@ static int intsort(const void *p1, const void *p2) static int ADIOI_BG_compute_agg_ranklist_serial_do (const ADIOI_BG_ConfInfo_t *confInfo, ADIOI_BG_ProcInfo_t *all_procInfo, - int *aggrsInPset, int *tmp_ranklist) { TRACE_ERR("Entering ADIOI_BG_compute_agg_ranklist_serial_do\n"); @@ -279,8 +261,7 @@ ADIOI_BG_compute_agg_ranklist_serial_do (const ADIOI_BG_ConfInfo_t *confInfo, static void ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd, const ADIOI_BG_ConfInfo_t *confInfo, - ADIOI_BG_ProcInfo_t *all_procInfo, - int *aggrsInPset ) + ADIOI_BG_ProcInfo_t *all_procInfo) { TRACE_ERR("Entering ADIOI_BG_compute_agg_ranklist_serial\n"); int i; @@ -298,7 +279,7 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd, # endif naggs= - ADIOI_BG_compute_agg_ranklist_serial_do (confInfo, all_procInfo, aggrsInPset, tmp_ranklist); + ADIOI_BG_compute_agg_ranklist_serial_do (confInfo, all_procInfo, tmp_ranklist); # define VERIFY 1 # if VERIFY ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-356-g179b03a
by noreply＠mpich.org 22 Jul '13

22 Jul '13

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 179b03af7a175fb24bc112f06ff3e7fcf5f71fc3 (commit) from 80ad7cf8446ae48e6177f2904fe7d3092054c514 (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/179b03af7a175fb24bc112f06ff3e7fcf… commit 179b03af7a175fb24bc112f06ff3e7fcf5f71fc3 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Jul 22 16:25:07 2013 -0500 Small fix after 80ad7cf8 to fix ticket #1870. Ken Raffenetti reported the default GNU patch for FreeBSD is too old to recognise the --no-backup-if-mismatch flag. This fix switches to a manual removal approach. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/autogen.sh b/autogen.sh index 4282370..680bfb6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -919,7 +919,8 @@ if [ $do_bindings = "yes" ] ; then echo "------------------------------------------------------------------------" echo echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... " - patch --forward --no-backup-if-mismatch -p0 -s -l < maint/libtool.m4.patch + patch --forward -p0 -s -l < maint/libtool.m4.patch + rm -f confdb/libtool.m4.orig if [ $? -eq 0 ] ; then echo "done" else ----------------------------------------------------------------------- Summary of changes: autogen.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-355-g80ad7cf
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 80ad7cf8446ae48e6177f2904fe7d3092054c514 (commit) from 1182a62aaa1b016f9fefcf78485b6b80b765eb47 (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/80ad7cf8446ae48e6177f2904fe7d3092… commit 80ad7cf8446ae48e6177f2904fe7d3092054c514 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Jul 19 11:22:14 2013 -0500 Small fix after 8cf54f1 fixing ticket #1870. Cleaned up spaces-tabs mismatch in patch file, and fixed a few parameters for the patch command. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/autogen.sh b/autogen.sh index 29b0372..4282370 100755 --- a/autogen.sh +++ b/autogen.sh @@ -919,7 +919,7 @@ if [ $do_bindings = "yes" ] ; then echo "------------------------------------------------------------------------" echo echo_n "Patching libtool.m4 for compatibility with nagfor shared libraries... " - patch --forward -p0 < maint/libtool.m4.patch >/dev/null + patch --forward --no-backup-if-mismatch -p0 -s -l < maint/libtool.m4.patch if [ $? -eq 0 ] ; then echo "done" else diff --git a/maint/libtool.m4.patch b/maint/libtool.m4.patch index 8316416..4ad7628 100644 --- a/maint/libtool.m4.patch +++ b/maint/libtool.m4.patch @@ -1,10 +1,10 @@ --- confdb/libtool.m4 2013-03-29 16:26:23.162062517 -0500 +++ confdb/libtool.m4 2013-06-21 14:22:05.138914413 -0500 @@ -4817,6 +4817,8 @@ - lf95*) # Lahey Fortran 8.1 + lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; -+ nagfor*) # NAGFOR 5.3 ++ nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' ----------------------------------------------------------------------- Summary of changes: autogen.sh | 2 +- maint/libtool.m4.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-354-g1182a62
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 1182a62aaa1b016f9fefcf78485b6b80b765eb47 (commit) from 1ffd39ba42b3ef1c6ae7e09484d7257b756bfab1 (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/1182a62aaa1b016f9fefcf78485b6b80b… commit 1182a62aaa1b016f9fefcf78485b6b80b765eb47 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Jul 19 02:18:07 2013 -0500 fix bug of zero-byte shared window allocation. In MPIDI_CH3I_Win_allocate_shared, if the size of shared memory segment is 0, we just set window's base to NULL, do not allocate shared memory segment and mutex memory region. In MPIDI_CH3I_SHM_Win_free, we detach the shared memory segment and mutex memory region only when the size of shared memory segment is not 0. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c index 09b101b..08c6a1d 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c @@ -68,16 +68,19 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **win_ptr) if ((*win_ptr)->shm_allocated) { /* free shm_base_addrs that's only used for shared memory windows */ MPIU_Free((*win_ptr)->shm_base_addrs); - /* detach from shared memory segment */ - mpi_errno = MPIU_SHMW_Seg_detach((*win_ptr)->shm_segment_handle, (char **)&(*win_ptr)->shm_base_addr, + + if ((*win_ptr)->shm_segment_len > 0) { + /* detach from shared memory segment */ + mpi_errno = MPIU_SHMW_Seg_detach((*win_ptr)->shm_segment_handle, (char **)&(*win_ptr)->shm_base_addr, (*win_ptr)->shm_segment_len); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); - MPIU_SHMW_Hnd_finalize(&(*win_ptr)->shm_segment_handle); + MPIU_SHMW_Hnd_finalize(&(*win_ptr)->shm_segment_handle); + } } /* Free shared process mutex memory region */ - if ((*win_ptr)->shm_mutex) { + if ((*win_ptr)->shm_mutex && (*win_ptr)->shm_segment_len > 0) { if ((*win_ptr)->comm_ptr->rank == 0) { MPIDI_CH3I_SHM_MUTEX_DESTROY(*win_ptr); 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 138b473..8942ed2 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -133,6 +133,11 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf (*win_ptr)->shm_segment_len += (*win_ptr)->sizes[i]; } + if ((*win_ptr)->shm_segment_len == 0) { + (*win_ptr)->base = NULL; + } + + else { mpi_errno = MPIU_SHMW_Hnd_init(&(*win_ptr)->shm_segment_handle); if (mpi_errno) MPIU_ERR_POP(mpi_errno); @@ -252,6 +257,7 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf } (*win_ptr)->base = (*win_ptr)->shm_base_addrs[rank]; + } /* get the base addresses of the windows. Note we reuse tmp_buf from above since it's at least as large as we need it for this allgather. */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c | 13 ++++++++----- src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-353-g1ffd39b
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 1ffd39ba42b3ef1c6ae7e09484d7257b756bfab1 (commit) from 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 (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/1ffd39ba42b3ef1c6ae7e09484d7257b7… commit 1ffd39ba42b3ef1c6ae7e09484d7257b756bfab1 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Jul 19 11:52:30 2013 -0500 Added a new test for checking for zero-byte window creations. MPICH currently has a bug that causes it to abort when all processes provide zero bytes to the window allocation routine. While it can be considered a user error, the MPI-3 standard does not explicitly disallow this case. diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 3950aa2..1c33a1b 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -83,6 +83,7 @@ noinst_PROGRAMS = \ win_shared \ win_shared_noncontig \ win_shared_noncontig_put \ + win_zero \ win_dynamic_acc \ get_acc_local \ compare_and_swap \ diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index 006c4f5..4da3c0f 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -68,6 +68,7 @@ manyrma2 2 timeLimit=500 win_shared 4 mpiversion=3.0 win_shared_noncontig 4 mpiversion=3.0 win_shared_noncontig_put 4 mpiversion=3.0 +win_zero 4 mpiversion=3.0 win_dynamic_acc 4 mpiversion=3.0 get_acc_local 1 mpiversion=3.0 linked_list 4 mpiversion=3.0 diff --git a/test/mpi/rma/win_zero.c b/test/mpi/rma/win_zero.c new file mode 100644 index 0000000..24bac4e --- /dev/null +++ b/test/mpi/rma/win_zero.c @@ -0,0 +1,68 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +/* test MPI_WIN_ALLOCATE_SHARED when size of total shared memory region is 0. */ + +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> + +int main(int argc, char **argv) +{ + MPI_Win win; + void *win_buf = NULL; + int world_rank, shm_rank; + MPI_Comm shm_comm; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &world_rank); + + MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, world_rank, MPI_INFO_NULL, &shm_comm); + + MPI_Comm_rank(shm_comm, &shm_rank); + + /* Some ranks allocate zero bytes */ + if (shm_rank % 2 == 0) + MPI_Win_allocate_shared(0, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + else + MPI_Win_allocate_shared(1, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + MPI_Win_free(&win); + + if (world_rank % 2 == 0) + MPI_Win_allocate(0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + else + MPI_Win_allocate(1, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + MPI_Win_free(&win); + + win_buf = NULL; + if (world_rank % 2 == 0) + MPI_Win_create(NULL, 0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + else { + win_buf = (void *) malloc(sizeof(char)); + MPI_Win_create(win_buf, 1, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + } + MPI_Win_free(&win); + if (win_buf) + free(win_buf); + + /* All ranks allocate zero bytes */ + MPI_Win_allocate_shared(0, sizeof(char), MPI_INFO_NULL, shm_comm, &win_buf, &win); + MPI_Win_free(&win); + MPI_Win_allocate(0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win_buf, &win); + MPI_Win_free(&win); + MPI_Win_create(NULL, 0, sizeof(char), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + MPI_Win_free(&win); + + MPI_Comm_free(&shm_comm); + + if (world_rank == 0) + printf(" No Errors\n"); + + MPI_Finalize(); + + return 0; + +} ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 1 + test/mpi/rma/testlist | 1 + test/mpi/rma/win_zero.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 test/mpi/rma/win_zero.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-352-g057bb8b
by noreply＠mpich.org 19 Jul '13

19 Jul '13

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 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 (commit) via 4e6333e1555e79ac3b07632eabe5918f490ff55a (commit) from 91ca5a73a767eb90c7307e512e8d0449bf324e70 (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/057bb8be6bc9e1ced3ef42eb7335dbe83… commit 057bb8be6bc9e1ced3ef42eb7335dbe833b4d188 Author: Jeff Hammond <jhammond(a)alcf.anl.gov> Date: Wed May 29 16:17:25 2013 -0500 fix ticket 1863 - improper+missing RMA error checks for addr=NULL MPIR_ERRTEST_ARGNULL is used in MPI_Get_accumulate and MPI_Rget_accumulate to verify that the address of a buffer is not NULL. However, a NULL buffer is valid when the count is zero or when a derived datatype of size 0 is used. Signed-off-by: Jeff Hammond <jhammond(a)alcf.anl.gov> diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c index 8610e92..5ca38d8 100644 --- a/src/mpi/rma/accumulate.c +++ b/src/mpi/rma/accumulate.c @@ -102,6 +102,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c index 0e0ca28..ae3d568 100644 --- a/src/mpi/rma/get.c +++ b/src/mpi/rma/get.c @@ -98,6 +98,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c index fa42354..4660212 100644 --- a/src/mpi/rma/get_accumulate.c +++ b/src/mpi/rma/get_accumulate.c @@ -133,11 +133,11 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP) { MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(origin_addr, "origin_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); } MPIR_ERRTEST_COUNT(result_count, mpi_errno); MPIR_ERRTEST_DATATYPE(result_datatype, "result_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(result_addr, "result_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(result_addr, result_count, result_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c index 8bb1bd9..9444011 100644 --- a/src/mpi/rma/put.c +++ b/src/mpi/rma/put.c @@ -98,6 +98,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index ef7168f..4906991 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -115,6 +115,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index 738ec70..33edc79 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -110,6 +110,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index 0b8eb1b..b3a47be 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -125,11 +125,11 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP) { MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(origin_addr, "origin_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); } MPIR_ERRTEST_COUNT(result_count, mpi_errno); MPIR_ERRTEST_DATATYPE(result_datatype, "result_datatype", mpi_errno); - MPIR_ERRTEST_ARGNULL(result_addr, "result_addr", mpi_errno); + MPIR_ERRTEST_USERBUFFER(result_addr, result_count, result_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index 510ab4e..48c3052 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -112,6 +112,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype MPIR_ERRTEST_COUNT(origin_count, mpi_errno); MPIR_ERRTEST_DATATYPE(origin_datatype, "origin_datatype", mpi_errno); + MPIR_ERRTEST_USERBUFFER(origin_addr, origin_count, origin_datatype, mpi_errno); MPIR_ERRTEST_COUNT(target_count, mpi_errno); MPIR_ERRTEST_DATATYPE(target_datatype, "target_datatype", mpi_errno); if (win_ptr->create_flavor != MPI_WIN_FLAVOR_DYNAMIC) http://git.mpich.org/mpich.git/commitdiff/4e6333e1555e79ac3b07632eabe5918f4… commit 4e6333e1555e79ac3b07632eabe5918f490ff55a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Jul 18 20:07:01 2013 -0500 Remove GCC specific pragmas. strict builds no longer do gcc-specific things. We test each option to see if the compiler accepts them before using it. diff --git a/src/mpi/coll/opland.c b/src/mpi/coll/opland.c index a76aa84..8144fc7 100644 --- a/src/mpi/coll/opland.c +++ b/src/mpi/coll/opland.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) diff --git a/src/mpi/coll/oplor.c b/src/mpi/coll/oplor.c index d31a95b..51b33be 100644 --- a/src/mpi/coll/oplor.c +++ b/src/mpi/coll/oplor.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) diff --git a/src/mpi/coll/oplxor.c b/src/mpi/coll/oplxor.c index cac6d24..89431f9 100644 --- a/src/mpi/coll/oplxor.c +++ b/src/mpi/coll/oplxor.c @@ -11,12 +11,6 @@ #include "mpi_fortlogical.h" #endif -/* We have enabled extensive warnings when using gcc for certain builds. - For this file, this generates many specious warnings */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) -#pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - /* * In MPI-2.1, this operation is valid only for C integer and Logical * types (5.9.2 Predefined reduce operations) ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/opland.c | 6 ------ src/mpi/coll/oplor.c | 6 ------ src/mpi/coll/oplxor.c | 6 ------ src/mpi/rma/accumulate.c | 1 + src/mpi/rma/get.c | 1 + src/mpi/rma/get_accumulate.c | 4 ++-- src/mpi/rma/put.c | 1 + src/mpi/rma/raccumulate.c | 1 + src/mpi/rma/rget.c | 1 + src/mpi/rma/rget_accumulate.c | 4 ++-- src/mpi/rma/rput.c | 1 + 11 files changed, 10 insertions(+), 22 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-350-g91ca5a7
by noreply＠mpich.org 18 Jul '13

18 Jul '13

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 91ca5a73a767eb90c7307e512e8d0449bf324e70 (commit) from 61d01c53d9721051dc7bdd5647251257b95eca1c (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/91ca5a73a767eb90c7307e512e8d0449b… commit 91ca5a73a767eb90c7307e512e8d0449bf324e70 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Jul 18 13:13:10 2013 -0500 Added a badrma test program. This program tests to make sure we can do zero-count or zero-size datatype RMA tests without the MPI library throwing errors. diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 00665fe..3950aa2 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -114,7 +114,8 @@ noinst_PROGRAMS = \ pscw_ordering \ mutex_bench \ mutex_bench_shared \ - rma-contig + rma-contig \ + badrma strided_acc_indexed_LDADD = $(LDADD) -lm strided_acc_onelock_LDADD = $(LDADD) -lm diff --git a/test/mpi/rma/badrma.c b/test/mpi/rma/badrma.c new file mode 100644 index 0000000..8e0dfb1 --- /dev/null +++ b/test/mpi/rma/badrma.c @@ -0,0 +1,153 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpi.h" +#include "stdio.h" + +#define SIZE 100 + +MPI_Win win; +int win_buf[SIZE], origin_buf[SIZE], result_buf[SIZE]; + +int do_test(int origin_count, MPI_Datatype origin_type, int result_count, + MPI_Datatype result_type, int target_count, MPI_Datatype target_type) +{ + int errs = 0, ret, origin_type_size, result_type_size; + + ret = MPI_Put(origin_buf, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Get(origin_buf, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Accumulate(origin_buf, origin_count, origin_type, 1, 0, target_count, + target_type, MPI_SUM, win); + if (ret) + errs++; + + ret = MPI_Get_accumulate(origin_buf, origin_count, origin_type, result_buf, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + + MPI_Type_size(origin_type, &origin_type_size); + MPI_Type_size(result_type, &result_type_size); + + if (origin_count == 0 || origin_type_size == 0) { + ret = MPI_Put(NULL, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Get(NULL, origin_count, origin_type, 1, 0, target_count, target_type, win); + if (ret) + errs++; + + ret = MPI_Accumulate(NULL, origin_count, origin_type, 1, 0, target_count, target_type, + MPI_SUM, win); + if (ret) + errs++; + + ret = MPI_Get_accumulate(NULL, origin_count, origin_type, result_buf, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + + if (result_count == 0 || result_type_size == 0) { + ret = MPI_Get_accumulate(NULL, origin_count, origin_type, NULL, result_count, + result_type, 1, 0, target_count, target_type, MPI_SUM, win); + if (ret) + errs++; + } + } + + return errs; +} + +int main(int argc, char *argv[]) +{ + int rank, nprocs, i, j, k; + int errs = 0; + MPI_Datatype types[4]; + + MPI_Init(&argc, &argv); + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if (nprocs < 2) { + printf("Run this program with 2 or more processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + /* types[0] is of zero size. Everything else is non-zero size */ + MPI_Type_contiguous(0, MPI_INT, &types[0]); + MPI_Type_commit(&types[0]); + + MPI_Type_contiguous(1, MPI_INT, &types[1]); + MPI_Type_commit(&types[1]); + + types[2] = MPI_INT; + types[3] = MPI_DOUBLE; + + MPI_Win_create(win_buf, SIZE * sizeof(int), sizeof(int), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + + MPI_Win_fence(0, win); + + if (rank == 0) { + /* zero-count */ + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + for (k = 0; k < 4; k++) + do_test(0, types[i], 0, types[j], 0, types[k]); + + /* single zero-size datatype, but non-zero count */ + for (i = 1; i < 4; i++) { + for (j = 1; j < 4; j++) { + do_test(1, types[0], 0, types[i], 0, types[j]); + do_test(0, types[i], 1, types[0], 0, types[j]); + do_test(0, types[i], 0, types[j], 1, types[0]); + } + } + + /* two zero-size datatypes, but non-zero count */ + for (i = 1; i < 4; i++) { + do_test(1, types[0], 1, types[0], 0, types[i]); + do_test(1, types[0], 0, types[i], 1, types[0]); + do_test(0, types[i], 1, types[0], 1, types[0]); + + do_test(1, types[0], 2, types[0], 0, types[i]); + do_test(2, types[0], 1, types[0], 0, types[i]); + + do_test(1, types[0], 0, types[i], 2, types[0]); + do_test(2, types[0], 0, types[i], 1, types[0]); + + do_test(0, types[i], 1, types[0], 2, types[0]); + do_test(0, types[i], 2, types[0], 1, types[0]); + } + + /* three zero-size datatypes, but non-zero count */ + do_test(1, types[0], 1, types[0], 1, types[0]); + do_test(1, types[0], 1, types[0], 2, types[0]); + do_test(1, types[0], 2, types[0], 1, types[0]); + do_test(1, types[0], 2, types[0], 2, types[0]); + do_test(2, types[0], 1, types[0], 1, types[0]); + do_test(2, types[0], 1, types[0], 2, types[0]); + do_test(2, types[0], 2, types[0], 1, types[0]); + } + MPI_Win_fence(0, win); + + MPI_Win_free(&win); + MPI_Type_free(&types[0]); + MPI_Type_free(&types[1]); + + if (!errs && !rank) + printf(" No Errors\n"); + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index 0168a34..006c4f5 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -99,4 +99,5 @@ linked_list_bench_lock_shr 4 mpiversion=3.0 linked_list_bench_lock_shr_nocheck 4 mpiversion=3.0 mutex_bench 4 mpiversion=3.0 mutex_bench_shared 4 mpiversion=3.0 -rma-contig 4 mpiversion=3.0 timeLimit=600 \ No newline at end of file +rma-contig 4 mpiversion=3.0 timeLimit=600 +badrma 2 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 3 +- test/mpi/rma/badrma.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++ test/mpi/rma/testlist | 3 +- 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 test/mpi/rma/badrma.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-349-g61d01c5
by noreply＠mpich.org 18 Jul '13

18 Jul '13

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 61d01c53d9721051dc7bdd5647251257b95eca1c (commit) via f18b91f0d3a6f507f70752e93bf8e5ee325c6e92 (commit) via 1a8ff2bfff7b3cef49d06cd16167926ede418914 (commit) from 8cf54f1978db324e5ed6de79eaf74b46a70b70dd (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/61d01c53d9721051dc7bdd5647251257b… commit 61d01c53d9721051dc7bdd5647251257b95eca1c Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 11:27:17 2013 -0500 fix bug:check info value of "alloc_shared_noncontig". Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> 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 d5e6b1e..138b473 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -60,8 +60,13 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf /* Check if we are allowed to allocate space non-contiguously */ if (info != NULL) { - MPIR_Info_get_impl(info, "alloc_shared_noncontig", 0, NULL, - &(*win_ptr)->info_args.alloc_shared_noncontig); + int alloc_shared_nctg_flag = 0; + char alloc_shared_nctg_value[MPI_MAX_INFO_VAL+1]; + MPIR_Info_get_impl(info, "alloc_shared_noncontig", MPI_MAX_INFO_VAL, + alloc_shared_nctg_value, &alloc_shared_nctg_flag); + if ((alloc_shared_nctg_flag == 1) && (!strncmp(alloc_shared_nctg_value, "true", + strlen("true")))) + (*win_ptr)->info_args.alloc_shared_noncontig = 1; } /* see if we can allocate all windows contiguously */ http://git.mpich.org/mpich.git/commitdiff/f18b91f0d3a6f507f70752e93bf8e5ee3… commit f18b91f0d3a6f507f70752e93bf8e5ee325c6e92 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 10:30:04 2013 -0500 bug of deleting redundant call to get win_ptr. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index b2c6989..f05a5bb 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -3913,8 +3913,6 @@ int MPIDI_CH3_PktHandler_CAS( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, /* There are additional steps to take if this is a passive target RMA or the last operation from the source */ - MPID_Win_get_ptr(cas_pkt->target_win_handle, win_ptr); - mpi_errno = MPIDI_CH3_Finish_rma_op_target(NULL, win_ptr, TRUE, cas_pkt->flags, MPI_WIN_NULL); http://git.mpich.org/mpich.git/commitdiff/1a8ff2bfff7b3cef49d06cd16167926ed… commit 1a8ff2bfff7b3cef49d06cd16167926ede418914 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Jul 18 10:26:35 2013 -0500 bug on MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op). Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 3c73497..b2c6989 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -3829,8 +3829,8 @@ int MPIDI_CH3_PktHandler_Accumulate_Immed( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OP, "**opnotpredefined", "**opnotpredefined %d", accum_pkt->op ); } - MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); } + MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); /* There are additional steps to take if this is a passive ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 9 +++++++-- src/mpid/ch3/src/ch3u_rma_sync.c | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0