November 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1rc2-1-gbe7e350
by noreply＠mpich.org 18 Nov '13

18 Nov '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 be7e350efaa610fefe575c1b418b16b60764c892 (commit) from ae55e8178750b255fcc5c8464d6c5284df039f8a (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/be7e350efaa610fefe575c1b418b16b60… commit be7e350efaa610fefe575c1b418b16b60764c892 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Sat Nov 16 06:04:39 2013 -0600 Fix a typo about MPIR_CVAR_NEM_* Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c index 7fff986..a77e801 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c @@ -355,7 +355,7 @@ int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPID_IOV s_c MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); - nodma = !knem_has_dma || data_sz < MPIR_CVAR_NEM_LMT_DMA_THRESHOLD; + nodma = !knem_has_dma || data_sz < MPIR_CVAR_NEMESIS_LMT_DMA_THRESHOLD; if (dt_contig) { /* handle the iov creation ourselves */ ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/src/mpid_nem_lmt_dma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1rc2, created. v3.1rc2
by noreply＠mpich.org 18 Nov '13

18 Nov '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 annotated tag, v3.1rc2 has been created at a0148db86b72cb11792c3f8b9eaa85881e31c762 (tag) tagging ae55e8178750b255fcc5c8464d6c5284df039f8a (commit) replaces v3.1rc1 tagged by Wesley Bland on Mon Nov 18 14:13:03 2013 -0600 - Log ----------------------------------------------------------------- tagging 'v3.1rc2' Antonio J. Pena (27): Removed unused code from get_elem_d.f90 Fixed buffer overflow in test get_elem_d.f90 Fix win_dynamic_acc test for any number of ranks MPICH_INFODLL_LOC incorrectly formed in configure Fix --program-suffix/--program-prefix support Improved Hydra error reporting Fixed MPI_HOST/MPI_IO attributes Fix manpages not installed for VPATH builds Fixed --enabled-debuginfo segfaults tt #1932 Revert Fixed --enabled-debuginfo segfaults tt#1932 Fixed --enabled-debuginfo segfaults Fix warning in mpltrmem.c Fix warning in opminloc.c and opmaxloc.c Fix warnings about possible uninitialized accesses Fix compiler warning in tcp_init.c Fix compiler warnings in pmip_cb.c Fix braces compiler suggestion (warning) Fix compiler warnings in mpid_type_debug.c Fixes compiler warnings in init.c / initthread.c Removed unused variables from dll_mpich.c Fix warning in ckpoint.c with Portland compilers Fix warnings in mpidrma.h when compiling with pgcc Fixes warnings in some collectives with pgcc Fix compiler warnings - unused variables Moved variable declarations to avoud warnings Removed unused variable Hotfix for 53640e26 Bob Cernohous (1): Better detect no shared file support Huiwei Lu (5): Fix #1920 - NBC Man Pages have no description Fix #1920 - enhance the output format Fix #1879 - Adds a test case for ibsend Fix #1879 - false alarm, bug is in user code Fix #1879 - fix test script Jeff Hammond (1): check for size!=0 when erroring out on new==NULL Junchao Zhang (4): Fix compiler warnings related to MPI_T code Revise test case get_elem_d.f90 Add new MPI_T error codes in doctext Add missing manpages for MPI_T routines Ken Raffenetti (3): ignore new test directory addtional tests for FT collectives increase timeout for large_type_sendrec test Rob Latham (1): make MPIU_Assert more robust Wesley Bland (4): Fix main/docnotes MPI_T error descriptions Update version to 3.1rc2 Add blurb about ABI compatibility to CHANGES Update the ABI string for 3.1rc2. Xin Zhao (3): Fix ticket-1960: delete redundant MPIU_Assert. Fix #1701 - cleanup code for zero-size data transfer. Add more tests in test/mpi/rma/rmazero.c. ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-49-gae55e81
by noreply＠mpich.org 18 Nov '13

18 Nov '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 ae55e8178750b255fcc5c8464d6c5284df039f8a (commit) via 0e43bd8f71835395efdcffde9abc54a30818eec3 (commit) via 57fb19bb3396c4da64f8a6f0332da5d0d9c6446e (commit) from 6fb9967b949ebf560f601398f97a1a4809f5d362 (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/ae55e8178750b255fcc5c8464d6c5284d… commit ae55e8178750b255fcc5c8464d6c5284df039f8a Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Mon Nov 18 12:59:50 2013 -0600 Update the ABI string for 3.1rc2. There were no ABI changes during this RC release cycle. Therefore, we only update the revision (middle) number. The new string is 11:1:0. diff --git a/maint/version.m4 b/maint/version.m4 index a132b49..1e729a1 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -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],[11:0:0])dnl +m4_define([libmpich_so_version_m4],[11:1:0])dnl [#] end of __file__ http://git.mpich.org/mpich.git/commitdiff/0e43bd8f71835395efdcffde9abc54a30… commit 0e43bd8f71835395efdcffde9abc54a30818eec3 Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Mon Nov 18 08:54:26 2013 -0600 Add blurb about ABI compatibility to CHANGES diff --git a/CHANGES b/CHANGES index dac8198..edcc230 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes in 3.1 =============================================================================== + # Implement runtime compatibility with MPICH-derived impelmentations as per + the ABI Compatibility Initiative (see www.mpich.org/abi for more + information). + # Integrated MPICH-PAMI code base for Blue Gene/Q and other IBM platforms. http://git.mpich.org/mpich.git/commitdiff/57fb19bb3396c4da64f8a6f0332da5d0d… commit 57fb19bb3396c4da64f8a6f0332da5d0d9c6446e Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Mon Nov 18 08:49:56 2013 -0600 Update version to 3.1rc2 3.1rc1 was released a few weeks ago, but we forgot to update the version number. diff --git a/maint/version.m4 b/maint/version.m4 index 03f2acf..a132b49 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.1rc1])dnl +m4_define([MPICH_VERSION_m4],[3.1rc2])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: ----------------------------------------------------------------------- Summary of changes: CHANGES | 4 ++++ maint/version.m4 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-46-g6fb9967
by noreply＠mpich.org 18 Nov '13

18 Nov '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 6fb9967b949ebf560f601398f97a1a4809f5d362 (commit) from be75c78623e48ac96c11fbe33c3b513fc435dafd (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/6fb9967b949ebf560f601398f97a1a480… commit 6fb9967b949ebf560f601398f97a1a4809f5d362 Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Mon Nov 18 11:13:52 2013 -0600 Fix main/docnotes MPI_T error descriptions This was causing errors when printing the error descriptions in the manpages. Fixes #1979 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/maint/docnotes b/maint/docnotes index 4279cbe..b8cf2cd 100644 --- a/maint/docnotes +++ b/maint/docnotes @@ -504,23 +504,23 @@ N*/ N*/ /*N MPI_T_ERR_CVAR_SET_NOT_NOW -. MPI_T_ERR_CVAR_SET_NOT_NOW - The control variable can't be set at this moment. +. MPI_T_ERR_CVAR_SET_NOT_NOW - The control variable can not be set at this moment. N*/ /*N MPI_T_ERR_CVAR_SET_NEVER -. MPI_T_ERR_CVAR_SET_NEVER - The control variable can't be set until end of execution. +. MPI_T_ERR_CVAR_SET_NEVER - The control variable can not be set until end of execution. N*/ /*N MPI_T_ERR_PVAR_NO_STARTSTOP -. MPI_T_ERR_PVAR_NO_STARTSTOP - The performance variable can't be started or stopped. +. MPI_T_ERR_PVAR_NO_STARTSTOP - The performance variable can not be started or stopped. N*/ /*N MPI_T_ERR_PVAR_NO_WRITE -. MPI_T_ERR_PVAR_NO_WRITE - The performance variable can't be written or reset. +. MPI_T_ERR_PVAR_NO_WRITE - The performance variable can not be written or reset. N*/ /*N MPI_T_ERR_PVAR_NO_ATOMIC -. MPI_T_ERR_PVAR_NO_ATOMIC - The performance variable can't be read/write atomically. +. MPI_T_ERR_PVAR_NO_ATOMIC - The performance variable can not be read/write atomically. N*/ /*N NULL diff --git a/src/mpi_t/pvar_session_free.c b/src/mpi_t/pvar_session_free.c index 4b86cd1..6111799 100644 --- a/src/mpi_t/pvar_session_free.c +++ b/src/mpi_t/pvar_session_free.c @@ -74,7 +74,7 @@ return, MPI sets the session identifier to MPI_T_PVAR_SESSION_NULL. .N Errors .N MPI_SUCCESS -.N MPI_T_ERR_NOT_INITIALIZEDE +.N MPI_T_ERR_NOT_INITIALIZED .N MPI_T_ERR_INVALID_SESSION @*/ int MPI_T_pvar_session_free(MPI_T_pvar_session *session) ----------------------------------------------------------------------- Summary of changes: maint/docnotes | 10 +++++----- src/mpi_t/pvar_session_free.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-45-gbe75c78
by noreply＠mpich.org 16 Nov '13

16 Nov '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 be75c78623e48ac96c11fbe33c3b513fc435dafd (commit) from 53640e262bc9f35d9729530c3af80773098bc34d (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/be75c78623e48ac96c11fbe33c3b513fc… commit be75c78623e48ac96c11fbe33c3b513fc435dafd Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Sat Nov 16 11:28:11 2013 -0600 Hotfix for 53640e26 The commented-out variable in 53640e26 is in fact hiddenly used by the macro MPIU_ERR_SET1, only if HAVE_ERROR_CHECKING is defined. That macro assumes the variable is declared and does not take it from its arguments. This hotfix declares the FCNAME[] variable if HAVE_ERROR_CHECKING is defined. diff --git a/src/nameserv/file/file_nameserv.c b/src/nameserv/file/file_nameserv.c index 327a487..3483dbc 100644 --- a/src/nameserv/file/file_nameserv.c +++ b/src/nameserv/file/file_nameserv.c @@ -172,10 +172,12 @@ int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, const char service_name[], char port[] ) { - /* static const char FCNAME[] = "MPID_NS_Lookup"; */ FILE *fp; char filename[MAXPATHLEN]; int mpi_errno = MPI_SUCCESS; +#ifdef HAVE_ERROR_CHECKING + static const char FCNAME[] = "MPID_NS_Lookup"; +#endif /* Determine file and directory name. The file name is from the service name */ ----------------------------------------------------------------------- Summary of changes: src/nameserv/file/file_nameserv.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-44-g53640e2
by noreply＠mpich.org 15 Nov '13

15 Nov '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 53640e262bc9f35d9729530c3af80773098bc34d (commit) via 95ca219e1713846f5c5b51fd94663398fbf9369f (commit) via e39d17eaedecd5655eb5699699d0edbdb8c8aad4 (commit) via 893492169ea02c41140c32c2c6e8be4753667d4d (commit) via 30fc08e100d45ebaea60941a22b3711da5864637 (commit) via 6363c2aa21495fb30b15f6e91ee39523333fbef2 (commit) via 5ae8a7198dea0791a23756833710119d490e94ca (commit) via 769f698c8e2d300632a66adf5a2d42c3e4729916 (commit) via 4bf29080cd818959c47cfdc1a83c8b21c78c40b9 (commit) via c750a8b82bd7ca7a76451f0cab37d47d3aa4aa7d (commit) via ee7f0aae436f669091016311c13b1c6af135c49d (commit) via c2dc7a35e2398f5e93bb6a63efa7ca728f525a16 (commit) via d8b8eb6f8e59031853d167c2580c8cb8c5ec4a9b (commit) via 6e8dae1b4fdbfd2d7225ca3fd285855322d25466 (commit) via 8822485c3bdfb99130ba6b00912e19fe6a6eb255 (commit) from 65a3af4338217e941e0d099a1fadad1a517d3411 (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/53640e262bc9f35d9729530c3af807730… commit 53640e262bc9f35d9729530c3af80773098bc34d Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 15 17:01:57 2013 -0600 Removed unused variable Commented out in case we need it in the future. All other related functions have it, but they actually use it. This avoids a compiler warning. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/nameserv/file/file_nameserv.c b/src/nameserv/file/file_nameserv.c index 97e45fa..327a487 100644 --- a/src/nameserv/file/file_nameserv.c +++ b/src/nameserv/file/file_nameserv.c @@ -172,7 +172,7 @@ int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, const char service_name[], char port[] ) { - static const char FCNAME[] = "MPID_NS_Lookup"; + /* static const char FCNAME[] = "MPID_NS_Lookup"; */ FILE *fp; char filename[MAXPATHLEN]; int mpi_errno = MPI_SUCCESS; http://git.mpich.org/mpich.git/commitdiff/95ca219e1713846f5c5b51fd94663398f… commit 95ca219e1713846f5c5b51fd94663398fbf9369f Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 15 17:00:13 2013 -0600 Moved variable declarations to avoud warnings Moved a couple of variable declarations inside their block to avoid compilers complaining when those blocks are not compiled because of an #ifdef evaluated to false. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 7a6774e..07d1cb0 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -620,7 +620,6 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; MPID_Comm *comm_ptr = NULL; - MPID_Datatype *sendtype_ptr, *recvtype_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISCATTER); MPIU_THREAD_CS_ENTER(ALLFUNC,); @@ -647,6 +646,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS { + MPID_Datatype *sendtype_ptr, *recvtype_ptr; MPID_Comm_valid_ptr(comm_ptr, mpi_errno); if (comm_ptr->comm_kind == MPID_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); diff --git a/src/mpi/coll/reduce_local.c b/src/mpi/coll/reduce_local.c index 1c69ce1..113b47f 100644 --- a/src/mpi/coll/reduce_local.c +++ b/src/mpi/coll/reduce_local.c @@ -143,7 +143,6 @@ Output Parameters: int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op) { int mpi_errno = MPI_SUCCESS; - MPID_Op *op_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_LOCAL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -159,6 +158,7 @@ int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype MPIR_ERRTEST_OP(op, mpi_errno); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { + MPID_Op *op_ptr; MPID_Op_get_ptr(op, op_ptr); MPID_Op_valid_ptr( op_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; http://git.mpich.org/mpich.git/commitdiff/e39d17eaedecd5655eb5699699d0edbdb… commit e39d17eaedecd5655eb5699699d0edbdb8c8aad4 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 15 16:58:27 2013 -0600 Fix compiler warnings - unused variables Warnings related to unused variables intended to be used for debugging, but always declared. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index d27a525..9269b5a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -1903,7 +1903,9 @@ int MPID_nem_tcp_state_listening_handler(struct pollfd *const unused_1, sockconn len = sizeof(SA_IN); MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "before accept")); if ((connfd = accept(l_sc->fd, (SA *) &rmt_addr, &len)) < 0) { +#ifdef HAVE_ERROR_CHECKING int save_errno = errno; +#endif MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "after accept, l_sc=%p lstnfd=%d connfd=%d, errno=%d:%s ", l_sc, l_sc->fd, connfd, errno, MPIU_Strerror(save_errno))); if (errno == EINTR) continue; diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index fc2c5ae..0acb680 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -115,7 +115,9 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, else { /* --BEGIN ERROR HANDLING-- */ +#ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); +#endif MPID_Request_release(rreq); rreq = NULL; MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index 93a3ab9..103a352 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -124,7 +124,9 @@ int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag, else { /* --BEGIN ERROR HANDLING-- */ +#ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); +#endif MPID_Request_release(rreq); rreq = NULL; MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index 1eeeb06..76d782e 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -139,7 +139,9 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag, else { /* --BEGIN ERROR HANDLING-- */ +#ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); +#endif MPID_Request_release(rreq); rreq = NULL; MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", http://git.mpich.org/mpich.git/commitdiff/893492169ea02c41140c32c2c6e8be475… commit 893492169ea02c41140c32c2c6e8be4753667d4d Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 12 19:37:07 2013 -0600 Fixes warnings in some collectives with pgcc Fixes compiler warnings complaining about a missing cast from void * to const void *. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index ef5451e..0de26b5 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -137,7 +137,7 @@ int MPIR_Exscan ( /* adjust for potential negative lower bound in datatype */ tmp_buf = (void *)((char*)tmp_buf - true_lb); - mpi_errno = MPIR_Localcopy((sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf), count, datatype, + mpi_errno = MPIR_Localcopy((sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf), count, datatype, partial_scan, count, datatype); if (mpi_errno) MPIU_ERR_POP(mpi_errno); diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index b5d1ae7..f7b7f17 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -102,7 +102,7 @@ int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat /* adjust for potential negative lower bound in datatype */ tmp_buf = (void *)((char*)tmp_buf - true_lb); - mpi_errno = MPID_Sched_copy((sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf), count, datatype, + mpi_errno = MPID_Sched_copy((sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf), count, datatype, partial_scan, count, datatype, s); if (mpi_errno) MPIU_ERR_POP(mpi_errno); diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 07ccd20..68a64ff 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -707,7 +707,7 @@ static int MPIR_Ireduce_scatter_noncomm(const void *sendbuf, void *recvbuf, /* Copy our send data to tmp_buf0. We do this one block at a time and permute the blocks as we go according to the mirror permutation. */ for (i = 0; i < comm_size; ++i) { - mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size)), + mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size)), block_size, datatype, ((char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size)), block_size, datatype, s); diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index b224b41..acb8ff2 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -683,7 +683,7 @@ int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int r /* Copy our send data to tmp_buf0. We do this one block at a time and permute the blocks as we go according to the mirror permutation. */ for (i = 0; i < comm_size; ++i) { - mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size)), + mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size)), block_size, datatype, ((char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size)), block_size, datatype, s); diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 5a9aaca..b04ea60 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -84,7 +84,8 @@ static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const /* Copy our send data to tmp_buf0. We do this one block at a time and permute the blocks as we go according to the mirror permutation. */ for (i = 0; i < comm_size; ++i) { - mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size), block_size, datatype, + mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size), + block_size, datatype, (char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size), block_size, datatype); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index b9a6c5e..045f63a 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -94,7 +94,8 @@ static int MPIR_Reduce_scatter_block_noncomm ( /* Copy our send data to tmp_buf0. We do this one block at a time and permute the blocks as we go according to the mirror permutation. */ for (i = 0; i < comm_size; ++i) { - mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size), block_size, datatype, + mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size), + block_size, datatype, (char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size), block_size, datatype); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } http://git.mpich.org/mpich.git/commitdiff/30fc08e100d45ebaea60941a22b3711da… commit 30fc08e100d45ebaea60941a22b3711da5864637 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 12 19:35:52 2013 -0600 Fix warnings in mpidrma.h when compiling with pgcc Fixes the following warnings: PGC-W-0095-Type cast required for this conversion (./src/mpid/ch3/include/mpidrma.h: 703) PGC-W-0095-Type cast required for this conversion (./src/mpid/ch3/include/mpidrma.h: 864) Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 4eb6206..bceb847 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -700,7 +700,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPID_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len); - source_buf = (tmp_buf != NULL) ? tmp_buf : origin_addr; + source_buf = (tmp_buf != NULL) ? (const void *)tmp_buf : origin_addr; target_buf = (char *) base + disp_unit * target_disp; type = dtp->eltype; type_size = MPID_Datatype_get_basic_size(type); @@ -861,7 +861,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPID_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len); - source_buf = (tmp_buf != NULL) ? tmp_buf : origin_addr; + source_buf = (tmp_buf != NULL) ? (const void *)tmp_buf : origin_addr; target_buf = (char *) base + disp_unit * target_disp; type = dtp->eltype; type_size = MPID_Datatype_get_basic_size(type); http://git.mpich.org/mpich.git/commitdiff/6363c2aa21495fb30b15f6e91ee395233… commit 6363c2aa21495fb30b15f6e91ee39523333fbef2 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Nov 12 19:29:55 2013 -0600 Fix warning in ckpoint.c with Portland compilers Fixes the following warning: PGC-W-0155-Pointer value created from a nonlong integral type (tools/ckpoint/ckpoint.c: 86) Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.c b/src/pm/hydra/tools/ckpoint/ckpoint.c index 3913852..d24888f 100644 --- a/src/pm/hydra/tools/ckpoint/ckpoint.c +++ b/src/pm/hydra/tools/ckpoint/ckpoint.c @@ -83,7 +83,7 @@ static void *ckpoint_thread(void *arg) fn_exit: in_ckpt = HYDT_CKPOINT_FINISHED; - return (void *) status; + return (void *) (long) status; fn_fail: HYDT_ftb_publish("FTB_MPI_PROCS_CKPT_FAIL", ftb_event_payload); http://git.mpich.org/mpich.git/commitdiff/5ae8a7198dea0791a23756833710119d4… commit 5ae8a7198dea0791a23756833710119d490e94ca Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 17:30:05 2013 -0600 Removed unused variables from dll_mpich.c They were causing compiler warnings Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index cf957eb..fa362ae 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -255,7 +255,6 @@ int mqs_image_has_queues (mqs_image *image, char **message) { mpich_image_info * i_info = (mpich_image_info *)dbgr_get_image_info (image); - int have_co = 0, have_cl = 0, have_req = 0, have_dreq = 0; /* Default failure message ! */ *message = (char *)"The symbols and types in the MPICH library used by TotalView\n" @@ -282,7 +281,6 @@ int mqs_image_has_queues (mqs_image *image, char **message) mqs_type *cl_type = dbgr_find_type( image, (char *)"MPIR_Comm_list", mqs_lang_c ); if (cl_type) { - have_cl = 1; i_info->sequence_number_offs = dbgr_field_offset( cl_type, (char *)"sequence_number" ); i_info->comm_head_offs = dbgr_field_offset( cl_type, (char *)"head" ); @@ -291,7 +289,6 @@ int mqs_image_has_queues (mqs_image *image, char **message) { mqs_type *co_type = dbgr_find_type( image, (char *)"MPID_Comm", mqs_lang_c ); if (co_type) { - have_co = 1; i_info->comm_name_offs = dbgr_field_offset( co_type, (char *)"name" ); i_info->comm_next_offs = dbgr_field_offset( co_type, (char *)"comm_next" ); i_info->comm_rsize_offs = dbgr_field_offset( co_type, (char *)"remote_size" ); @@ -310,7 +307,6 @@ int mqs_image_has_queues (mqs_image *image, char **message) mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); if (req_type) { int mpid_offs; - have_req = 1; mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" ); i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" ); i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" ); @@ -321,7 +317,6 @@ int mqs_image_has_queues (mqs_image *image, char **message) i_info->req_mpid_offs = mpid_offs; if (dreq_type) { int loff, envelope_offs; - have_dreq = 1; loff = dbgr_field_offset( dreq_type, (char *)"next" ); i_info->req_next_offs = mpid_offs + loff; loff = dbgr_field_offset( dreq_type, (char *)"userbuf" ); @@ -655,8 +650,6 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info, int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info); mqs_taddr_t buffer = 0; unsigned buf_count = -1; - int datatype; - datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info); if(look_for_user_buffer) { http://git.mpich.org/mpich.git/commitdiff/769f698c8e2d300632a66adf5a2d42c3e… commit 769f698c8e2d300632a66adf5a2d42c3e4729916 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 17:28:50 2013 -0600 Fixes compiler warnings in init.c / initthread.c src/mpi/init/init.c: In function 'PMPI_Init': src/mpi/init/init.c:78:9: warning: variable 'rc' set but not used [-Wunused-but-set-variable] src/mpi/init/initthread.c: In function 'PMPI_Init_thread': src/mpi/init/initthread.c:554:9: warning: variable 'rc' set but not used [-Wunused-but-set-variable] Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/init/init.c b/src/mpi/init/init.c index be70c9e..2ffcfce 100644 --- a/src/mpi/init/init.c +++ b/src/mpi/init/init.c @@ -75,7 +75,7 @@ int MPI_Init( int *argc, char ***argv ) { static const char FCNAME[] = "MPI_Init"; int mpi_errno = MPI_SUCCESS; - int rc; + int rc ATTRIBUTE((unused)); int threadLevel, provided; MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT); diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index a765374..7401af7 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -551,7 +551,7 @@ Notes for Fortran: int MPI_Init_thread( int *argc, char ***argv, int required, int *provided ) { int mpi_errno = MPI_SUCCESS; - int rc, reqd = required; + int rc ATTRIBUTE((unused)), reqd = required; MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT_THREAD); rc = MPID_Wtime_init(); http://git.mpich.org/mpich.git/commitdiff/4bf29080cd818959c47cfdc1a83c8b21c… commit 4bf29080cd818959c47cfdc1a83c8b21c78c40b9 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 17:27:32 2013 -0600 Fix compiler warnings in mpid_type_debug.c Fixes warnings in mpid_type_debug.c about unused variables in MPIDI_Datatype_printf. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/common/datatype/mpid_type_debug.c b/src/mpid/common/datatype/mpid_type_debug.c index fcece4b..8bd6806 100644 --- a/src/mpid/common/datatype/mpid_type_debug.c +++ b/src/mpid/common/datatype/mpid_type_debug.c @@ -233,6 +233,7 @@ void MPIDI_Datatype_printf(MPI_Datatype type, int blocklength, int header) { +#ifdef USE_DBG_LOGGING char *string; MPI_Aint size; MPI_Aint extent, true_lb, true_ub, lb, ub, sticky_lb, sticky_ub; @@ -278,6 +279,7 @@ void MPIDI_Datatype_printf(MPI_Datatype type, (MPI_Aint) sticky_ub, (MPI_Aint) displacement, (int) blocklength)); +#endif return; } /* --END ERROR HANDLING-- */ http://git.mpich.org/mpich.git/commitdiff/c750a8b82bd7ca7a76451f0cab37d47d3… commit c750a8b82bd7ca7a76451f0cab37d47d3aa4aa7d Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 17:25:08 2013 -0600 Fix braces compiler suggestion (warning) Fixes the following warning in ch3u_handle_connection.c whith --enable-strict: src/mpid/ch3/src/ch3u_handle_connection.c:317:194: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c index cc34eb9..00bdb8e 100644 --- a/src/mpid/ch3/src/ch3u_handle_connection.c +++ b/src/mpid/ch3/src/ch3u_handle_connection.c @@ -314,11 +314,12 @@ int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, else /* (vc->state == MPIDI_VC_STATE_ACTIVE) */ { if (vc->state != MPIDI_VC_STATE_ACTIVE) + { MPIU_DBG_MSG_FMT(CH3_DISCONNECT, TYPICAL, (MPIU_DBG_FDEST, "Unexpected state %s in vc %p (rank=%d) (expecting MPIDI_VC_STATE_ACTIVE)\n", MPIDI_VC_GetStateString(vc->state), vc, vc->pg_rank )); MPIU_DBG_MSG_D(CH3_DISCONNECT,TYPICAL, "received close(FALSE) from %d, moving to REMOTE_CLOSE.", vc->pg_rank); - + } MPIU_Assert(vc->state == MPIDI_VC_STATE_ACTIVE); MPIDI_CHANGE_VC_STATE(vc, REMOTE_CLOSE); } http://git.mpich.org/mpich.git/commitdiff/ee7f0aae436f669091016311c13b1c6af… commit ee7f0aae436f669091016311c13b1c6af135c49d Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 11 17:23:08 2013 -0600 Fix compiler warnings in pmip_cb.c Fixes the following warnings when compiling pmip_cb.c with --enable-strict: pm/pmiserv/pmip_cb.c:803:9: warning: null argument where non-null required (argument 1) [-Wnonnull] pm/pmiserv/pmip_cb.c:803:9: warning: null argument where non-null required (argument 2) [-Wnonnull] Related to ticket #1966 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index d6028f8..e0fa208 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -520,8 +520,6 @@ AC_DEFINE_UNQUOTED(HYDRA_AVAILABLE_CKPOINTLIBS,"$available_ckpointlibs", if test "$hydra_default_ckpointlib" != "" ; then AC_DEFINE_UNQUOTED(HYDRA_DEFAULT_CKPOINTLIB,"$hydra_default_ckpointlib", [Default checkpointing library]) -else - AC_DEFINE(HYDRA_DEFAULT_CKPOINTLIB,NULL,[Default checkpointing library]) fi AM_CONDITIONAL([hydra_have_blcr], [test "${have_blcr}" = "yes"]) diff --git a/src/pm/hydra/pm/pmiserv/pmip_cb.c b/src/pm/hydra/pm/pmiserv/pmip_cb.c index e284028..597c800 100644 --- a/src/pm/hydra/pm/pmiserv/pmip_cb.c +++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c @@ -799,8 +799,10 @@ static HYD_status parse_exec_params(char **t_argv) if (HYD_pmcd_pmip.user_global.topolib == NULL && HYDRA_DEFAULT_TOPOLIB) HYD_pmcd_pmip.user_global.topolib = HYDU_strdup(HYDRA_DEFAULT_TOPOLIB); - if (HYD_pmcd_pmip.user_global.ckpointlib == NULL && HYDRA_DEFAULT_CKPOINTLIB) +#ifdef HYDRA_DEFAULT_CKPOINTLIB + if (HYD_pmcd_pmip.user_global.ckpointlib == NULL) HYD_pmcd_pmip.user_global.ckpointlib = HYDU_strdup(HYDRA_DEFAULT_CKPOINTLIB); +#endif fn_exit: HYDU_FUNC_EXIT(); diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.c b/src/pm/hydra/tools/ckpoint/ckpoint.c index b730bd3..3913852 100644 --- a/src/pm/hydra/tools/ckpoint/ckpoint.c +++ b/src/pm/hydra/tools/ckpoint/ckpoint.c @@ -30,11 +30,16 @@ HYD_status HYDT_ckpoint_init(const char *user_ckpointlib, int user_ckpoint_num) if (user_ckpointlib) HYDT_ckpoint_info.ckpointlib = user_ckpointlib; else if (MPL_env2str("HYDRA_CKPOINTLIB", (const char **) &HYDT_ckpoint_info.ckpointlib) == 0) +#ifdef HYDRA_DEFAULT_CKPOINTLIB HYDT_ckpoint_info.ckpointlib = HYDRA_DEFAULT_CKPOINTLIB; - - /* If there is no default checkpointlib, we bail out */ - if (HYDRA_DEFAULT_CKPOINTLIB == NULL) +#else + { + /* If there is no default checkpointlib, we bail out */ + HYDT_ckpoint_info.ckpointlib = NULL; goto fn_exit; + } +#endif + HYDT_ckpoint_info.ckpoint_num = (user_ckpoint_num == -1) ? 0 : user_ckpoint_num; in_ckpt = HYDT_CKPOINT_NONE; http://git.mpich.org/mpich.git/commitdiff/c2dc7a35e2398f5e93bb6a63efa7ca728… commit c2dc7a35e2398f5e93bb6a63efa7ca728f525a16 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Nov 6 16:32:02 2013 -0600 Fix compiler warning in tcp_init.c Fixes the following warning when compiling tcp_init.c with --enable-strict: src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c: In function 'GetSockInterfaceAddr': src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c:248:9: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Reported in ticket #1966 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c index 02f7c2b..ae992ed 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c @@ -246,8 +246,9 @@ static int GetSockInterfaceAddr(int myRank, char *ifname, int maxIfname, MPIU_ERR_CHKANDJUMP1(mpi_errno || !ifaddrFound, mpi_errno, MPI_ERR_OTHER, "**iface_notfound", "**iface_notfound %s", MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE); MPIU_DBG_MSG_FMT(CH3_CONNECT, VERBOSE, (MPIU_DBG_FDEST, - "ifaddrFound=TRUE ifaddr->type=%d ifaddr->len=%d ifaddr->ifaddr[0-3]=%#08x", - ifaddr->type, ifaddr->len, *((unsigned int *)ifaddr->ifaddr))); + "ifaddrFound=TRUE ifaddr->type=%d ifaddr->len=%d ifaddr->ifaddr[0-3]=%d.%d.%d.%d", + ifaddr->type, ifaddr->len, ifaddr->ifaddr[0], ifaddr->ifaddr[1], ifaddr->ifaddr[2], + ifaddr->ifaddr[3])); /* In this case, ifname is only used for debugging purposes */ mpi_errno = MPID_Get_processor_name(ifname, maxIfname, &len ); http://git.mpich.org/mpich.git/commitdiff/d8b8eb6f8e59031853d167c2580c8cb8c… commit d8b8eb6f8e59031853d167c2580c8cb8c5ec4a9b Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Nov 6 16:26:10 2013 -0600 Fix warnings about possible uninitialized accesses Fixes compiler warnings related to the possible use of uninitialized memory in mpiu_chkpmem_stk_[0] and mpir_sched_chkpmem_stk_[0]. A couple of examples: src/mpid/ch3/src/ch3u_rma_sync.c: In function 'MPIDI_CH3I_Recv_rma_msg': src/mpid/ch3/src/ch3u_rma_sync.c:1265:5: warning: 'mpiu_chkpmem_stk_[0]' may be used uninitialized in this function [-Wmaybe-uninitialized] src/mpi/coll/iallgather.c: In function 'MPIR_Iallgather_bruck': src/mpi/coll/iallgather.c:329:5: warning: 'mpir_sched_chkpmem_stk_[0]' may be used uninitialized in this function [-Wmaybe-uninitialized] While the code seems correct, this patch avoids the warning. See ticket #1966 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/include/mpimem.h b/src/include/mpimem.h index 876fd63..59e965d 100644 --- a/src/include/mpimem.h +++ b/src/include/mpimem.h @@ -368,7 +368,7 @@ if (pointer_) { \ /* Persistent memory that we may want to recover if something goes wrong */ #define MPIU_CHKPMEM_DECL(n_) \ - void *(mpiu_chkpmem_stk_[n_]);\ + void *(mpiu_chkpmem_stk_[n_]) = { NULL }; \ int mpiu_chkpmem_stk_sp_=0;\ MPIU_AssertDeclValue(const int mpiu_chkpmem_stk_sz_,n_) #define MPIU_CHKPMEM_MALLOC_ORSTMT(pointer_,type_,nbytes_,rc_,name_,stmt_) \ diff --git a/src/include/mpir_nbc.h b/src/include/mpir_nbc.h index bd821cc..1a3964e 100644 --- a/src/include/mpir_nbc.h +++ b/src/include/mpir_nbc.h @@ -117,7 +117,7 @@ int MPIR_Sched_cb_free_buf(MPID_Comm *comm, int tag, void *state); /* an upgraded version of MPIU_CHKPMEM_MALLOC/_DECL/_REAP/_COMMIT that adds * corresponding cleanup callbacks to the given schedule at _COMMIT time */ #define MPIR_SCHED_CHKPMEM_DECL(n_) \ - void *(mpir_sched_chkpmem_stk_[n_]); \ + void *(mpir_sched_chkpmem_stk_[n_]) = { NULL }; \ int mpir_sched_chkpmem_stk_sp_=0; \ MPIU_AssertDeclValue(const int mpir_sched_chkpmem_stk_sz_,n_) http://git.mpich.org/mpich.git/commitdiff/6e8dae1b4fdbfd2d7225ca3fd28585532… commit 6e8dae1b4fdbfd2d7225ca3fd285855322d25466 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Nov 6 16:21:12 2013 -0600 Fix warning in opminloc.c and opmaxloc.c Fixes the following warnings (with --enable-strict): src/mpi/coll/opminloc.c: In function 'MPIR_MINLOC': src/mpi/coll/opminloc.c:85:24: warning: variable 'flen' set but not used [-Wunused-but-set-variable] src/mpi/coll/opmaxloc.c: In function 'MPIR_MAXLOC': src/mpi/coll/opmaxloc.c:86:24: warning: variable 'flen' set but not used [-Wunused-but-set-variable] See ticket #1966 Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpi/coll/opmaxloc.c b/src/mpi/coll/opmaxloc.c index 3f335d5..cf4ada7 100644 --- a/src/mpi/coll/opmaxloc.c +++ b/src/mpi/coll/opmaxloc.c @@ -83,9 +83,13 @@ void MPIR_MAXLOC( MPI_Datatype *type ) { int mpi_errno = MPI_SUCCESS; - int i, len = *Len, flen; + int i, len = *Len; - flen = len * 2; /* used for Fortran types */ +#ifdef HAVE_FORTRAN_BINDING +#ifndef HAVE_NO_FORTRAN_MPI_TYPES_IN_C + int flen = len * 2; /* used for Fortran types */ +#endif +#endif switch (*type) { /* first the C types */ diff --git a/src/mpi/coll/opminloc.c b/src/mpi/coll/opminloc.c index a4ee0ce..c55c59a 100644 --- a/src/mpi/coll/opminloc.c +++ b/src/mpi/coll/opminloc.c @@ -82,9 +82,13 @@ void MPIR_MINLOC( MPI_Datatype *type ) { int mpi_errno = MPI_SUCCESS; - int i, len = *Len, flen; + int i, len = *Len; - flen = len * 2; /* used for Fortran types */ +#ifdef HAVE_FORTRAN_BINDING +#ifndef HAVE_NO_FORTRAN_MPI_TYPES_IN_C + int flen = len * 2; /* used for Fortran types */ +#endif +#endif switch (*type) { /* first the C types */ http://git.mpich.org/mpich.git/commitdiff/8822485c3bdfb99130ba6b00912e19fe6… commit 8822485c3bdfb99130ba6b00912e19fe6a6eb255 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Wed Nov 6 16:18:48 2013 -0600 Fix warning in mpltrmem.c Fixes the following warning (with --enable-strict): src/mpltrmem.c: In function 'MPL_trdump': src/mpltrmem.c:584:14: warning: variable 'old_head' set but not used [-Wunused-but-set-variable] See ticket #1966 Modifications by: Wesley Bland <wbland(a)mcs.anl.gov> Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/src/mpl/src/mpltrmem.c b/src/mpl/src/mpltrmem.c index b33887f..9d0d919 100644 --- a/src/mpl/src/mpltrmem.c +++ b/src/mpl/src/mpltrmem.c @@ -581,7 +581,9 @@ Input Parameters: void MPL_trdump(FILE * fp, int minid) { TRSPACE *head; +#ifdef VALGRIND_MAKE_MEM_NOACCESS TRSPACE *old_head; +#endif char hexstring[MAX_ADDRESS_CHARS]; if (fp == 0) @@ -607,7 +609,9 @@ void MPL_trdump(FILE * fp, int minid) fprintf(fp, "%s[%d]\n", head->fname, head->lineno); } } +#ifdef VALGRIND_MAKE_MEM_NOACCESS old_head = head; +#endif head = head->next; MPL_VG_MAKE_MEM_NOACCESS(old_head, sizeof(*old_head)); } ----------------------------------------------------------------------- Summary of changes: src/include/mpimem.h | 2 +- src/include/mpir_nbc.h | 2 +- src/mpi/coll/exscan.c | 2 +- src/mpi/coll/iexscan.c | 2 +- src/mpi/coll/ired_scat.c | 2 +- src/mpi/coll/ired_scat_block.c | 2 +- src/mpi/coll/iscatter.c | 2 +- src/mpi/coll/opmaxloc.c | 8 ++++++-- src/mpi/coll/opminloc.c | 8 ++++++-- src/mpi/coll/red_scat.c | 3 ++- src/mpi/coll/red_scat_block.c | 3 ++- src/mpi/coll/reduce_local.c | 2 +- src/mpi/debugger/dll_mpich.c | 7 ------- src/mpi/init/init.c | 2 +- src/mpi/init/initthread.c | 2 +- src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 2 ++ .../ch3/channels/nemesis/netmod/tcp/tcp_init.c | 5 +++-- src/mpid/ch3/include/mpidrma.h | 4 ++-- src/mpid/ch3/src/ch3u_handle_connection.c | 3 ++- src/mpid/ch3/src/mpid_imrecv.c | 2 ++ src/mpid/ch3/src/mpid_irecv.c | 2 ++ src/mpid/ch3/src/mpid_recv.c | 2 ++ src/mpid/common/datatype/mpid_type_debug.c | 2 ++ src/mpl/src/mpltrmem.c | 4 ++++ src/nameserv/file/file_nameserv.c | 2 +- src/pm/hydra/configure.ac | 2 -- src/pm/hydra/pm/pmiserv/pmip_cb.c | 4 +++- src/pm/hydra/tools/ckpoint/ckpoint.c | 13 +++++++++---- 28 files changed, 60 insertions(+), 36 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-29-g65a3af4
by noreply＠mpich.org 15 Nov '13

15 Nov '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 65a3af4338217e941e0d099a1fadad1a517d3411 (commit) from 5014a82c26f3a01aa0bb190510413ebb8df81001 (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/65a3af4338217e941e0d099a1fadad1a5… commit 65a3af4338217e941e0d099a1fadad1a517d3411 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 15 15:27:19 2013 -0600 Fixed --enabled-debuginfo segfaults Added support for Ibsend and persistent sends, and fixed all other cases by clearing out the dgb-next field of send requests. Closes #1932. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 5b23f74..788ceea 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -299,8 +299,6 @@ void MPIR_DebuggerSetAborting( const char *msg ) * (more specifically, requests created with MPI_Isend, MPI_Issend, or * MPI_Irsend). * - * FIXME: We need to add MPI_Ibsend and the persistent send requests to - * the known send requests. * FIXME: We should exploit this to allow Finalize to report on * send requests that were never completed. */ diff --git a/src/mpi/pt2pt/bsend_init.c b/src/mpi/pt2pt/bsend_init.c index 295b3e9..2ad2319 100644 --- a/src/mpi/pt2pt/bsend_init.c +++ b/src/mpi/pt2pt/bsend_init.c @@ -119,6 +119,7 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, mpi_errno = MPID_Bsend_init(buf, count, datatype, dest, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* return the handle of the request to the user */ MPIU_OBJ_PUBLISH_HANDLE(*request, request_ptr->handle); diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index 3c92016..9bced9a 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -105,6 +105,7 @@ int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest mpi_errno = MPIR_Bsend_isend( buf, count, datatype, dest, tag, comm_ptr, IBSEND, &request_ptr ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* FIXME: use the memory management macros */ ibinfo = (ibsend_req_info *)MPIU_Malloc( sizeof(ibsend_req_info) ); diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index 0a195ce..22d9154 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -73,7 +73,6 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, MPIR_STATUS_SET_CANCEL_BIT(*status, MPIR_STATUS_GET_CANCEL_BIT(request_ptr->status)); } mpi_errno = request_ptr->status.MPI_ERROR; - /* FIXME: are Ibsend requests added to the send queue? */ MPIR_SENDQ_FORGET(request_ptr); MPID_Request_release(request_ptr); *request = MPI_REQUEST_NULL; @@ -132,10 +131,6 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, } } - /* FIXME: MPIR_SENDQ_FORGET(request_ptr); -- it appears that - persistent sends are not currently being added to the send - queue. should they be, or should this release be - conditional? */ MPID_Request_release(prequest_ptr); } else diff --git a/src/mpi/pt2pt/send_init.c b/src/mpi/pt2pt/send_init.c index 1be6096..af5ab90 100644 --- a/src/mpi/pt2pt/send_init.c +++ b/src/mpi/pt2pt/send_init.c @@ -125,6 +125,7 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, mpi_errno = MPID_Send_init(buf, count, datatype, dest, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* return the handle of the request to the user */ MPIU_OBJ_PUBLISH_HANDLE(*request, request_ptr->handle); diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 5b5eadc..a3a5c31 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -295,6 +295,12 @@ extern MPIDI_Process_t MPIDI_Process; #define MPIDI_CH3_REQUEST_INIT(a_) #endif +#ifdef HAVE_DEBUGGER_SUPPORT +#define MPIDI_Request_clear_dbg(sreq_) ((sreq_)->dbg_next = NULL) +#else +#define MPIDI_Request_clear_dbg(sreq_) +#endif + /* FIXME: Why does a send request need the match information? Is that for debugging information? In case the initial envelope cannot be sent? Ditto for the dev.user_buf, count, and datatype @@ -344,6 +350,7 @@ extern MPIDI_Process_t MPIDI_Process; (sreq_)->dev.OnFinal = NULL; \ (sreq_)->dev.iov_count = 0; \ (sreq_)->dev.iov_offset = 0; \ + MPIDI_Request_clear_dbg(sreq_); \ } /* This is the receive request version of MPIDI_Request_create_sreq */ ----------------------------------------------------------------------- Summary of changes: src/mpi/debugger/dbginit.c | 2 -- src/mpi/pt2pt/bsend_init.c | 1 + src/mpi/pt2pt/ibsend.c | 1 + src/mpi/pt2pt/mpir_request.c | 5 ----- src/mpi/pt2pt/send_init.c | 1 + src/mpid/ch3/include/mpidimpl.h | 7 +++++++ 6 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-28-g5014a82
by noreply＠mpich.org 15 Nov '13

15 Nov '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 5014a82c26f3a01aa0bb190510413ebb8df81001 (commit) via dc9275be03350854fd2dde2012bc48d09a10fc14 (commit) from b9531d3de2cdd2f186dfdb0774db94fe0ebc7b7c (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/5014a82c26f3a01aa0bb190510413ebb8… commit 5014a82c26f3a01aa0bb190510413ebb8df81001 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Nov 15 14:01:00 2013 -0600 Add more tests in test/mpi/rma/rmazero.c. Add tests of using derived datatype in MPI_ACCUMULATE to test handling of zero-byte transfer, because packet handler of MPI_ACCUMULATE is differernt for predefined datatype and derived datatype. Signed-off-by: Wesley Bland <wbland(a)mcs.anl.gov> diff --git a/test/mpi/rma/rmazero.c b/test/mpi/rma/rmazero.c index 0ea28d7..d3a559a 100644 --- a/test/mpi/rma/rmazero.c +++ b/test/mpi/rma/rmazero.c @@ -105,6 +105,7 @@ int main( int argc, char *argv[] ) MPI_Comm comm; MPI_Win win; MPI_Request req; + MPI_Datatype derived_dtp; MTest_Init( &argc, &argv ); @@ -127,6 +128,9 @@ int main( int argc, char *argv[] ) MPI_Abort( MPI_COMM_WORLD, 1 ); } + MPI_Type_contiguous(2, MPI_INT, &derived_dtp); + MPI_Type_commit(&derived_dtp); + /* The following loop is used to run through a series of communicators * that are subsets of MPI_COMM_WORLD, of size 1 or greater. */ while (MTestGetIntracommGeneral( &comm, 1, 1 )) { @@ -137,7 +141,7 @@ int main( int argc, char *argv[] ) MPI_Comm_rank( comm, &rank ); MPI_Comm_size( comm, &size ); - MPI_Win_create( buf, bufsize, sizeof(int), MPI_INFO_NULL, comm, &win ); + MPI_Win_create( buf, bufsize, 2*sizeof(int), MPI_INFO_NULL, comm, &win ); /* To improve reporting of problems about operations, we change the error handler to errors return */ MPI_Win_set_errhandler( win, MPI_ERRORS_RETURN ); @@ -158,6 +162,10 @@ int main( int argc, char *argv[] ) MPI_Accumulate( rmabuf, count, MPI_INT, TARGET, 0, count, MPI_INT, MPI_SUM, win ); ); + TEST_FENCE_OP("Accumulate_derived", + MPI_Accumulate( rmabuf, count, derived_dtp, TARGET, + 0, count, derived_dtp, MPI_SUM, win ); + ); TEST_FENCE_OP("Get accumulate", MPI_Get_accumulate( rmabuf, count, MPI_INT, result, count, MPI_INT, TARGET, 0, @@ -179,6 +187,10 @@ int main( int argc, char *argv[] ) MPI_Accumulate( rmabuf, count, MPI_INT, TARGET, 0, count, MPI_INT, MPI_SUM, win ); ); + TEST_PT_OP("Accumulate_derived", + MPI_Accumulate( rmabuf, count, derived_dtp, TARGET, 0, + count, derived_dtp, MPI_SUM, win ); + ); TEST_PT_OP("Get accumulate", MPI_Get_accumulate( rmabuf, count, MPI_INT, result, count, MPI_INT, TARGET, 0, count, @@ -201,6 +213,10 @@ int main( int argc, char *argv[] ) MPI_Raccumulate( rmabuf, count, MPI_INT, TARGET, 0, count, MPI_INT, MPI_SUM, win, &req ); ); + TEST_REQ_OP("Raccumulate_derived", req, + MPI_Raccumulate( rmabuf, count, derived_dtp, TARGET, 0, + count, derived_dtp, MPI_SUM, win, &req ); + ); TEST_REQ_OP("Rget_accumulate", req, MPI_Rget_accumulate( rmabuf, count, MPI_INT, result, count, MPI_INT, TARGET, 0, @@ -211,6 +227,8 @@ int main( int argc, char *argv[] ) MTestFreeComm(&comm); } + MPI_Type_free(&derived_dtp); + free( result ); free( buf ); free( rmabuf ); http://git.mpich.org/mpich.git/commitdiff/dc9275be03350854fd2dde2012bc48d09… commit dc9275be03350854fd2dde2012bc48d09a10fc14 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Fri Nov 15 13:38:38 2013 -0600 Fix #1701 - cleanup code for zero-size data transfer. Delete code for zero-size data transfer in packet handlers of Put/Accumulate/Accumulate_Immed/Get_AccumulateResp/GetResp/ LockPutUnlock/LockAccumUnlock, because they are redundant. (Note that packet handlers of LockPutUnlock and LockAccumUnlock are for single operation optimization in passive RMA) Zero-size data transfer has already been handled when issuing RMA operations (L146, L258, L369 in src/mpid/ch3/src/ch3u_rma_ops.c and L50 in src/mpid/ch3/src/ch3u_rma_acc_ops.c). RMA operation routines will directly exit if data size is zero. Signed-off-by: Wesley Bland <wbland(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 7a2553a..732b0da 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -3398,13 +3398,6 @@ int MPIDI_CH3_PktHandler_Put( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, type_size); req->dev.recv_data_sz = type_size * put_pkt->count; - if (req->dev.recv_data_sz == 0) { - MPIDI_CH3U_Request_complete( req ); - *buflen = sizeof(MPIDI_CH3_Pkt_t); - *rreqp = NULL; - goto fn_exit; - } - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, &complete); MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", @@ -3703,39 +3696,32 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Datatype_get_size_macro(accum_pkt->datatype, type_size); req->dev.recv_data_sz = type_size * accum_pkt->count; - - if (req->dev.recv_data_sz == 0) { - MPIDI_CH3U_Request_complete(req); - *buflen = sizeof(MPIDI_CH3_Pkt_t); - *rreqp = NULL; - } - else { - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, - &complete); - MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", - "**ch3|postrecv %s", "MPIDI_CH3_PKT_ACCUMULATE"); - /* FIXME: Only change the handling of completion if - post_data_receive reset the handler. There should - be a cleaner way to do this */ - if (!req->dev.OnDataAvail) { - req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_PutAccumRespComplete; - } - /* return the number of bytes processed in this function */ - *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); - - if (complete) + + mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, + &complete); + MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", + "**ch3|postrecv %s", "MPIDI_CH3_PKT_ACCUMULATE"); + /* FIXME: Only change the handling of completion if + post_data_receive reset the handler. There should + be a cleaner way to do this */ + if (!req->dev.OnDataAvail) { + req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_PutAccumRespComplete; + } + /* return the number of bytes processed in this function */ + *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); + + if (complete) + { + mpi_errno = MPIDI_CH3_ReqHandler_PutAccumRespComplete(vc, req, &complete); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + if (complete) { - mpi_errno = MPIDI_CH3_ReqHandler_PutAccumRespComplete(vc, req, &complete); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - if (complete) - { - *rreqp = NULL; - MPIU_INSTR_DURATION_END(rmapkt_acc_predef); - goto fn_exit; - } + *rreqp = NULL; + MPIU_INSTR_DURATION_END(rmapkt_acc_predef); + goto fn_exit; } - MPIU_INSTR_DURATION_END(rmapkt_acc_predef); - } + } + MPIU_INSTR_DURATION_END(rmapkt_acc_predef); } else { @@ -3831,52 +3817,45 @@ int MPIDI_CH3_PktHandler_Accumulate_Immed( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Datatype_get_extent_macro(accum_pkt->datatype, extent); - /* size == 0 should never happen */ - if (accum_pkt->count == 0 || extent == 0) { - ; + MPIU_INSTR_DURATION_START(rmapkt_acc_immed_op); + if (win_ptr->shm_allocated == TRUE) + MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); + /* Data is already present */ + if (accum_pkt->op == MPI_REPLACE) { + /* no datatypes required */ + int len; + MPIU_Assign_trunc(len, (accum_pkt->count * extent), int); + /* FIXME: use immediate copy because this is short */ + MPIUI_Memcpy( accum_pkt->addr, accum_pkt->data, len ); } else { - MPIU_INSTR_DURATION_START(rmapkt_acc_immed_op); - if (win_ptr->shm_allocated == TRUE) - MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); - /* Data is already present */ - if (accum_pkt->op == MPI_REPLACE) { - /* no datatypes required */ - int len; - MPIU_Assign_trunc(len, (accum_pkt->count * extent), int); - /* FIXME: use immediate copy because this is short */ - MPIUI_Memcpy( accum_pkt->addr, accum_pkt->data, len ); - } - else { - if (HANDLE_GET_KIND(accum_pkt->op) == HANDLE_KIND_BUILTIN) { - MPI_User_function *uop; - /* get the function by indexing into the op table */ - uop = MPIR_OP_HDL_TO_FN(accum_pkt->op); - (*uop)(accum_pkt->data, accum_pkt->addr, - &(accum_pkt->count), &(accum_pkt->datatype)); - } - else { - MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OP, "**opnotpredefined", - "**opnotpredefined %d", accum_pkt->op ); - } - } - if (win_ptr->shm_allocated == TRUE) - MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); - MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); - + if (HANDLE_GET_KIND(accum_pkt->op) == HANDLE_KIND_BUILTIN) { + MPI_User_function *uop; + /* get the function by indexing into the op table */ + uop = MPIR_OP_HDL_TO_FN(accum_pkt->op); + (*uop)(accum_pkt->data, accum_pkt->addr, + &(accum_pkt->count), &(accum_pkt->datatype)); + } + else { + MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OP, "**opnotpredefined", + "**opnotpredefined %d", accum_pkt->op ); + } + } + if (win_ptr->shm_allocated == TRUE) + MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); + MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op); - /* There are additional steps to take if this is a passive - target RMA or the last operation from the source */ - - /* Here is the code executed in PutAccumRespComplete after the - accumulation operation */ - MPID_Win_get_ptr(accum_pkt->target_win_handle, win_ptr); + /* There are additional steps to take if this is a passive + target RMA or the last operation from the source */ - mpi_errno = MPIDI_CH3_Finish_rma_op_target(vc, win_ptr, TRUE, - accum_pkt->flags, - accum_pkt->source_win_handle); - if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } - } + /* Here is the code executed in PutAccumRespComplete after the + accumulation operation */ + MPID_Win_get_ptr(accum_pkt->target_win_handle, win_ptr); + + mpi_errno = MPIDI_CH3_Finish_rma_op_target(vc, win_ptr, TRUE, + accum_pkt->flags, + accum_pkt->source_win_handle); + if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } fn_exit: MPIU_INSTR_DURATION_END(rmapkt_acc_immed); @@ -4187,26 +4166,16 @@ int MPIDI_CH3_PktHandler_Get_AccumResp( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Datatype_get_size_macro(req->dev.datatype, type_size); req->dev.recv_data_sz = type_size * req->dev.user_count; - /* FIXME: It is likely that this cannot happen (never perform - a get with a 0-sized item). In that case, change this - to an MPIU_Assert (and do the same for accumulate and put) */ - if (req->dev.recv_data_sz == 0) { - MPIDI_CH3U_Request_complete( req ); - *buflen = sizeof(MPIDI_CH3_Pkt_t); + *rreqp = req; + mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, &complete); + MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", + "**ch3|postrecv %s", "MPIDI_CH3_PKT_GET_ACCUM_RESP"); + if (complete) { + MPIDI_CH3U_Request_complete(req); *rreqp = NULL; } - else { - *rreqp = req; - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, &complete); - MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", - "**ch3|postrecv %s", "MPIDI_CH3_PKT_GET_ACCUM_RESP"); - if (complete) { - MPIDI_CH3U_Request_complete(req); - *rreqp = NULL; - } - /* return the number of bytes processed in this function */ - *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); - } + /* return the number of bytes processed in this function */ + *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); fn_exit: MPIU_INSTR_DURATION_END(rmapkt_get_accum); @@ -4392,38 +4361,30 @@ int MPIDI_CH3_PktHandler_LockPutUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.user_buf = new_ptr->pt_single_op->data; req->dev.lock_queue_entry = new_ptr; } - - if (req->dev.recv_data_sz == 0) { - *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPIDI_CH3U_Request_complete(req); - *rreqp = NULL; + + int (*fcn)( MPIDI_VC_t *, struct MPID_Request *, int * ); + fcn = req->dev.OnDataAvail; + mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, + &complete); + if (mpi_errno != MPI_SUCCESS) { + MPIU_ERR_SETFATALANDJUMP1(mpi_errno,MPI_ERR_OTHER, + "**ch3|postrecv", "**ch3|postrecv %s", + "MPIDI_CH3_PKT_LOCK_PUT_UNLOCK"); } - else { - int (*fcn)( MPIDI_VC_t *, struct MPID_Request *, int * ); - fcn = req->dev.OnDataAvail; - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, - &complete); - if (mpi_errno != MPI_SUCCESS) { - MPIU_ERR_SETFATALANDJUMP1(mpi_errno,MPI_ERR_OTHER, - "**ch3|postrecv", "**ch3|postrecv %s", - "MPIDI_CH3_PKT_LOCK_PUT_UNLOCK"); - } - req->dev.OnDataAvail = fcn; - *rreqp = req; + req->dev.OnDataAvail = fcn; + *rreqp = req; - if (complete) + if (complete) + { + mpi_errno = fcn(vc, req, &complete); + if (complete) { - mpi_errno = fcn(vc, req, &complete); - if (complete) - { - *rreqp = NULL; - } + *rreqp = NULL; } - - /* return the number of bytes processed in this function */ - *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); - } - + } + + /* return the number of bytes processed in this function */ + *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_SETFATALANDJUMP1(mpi_errno,MPI_ERR_OTHER, @@ -4650,34 +4611,27 @@ int MPIDI_CH3_PktHandler_LockAccumUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.lock_queue_entry = new_ptr; *rreqp = req; - if (req->dev.recv_data_sz == 0) { - *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPIDI_CH3U_Request_complete(req); - *rreqp = NULL; + mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, + &complete); + /* FIXME: Only change the handling of completion if + post_data_receive reset the handler. There should + be a cleaner way to do this */ + if (!req->dev.OnDataAvail) { + req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_SinglePutAccumComplete; } - else { - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, &data_len, - &complete); - /* FIXME: Only change the handling of completion if - post_data_receive reset the handler. There should - be a cleaner way to do this */ - if (!req->dev.OnDataAvail) { - req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_SinglePutAccumComplete; - } - if (mpi_errno != MPI_SUCCESS) { - MPIU_ERR_SET1(mpi_errno,MPI_ERR_OTHER,"**ch3|postrecv", - "**ch3|postrecv %s", "MPIDI_CH3_PKT_LOCK_ACCUM_UNLOCK"); - } - /* return the number of bytes processed in this function */ - *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); + if (mpi_errno != MPI_SUCCESS) { + MPIU_ERR_SET1(mpi_errno,MPI_ERR_OTHER,"**ch3|postrecv", + "**ch3|postrecv %s", "MPIDI_CH3_PKT_LOCK_ACCUM_UNLOCK"); + } + /* return the number of bytes processed in this function */ + *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); - if (complete) + if (complete) + { + mpi_errno = MPIDI_CH3_ReqHandler_SinglePutAccumComplete(vc, req, &complete); + if (complete) { - mpi_errno = MPIDI_CH3_ReqHandler_SinglePutAccumComplete(vc, req, &complete); - if (complete) - { - *rreqp = NULL; - } + *rreqp = NULL; } } fn_fail: @@ -4714,27 +4668,18 @@ int MPIDI_CH3_PktHandler_GetResp( MPIDI_VC_t *vc ATTRIBUTE((unused)), MPID_Datatype_get_size_macro(req->dev.datatype, type_size); req->dev.recv_data_sz = type_size * req->dev.user_count; - /* FIXME: It is likely that this cannot happen (never perform - a get with a 0-sized item). In that case, change this - to an MPIU_Assert (and do the same for accumulate and put) */ - if (req->dev.recv_data_sz == 0) { - MPIDI_CH3U_Request_complete( req ); - *buflen = sizeof(MPIDI_CH3_Pkt_t); - *rreqp = NULL; - } - else { - *rreqp = req; - mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, - &data_len, &complete); - MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", "**ch3|postrecv %s", "MPIDI_CH3_PKT_GET_RESP"); - if (complete) - { - MPIDI_CH3U_Request_complete(req); - *rreqp = NULL; - } - /* return the number of bytes processed in this function */ - *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); + *rreqp = req; + mpi_errno = MPIDI_CH3U_Receive_data_found(req, data_buf, + &data_len, &complete); + MPIU_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|postrecv", "**ch3|postrecv %s", "MPIDI_CH3_PKT_GET_RESP"); + if (complete) + { + MPIDI_CH3U_Request_complete(req); + *rreqp = NULL; } + /* return the number of bytes processed in this function */ + *buflen = data_len + sizeof(MPIDI_CH3_Pkt_t); + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3_PKTHANDLER_GETRESP); return mpi_errno; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_rma_sync.c | 287 +++++++++++++++---------------------- test/mpi/rma/rmazero.c | 20 +++- 2 files changed, 135 insertions(+), 172 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-26-gb9531d3
by noreply＠mpich.org 15 Nov '13

15 Nov '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 b9531d3de2cdd2f186dfdb0774db94fe0ebc7b7c (commit) from 676c29f9576f8879cc6b8a2cb4baeac3f6ed4fc2 (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/b9531d3de2cdd2f186dfdb0774db94fe0… commit b9531d3de2cdd2f186dfdb0774db94fe0ebc7b7c Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Fri Nov 15 14:33:53 2013 -0600 Revert Fixed --enabled-debuginfo segfaults tt#1932 This reverts commit 676c29f9576f8879cc6b8a2cb4baeac3f6ed4fc2. diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 022c1c6..96e1f9b 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -451,8 +451,6 @@ int MPIR_Alltoall_intra( MPIU_CHKLMEM_MALLOC(starray, MPI_Status *, 2*bblock*sizeof(MPI_Status), mpi_errno, "starray"); for (ii=0; ii<comm_size; ii+=bblock) { - int reqidx; - ss = comm_size-ii < bblock ? comm_size-ii : bblock; /* do the communication -- post ss sends and receives: */ for ( i=0; i<ss; i++ ) { @@ -465,23 +463,14 @@ int MPIR_Alltoall_intra( if (mpi_errno) MPIU_ERR_POP(mpi_errno); } - reqidx = ss; for ( i=0; i<ss; i++ ) { dst = (rank-i-ii+comm_size) % comm_size; mpi_errno = MPIC_Isend((char *)sendbuf + dst*sendcount*sendtype_extent, sendcount, sendtype, dst, MPIR_ALLTOALL_TAG, comm, - &reqarray[reqidx], errflag); + &reqarray[i+ss], errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqarray[reqidx], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALL_TAG, comm_ptr->context_id); - } -#endif - ++reqidx; } /* ... then wait for them to finish: */ diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 100536c..359cd41 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -183,13 +183,6 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int * MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); } -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqarray[req_cnt], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALLV_TAG, comm_ptr->context_id); - } -#endif req_cnt++; } } diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index 14dacd1..f0e4565 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -158,13 +158,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int MPIR_ALLTOALLW_TAG, comm, &reqarray[outstanding_requests], errflag); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqarray[outstanding_requests], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALLW_TAG, comm_ptr->context_id); - } -#endif + outstanding_requests++; } } diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index acb9ca7..ed1006a 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -101,16 +101,8 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, else { mpi_errno = MPIC_Isend(((char *)sendbuf+displs[i]*extent), sendcounts[i], sendtype, i, - MPIR_SCATTERV_TAG, comm, &reqarray[reqs], errflag); + MPIR_SCATTERV_TAG, comm, &reqarray[reqs++], errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqarray[reqs], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_SCATTERV_TAG, comm_ptr->context_id); - } -#endif - ++reqs; } } } diff --git a/src/mpi/pt2pt/bsend.c b/src/mpi/pt2pt/bsend.c index 4e83d7a..f432a2e 100644 --- a/src/mpi/pt2pt/bsend.c +++ b/src/mpi/pt2pt/bsend.c @@ -165,7 +165,6 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Note that we can ignore the request_ptr because it is handled internally by the bsend util routines */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; - MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* ... end of body of routine ... */ diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index 9bced9a..3c92016 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -105,7 +105,6 @@ int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest mpi_errno = MPIR_Bsend_isend( buf, count, datatype, dest, tag, comm_ptr, IBSEND, &request_ptr ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* FIXME: use the memory management macros */ ibinfo = (ibsend_req_info *)MPIU_Malloc( sizeof(ibsend_req_info) ); diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 4547fce..76e13ba 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -271,29 +271,13 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], for (i = 0; i < comm_size; ++i) { if (rin_sizes[i]) { /* send edges where i is a destination to process i */ - mpi_errno = MPIC_Isend(&rin[i][0], rin_sizes[i], MPI_INT, i, MPIR_TOPO_A_TAG, comm_old, &reqs[idx], &errflag); + mpi_errno = MPIC_Isend(&rin[i][0], rin_sizes[i], MPI_INT, i, MPIR_TOPO_A_TAG, comm_old, &reqs[idx++], &errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqs[idx], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_TOPO_A_TAG, comm_ptr->context_id); - } -#endif - ++idx; } if (rout_sizes[i]) { /* send edges where i is a source to process i */ - mpi_errno = MPIC_Isend(&rout[i][0], rout_sizes[i], MPI_INT, i, MPIR_TOPO_B_TAG, comm_old, &reqs[idx], &errflag); + mpi_errno = MPIC_Isend(&rout[i][0], rout_sizes[i], MPI_INT, i, MPIR_TOPO_B_TAG, comm_old, &reqs[idx++], &errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); -#ifdef HAVE_DEBUGGER_SUPPORT - { - MPID_Request *request_ptr; - MPID_Request_get_ptr(reqs[idx], request_ptr); - MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_TOPO_B_TAG, comm_ptr->context_id); - } -#endif - ++idx; } } MPIU_Assert(idx <= (2 * comm_size)); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 89f0416..7a2553a 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1388,7 +1388,6 @@ int MPIDI_Win_post(MPID_Group *post_grp_ptr, int assert, MPID_Win *win_ptr) mpi_errno = MPID_Isend(&i, 0, MPI_INT, dst, SYNC_POST_TAG, win_comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &req_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - MPIR_SENDQ_REMEMBER(req_ptr, dst, SYNC_POST_TAG, win_comm_ptr->context_id); req[i] = req_ptr->handle; } else { req[i] = MPI_REQUEST_NULL; ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/alltoall.c | 13 +------------ src/mpi/coll/alltoallv.c | 7 ------- src/mpi/coll/alltoallw.c | 8 +------- src/mpi/coll/scatterv.c | 10 +--------- src/mpi/pt2pt/bsend.c | 1 - src/mpi/pt2pt/ibsend.c | 1 - src/mpi/topo/dist_gr_create.c | 20 ++------------------ src/mpid/ch3/src/ch3u_rma_sync.c | 1 - 8 files changed, 5 insertions(+), 56 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1rc1-25-g676c29f
by noreply＠mpich.org 15 Nov '13

15 Nov '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 676c29f9576f8879cc6b8a2cb4baeac3f6ed4fc2 (commit) from 0b126663cc56320edc34d1cd9a6d50bc765a600c (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/676c29f9576f8879cc6b8a2cb4baeac3f… commit 676c29f9576f8879cc6b8a2cb4baeac3f6ed4fc2 Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Mon Nov 4 18:01:30 2013 -0600 Fixed --enabled-debuginfo segfaults tt #1932 Addresses #1932. Includes: - MPI_Bsend/MPI_Ibsend - Several collectives - Some RMA operations - MPI_Dist_graph_create Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 96e1f9b..022c1c6 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -451,6 +451,8 @@ int MPIR_Alltoall_intra( MPIU_CHKLMEM_MALLOC(starray, MPI_Status *, 2*bblock*sizeof(MPI_Status), mpi_errno, "starray"); for (ii=0; ii<comm_size; ii+=bblock) { + int reqidx; + ss = comm_size-ii < bblock ? comm_size-ii : bblock; /* do the communication -- post ss sends and receives: */ for ( i=0; i<ss; i++ ) { @@ -463,14 +465,23 @@ int MPIR_Alltoall_intra( if (mpi_errno) MPIU_ERR_POP(mpi_errno); } + reqidx = ss; for ( i=0; i<ss; i++ ) { dst = (rank-i-ii+comm_size) % comm_size; mpi_errno = MPIC_Isend((char *)sendbuf + dst*sendcount*sendtype_extent, sendcount, sendtype, dst, MPIR_ALLTOALL_TAG, comm, - &reqarray[i+ss], errflag); + &reqarray[reqidx], errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqarray[reqidx], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALL_TAG, comm_ptr->context_id); + } +#endif + ++reqidx; } /* ... then wait for them to finish: */ diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 359cd41..100536c 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -183,6 +183,13 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int * MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); MPIU_ERR_ADD(mpi_errno_ret, mpi_errno); } +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqarray[req_cnt], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALLV_TAG, comm_ptr->context_id); + } +#endif req_cnt++; } } diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index f0e4565..14dacd1 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -158,7 +158,13 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int MPIR_ALLTOALLW_TAG, comm, &reqarray[outstanding_requests], errflag); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } - +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqarray[outstanding_requests], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, dst, MPIR_ALLTOALLW_TAG, comm_ptr->context_id); + } +#endif outstanding_requests++; } } diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index ed1006a..acb9ca7 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -101,8 +101,16 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, else { mpi_errno = MPIC_Isend(((char *)sendbuf+displs[i]*extent), sendcounts[i], sendtype, i, - MPIR_SCATTERV_TAG, comm, &reqarray[reqs++], errflag); + MPIR_SCATTERV_TAG, comm, &reqarray[reqs], errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqarray[reqs], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_SCATTERV_TAG, comm_ptr->context_id); + } +#endif + ++reqs; } } } diff --git a/src/mpi/pt2pt/bsend.c b/src/mpi/pt2pt/bsend.c index f432a2e..4e83d7a 100644 --- a/src/mpi/pt2pt/bsend.c +++ b/src/mpi/pt2pt/bsend.c @@ -165,6 +165,7 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Note that we can ignore the request_ptr because it is handled internally by the bsend util routines */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* ... end of body of routine ... */ diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index 3c92016..9bced9a 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -105,6 +105,7 @@ int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest mpi_errno = MPIR_Bsend_isend( buf, count, datatype, dest, tag, comm_ptr, IBSEND, &request_ptr ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; + MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); /* FIXME: use the memory management macros */ ibinfo = (ibsend_req_info *)MPIU_Malloc( sizeof(ibsend_req_info) ); diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 76e13ba..4547fce 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -271,13 +271,29 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], for (i = 0; i < comm_size; ++i) { if (rin_sizes[i]) { /* send edges where i is a destination to process i */ - mpi_errno = MPIC_Isend(&rin[i][0], rin_sizes[i], MPI_INT, i, MPIR_TOPO_A_TAG, comm_old, &reqs[idx++], &errflag); + mpi_errno = MPIC_Isend(&rin[i][0], rin_sizes[i], MPI_INT, i, MPIR_TOPO_A_TAG, comm_old, &reqs[idx], &errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqs[idx], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_TOPO_A_TAG, comm_ptr->context_id); + } +#endif + ++idx; } if (rout_sizes[i]) { /* send edges where i is a source to process i */ - mpi_errno = MPIC_Isend(&rout[i][0], rout_sizes[i], MPI_INT, i, MPIR_TOPO_B_TAG, comm_old, &reqs[idx++], &errflag); + mpi_errno = MPIC_Isend(&rout[i][0], rout_sizes[i], MPI_INT, i, MPIR_TOPO_B_TAG, comm_old, &reqs[idx], &errflag); if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#ifdef HAVE_DEBUGGER_SUPPORT + { + MPID_Request *request_ptr; + MPID_Request_get_ptr(reqs[idx], request_ptr); + MPIR_SENDQ_REMEMBER(request_ptr, i, MPIR_TOPO_B_TAG, comm_ptr->context_id); + } +#endif + ++idx; } } MPIU_Assert(idx <= (2 * comm_size)); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 7a2553a..89f0416 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1388,6 +1388,7 @@ int MPIDI_Win_post(MPID_Group *post_grp_ptr, int assert, MPID_Win *win_ptr) mpi_errno = MPID_Isend(&i, 0, MPI_INT, dst, SYNC_POST_TAG, win_comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &req_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); + MPIR_SENDQ_REMEMBER(req_ptr, dst, SYNC_POST_TAG, win_comm_ptr->context_id); req[i] = req_ptr->handle; } else { req[i] = MPI_REQUEST_NULL; ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/alltoall.c | 13 ++++++++++++- src/mpi/coll/alltoallv.c | 7 +++++++ src/mpi/coll/alltoallw.c | 8 +++++++- src/mpi/coll/scatterv.c | 10 +++++++++- src/mpi/pt2pt/bsend.c | 1 + src/mpi/pt2pt/ibsend.c | 1 + src/mpi/topo/dist_gr_create.c | 20 ++++++++++++++++++-- src/mpid/ch3/src/ch3u_rma_sync.c | 1 + 8 files changed, 56 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0