December 2015 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2-22-gb20e825
by noreply＠mpich.org 11 Dec '15

11 Dec '15

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 b20e8255c86502b5baf4881c8bddde16f8a2011c (commit) from 92ec188ec6af7b875e29370e1d76b1199877cd95 (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/b20e8255c86502b5baf4881c8bddde16f… commit b20e8255c86502b5baf4881c8bddde16f8a2011c Author: Charles J Archer <charles.j.archer(a)intel.com> Date: Mon Nov 9 16:32:30 2015 -0800 test/mpi/rma: use lower bound for window calculations * Several tests are failing when the window bounds are checked. The RMA's on datatypes with lower bounds may write past the end of the window. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/rma/accfence1.c b/test/mpi/rma/accfence1.c index 1b1a40b..f4b8930 100644 --- a/test/mpi/rma/accfence1.c +++ b/test/mpi/rma/accfence1.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) int minsize = 2, count; MPI_Comm comm; MPI_Win win; - MPI_Aint extent; + MPI_Aint extent, lb; MTestDatatype sendtype, recvtype; MTest_Init(&argc, &argv); @@ -43,7 +43,8 @@ int main(int argc, char *argv[]) recvtype.InitBuf(&recvtype); MPI_Type_extent(recvtype.datatype, &extent); - MPI_Win_create(recvtype.buf, recvtype.count * extent, + MPI_Type_lb(recvtype.datatype, &lb); + MPI_Win_create(recvtype.buf, recvtype.count * extent + lb, (int) extent, MPI_INFO_NULL, comm, &win); MPI_Win_fence(0, win); if (rank == source) { diff --git a/test/mpi/rma/accpscw1.c b/test/mpi/rma/accpscw1.c index de6e4fa..67ab3b4 100644 --- a/test/mpi/rma/accpscw1.c +++ b/test/mpi/rma/accpscw1.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) int minsize = 2, count; MPI_Comm comm; MPI_Win win; - MPI_Aint extent; + MPI_Aint extent, lb; MPI_Group wingroup, neighbors; MTestDatatype sendtype, recvtype; @@ -44,7 +44,8 @@ int main(int argc, char *argv[]) recvtype.InitBuf(&recvtype); MPI_Type_extent(recvtype.datatype, &extent); - MPI_Win_create(recvtype.buf, recvtype.count * extent, + MPI_Type_lb(recvtype.datatype, &lb); + MPI_Win_create(recvtype.buf, recvtype.count * extent + lb, (int) extent, MPI_INFO_NULL, comm, &win); MPI_Win_get_group(win, &wingroup); if (rank == source) { diff --git a/test/mpi/rma/epochtest.c b/test/mpi/rma/epochtest.c index 69cfdcb..bd07732 100644 --- a/test/mpi/rma/epochtest.c +++ b/test/mpi/rma/epochtest.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) int minsize = 2, count; MPI_Comm comm; MPI_Win win; - MPI_Aint extent; + MPI_Aint extent,lb; MTestDatatype sendtype, recvtype; int onlyInt = 0; @@ -71,7 +71,8 @@ int main(int argc, char **argv) recvtype.InitBuf(&recvtype); MPI_Type_extent(recvtype.datatype, &extent); - MPI_Win_create(recvtype.buf, recvtype.count * extent, + MPI_Type_lb(recvtype.datatype, &lb); + MPI_Win_create(recvtype.buf, recvtype.count * extent + lb, extent, MPI_INFO_NULL, comm, &win); /* To improve reporting of problems about operations, we * change the error handler to errors return */ diff --git a/test/mpi/rma/getfence1.c b/test/mpi/rma/getfence1.c index 342ba67..d8aa9d9 100644 --- a/test/mpi/rma/getfence1.c +++ b/test/mpi/rma/getfence1.c @@ -22,7 +22,7 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest, { int errs = 0, err; int disp_unit; - MPI_Aint extent; + MPI_Aint extent, lb; MPI_Win win; MTestPrintfMsg(1, @@ -37,8 +37,9 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest, sendtype->printErrors = 1; MPI_Type_extent(sendtype->datatype, &extent); + MPI_Type_lb(sendtype->datatype, &lb); disp_unit = extent < INT_MAX ? extent : 1; - MPI_Win_create(sendtype->buf, sendtype->count * extent, disp_unit, MPI_INFO_NULL, comm, &win); + MPI_Win_create(sendtype->buf, sendtype->count * extent + lb, disp_unit, MPI_INFO_NULL, comm, &win); MPI_Win_fence(0, win); if (rank == source) { /* The source does not need to do anything besides the diff --git a/test/mpi/rma/putfence1.c b/test/mpi/rma/putfence1.c index 103ce77..3670265 100644 --- a/test/mpi/rma/putfence1.c +++ b/test/mpi/rma/putfence1.c @@ -21,7 +21,7 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest, MTestDatatype * sendtype, MTestDatatype * recvtype) { int errs = 0, err; - MPI_Aint extent; + MPI_Aint extent, lb; MPI_Win win; MTestPrintfMsg(1, @@ -32,7 +32,8 @@ static inline int test(MPI_Comm comm, int rank, int source, int dest, /* Make sure that everyone has a recv buffer */ recvtype->InitBuf(recvtype); MPI_Type_extent(recvtype->datatype, &extent); - MPI_Win_create(recvtype->buf, recvtype->count * extent, extent, MPI_INFO_NULL, comm, &win); + MPI_Type_lb(recvtype->datatype, &lb); + MPI_Win_create(recvtype->buf, recvtype->count * extent + lb, extent, MPI_INFO_NULL, comm, &win); MPI_Win_fence(0, win); if (rank == source) { /* To improve reporting of problems about operations, we diff --git a/test/mpi/rma/putpscw1.c b/test/mpi/rma/putpscw1.c index b642695..d46c8f9 100644 --- a/test/mpi/rma/putpscw1.c +++ b/test/mpi/rma/putpscw1.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) int minsize = 2, count; MPI_Comm comm; MPI_Win win; - MPI_Aint extent; + MPI_Aint extent, lb; MPI_Group wingroup, neighbors; MTestDatatype sendtype, recvtype; @@ -44,7 +44,8 @@ int main(int argc, char *argv[]) recvtype.InitBuf(&recvtype); MPI_Type_extent(recvtype.datatype, &extent); - MPI_Win_create(recvtype.buf, recvtype.count * extent, + MPI_Type_lb(recvtype.datatype, &lb); + MPI_Win_create(recvtype.buf, recvtype.count * extent + lb, (int) extent, MPI_INFO_NULL, comm, &win); MPI_Win_get_group(win, &wingroup); if (rank == source) { ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/accfence1.c | 5 +++-- test/mpi/rma/accpscw1.c | 5 +++-- test/mpi/rma/epochtest.c | 5 +++-- test/mpi/rma/getfence1.c | 5 +++-- test/mpi/rma/putfence1.c | 5 +++-- test/mpi/rma/putpscw1.c | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-21-g92ec188
by noreply＠mpich.org 10 Dec '15

10 Dec '15

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 92ec188ec6af7b875e29370e1d76b1199877cd95 (commit) from 2bd0630d5d7f5a6837e1b6ee64d6254070c85e53 (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/92ec188ec6af7b875e29370e1d76b1199… commit 92ec188ec6af7b875e29370e1d76b1199877cd95 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Dec 10 15:59:30 2015 -0600 typo: MPICH2 -> MPICH No reviewer. diff --git a/configure.ac b/configure.ac index 9ac2e21..f5da513 100644 --- a/configure.ac +++ b/configure.ac @@ -1159,7 +1159,7 @@ AC_ARG_WITH([mpl-prefix], [use the MPL library installed in DIR, rather than the one included in src/mpl. Pass "embedded" to force usage of the MPL source - distributed with MPICH2.])], + distributed with MPICH.])], [],dnl action-if-given [with_mpl_prefix=embedded]) dnl action-if-not-given mplsrcdir="" ----------------------------------------------------------------------- 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.2-20-g2bd0630
by noreply＠mpich.org 10 Dec '15

10 Dec '15

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 2bd0630d5d7f5a6837e1b6ee64d6254070c85e53 (commit) from da5a5bba60896c202e8a0ae2e331738654ae2c42 (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/2bd0630d5d7f5a6837e1b6ee64d625407… commit 2bd0630d5d7f5a6837e1b6ee64d6254070c85e53 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Wed Dec 9 17:01:26 2015 -0600 when promoting type, also promote format string a fixup to commit 40123bec2c27 : when I promoted incount, also needed to promote MPL_printf string to match. fixes CID 120440 No Reviewer diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c index e669b22..dc96a4d 100644 --- a/src/mpid/common/sched/mpid_sched.c +++ b/src/mpid/common/sched/mpid_sched.c @@ -734,8 +734,10 @@ int MPID_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, MPID_Datatype_get_size_macro(intype, intype_size); MPID_Datatype_get_size_macro(outtype, outtype_size); if (incount * intype_size > outcount * outtype_size) { - MPL_error_printf("truncation: intype=%#x, intype_size=%lld, incount=%d, outtype=%#x, outtype_size=%lld outcount=%d\n", - intype, (long long)intype_size, incount, outtype, (long long)outtype_size, outcount); + MPL_error_printf("truncation: intype=%#x, intype_size=%lld, incount=%lld, outtype=%#x, outtype_size=%lld outcount=%d\n", + intype, (long long)intype_size, + (long long)incount, outtype, + (long long)outtype_size, outcount); } } #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/common/sched/mpid_sched.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-19-gda5a5bb
by noreply＠mpich.org 08 Dec '15

08 Dec '15

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 da5a5bba60896c202e8a0ae2e331738654ae2c42 (commit) via 0681d6976055185960b0ceee91f2554c3355c97e (commit) from b7b118dab7cd8c7d21a5fb8e16f9dfdcee29c2a6 (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/da5a5bba60896c202e8a0ae2e33173865… commit da5a5bba60896c202e8a0ae2e331738654ae2c42 Author: Lena Oden <loden(a)anl.gov> Date: Sun Sep 20 21:08:15 2015 -0500 mpi/coll/ibcast: handle mismatched length Instead of a regular receive, we now use a "receive with status" call internally in MPI_Ibcast. After receiving, a function is scheduled which uses the status to determine the actual received bytes and compare them to the expected data. Fixes #2300 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 819bb93..a4223e3 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -20,6 +20,65 @@ int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Com #endif /* -- End Profiling Symbol Block */ +struct MPIR_Ibcast_status{ + int curr_bytes; + int n_bytes; + MPI_Status status; +}; +/* Add some functions for asynchronous error detection */ + +#undef FUNCNAME +#define FUNCNAME sched_test_length +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) + +static sched_test_length(MPID_Comm * comm, int tag, void *state) +{ + int mpi_errno = MPI_SUCCESS; + int recv_size; + struct MPIR_Ibcast_status *status = (struct MPIR_Ibcast_status*) state; + MPIR_Get_count_impl(&status->status, MPI_BYTE, &recv_size); + if(status->n_bytes != recv_size || status->status.MPI_ERROR != MPI_SUCCESS) { + mpi_errno = MPIR_Err_create_code( mpi_errno, MPIR_ERR_RECOVERABLE, + FCNAME, __LINE__, MPI_ERR_OTHER, + "**collective_size_mismatch", + "**collective_size_mismatch %d %d", status->n_bytes, recv_size); + } + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME sched_test_curr_length +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) + +static sched_test_curr_length(MPID_Comm * comm, int tag, void *state) +{ + int mpi_errno = MPI_SUCCESS; + struct MPIR_Ibcast_status *status = (struct MPIR_Ibcast_status*) state; + if(status->n_bytes != status->curr_bytes) { + mpi_errno = MPIR_Err_create_code( mpi_errno, MPIR_ERR_RECOVERABLE, + FCNAME, __LINE__, MPI_ERR_OTHER, + "**collective_size_mismatch", + "**collective_size_mismatch %d %d", status->n_bytes, status->curr_bytes); + } + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME sched_add_length +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) + +static sched_add_length(MPID_Comm * comm, int tag, void *state) +{ + int mpi_errno = MPI_SUCCESS; + int recv_size; + struct MPIR_Ibcast_status *status = (struct MPIR_Ibcast_status*) state; + MPIR_Get_count_impl(&status->status, MPI_BYTE, &recv_size); + status->curr_bytes+= recv_size; + return mpi_errno; +} /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifndef MPICH_MPI_FROM_PMPI @@ -47,8 +106,9 @@ int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int roo MPI_Aint nbytes, type_size; int relative_rank; int src, dst; + struct MPIR_Ibcast_status *status; void *tmp_buf = NULL; - MPIR_SCHED_CHKPMEM_DECL(1); + MPIR_SCHED_CHKPMEM_DECL(2); comm_size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -65,6 +125,9 @@ int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int roo if (comm_ptr->is_hetero) is_homogeneous = 0; #endif + MPIR_SCHED_CHKPMEM_MALLOC(status, struct MPIR_Ibcast_status *, + sizeof(struct MPIR_Ibcast_status), mpi_errno, "MPI_Stauts"); + /* MPI_Type_size() might not give the accurate size of the packed * datatype for heterogeneous systems (because of padding, encoding, @@ -80,6 +143,8 @@ int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int roo nbytes = type_size * count; + status->n_bytes = nbytes; + if (!is_contig || !is_homogeneous) { MPIR_SCHED_CHKPMEM_MALLOC(tmp_buf, void *, nbytes, mpi_errno, "tmp_buf"); @@ -125,13 +190,19 @@ int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int roo src = rank - mask; if (src < 0) src += comm_size; if (!is_contig || !is_homogeneous) - mpi_errno = MPID_Sched_recv(tmp_buf, nbytes, MPI_BYTE, src, comm_ptr, s); + mpi_errno = MPID_Sched_recv_status(tmp_buf, nbytes, MPI_BYTE, src, + comm_ptr, &status->status, s); else - mpi_errno = MPID_Sched_recv(buffer, count, datatype, src, comm_ptr, s); + mpi_errno = MPID_Sched_recv_status(buffer, count, datatype, src, + comm_ptr, &status->status, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_SCHED_BARRIER(s); - + if(is_homogeneous){ + mpi_errno = MPID_Sched_cb(&sched_test_length, status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + MPID_SCHED_BARRIER(s); + } break; } mask <<= 1; @@ -326,7 +397,8 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype MPID_Datatype *dtp; MPI_Aint true_extent, true_lb; void *tmp_buf; - MPIR_SCHED_CHKPMEM_DECL(1); + struct MPIR_Ibcast_status *status; + MPIR_SCHED_CHKPMEM_DECL(2); comm_size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -344,6 +416,8 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype is_contig = dtp->is_contig; } + MPIR_SCHED_CHKPMEM_MALLOC(status, struct MPIR_Ibcast_status*, + sizeof(struct MPIR_Ibcast_status), mpi_errno, "MPI_Status"); is_homogeneous = 1; #ifdef MPID_HAS_HETERO if (comm_ptr->is_hetero) @@ -354,7 +428,8 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype MPID_Datatype_get_size_macro(datatype, type_size); nbytes = type_size * count; - + status->n_bytes = nbytes; + status->curr_bytes = 0; if (is_contig) { /* contiguous and homogeneous. no need to pack. */ MPIR_Type_get_true_extent_impl(datatype, &true_lb, &true_extent); @@ -423,9 +498,12 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype curr_size, MPI_BYTE, dst, comm_ptr, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* sendrecv, no barrier */ - mpi_errno = MPID_Sched_recv(((char *)tmp_buf + recv_offset), + mpi_errno = MPID_Sched_recv_status(((char *)tmp_buf + recv_offset), incoming_count, - MPI_BYTE, dst, comm_ptr, s); + MPI_BYTE, dst, comm_ptr,&status->status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + MPID_SCHED_BARRIER(s); + mpi_errno = MPID_Sched_cb(&sched_add_length, status, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_SCHED_BARRIER(s); @@ -502,8 +580,12 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype /* nprocs_completed is also equal to the no. of processes whose data we don't have */ - mpi_errno = MPID_Sched_recv(((char *)tmp_buf + offset), - incoming_count, MPI_BYTE, dst, comm_ptr, s); + mpi_errno = MPID_Sched_recv_status(((char *)tmp_buf + offset), + incoming_count, MPI_BYTE, dst, comm_ptr, + &status->status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + MPID_SCHED_BARRIER(s); + mpi_errno = MPID_Sched_cb(&sched_add_length, status, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_SCHED_BARRIER(s); @@ -518,7 +600,10 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype mask <<= 1; i++; } - + if(is_homogeneous){ + mpi_errno = MPID_Sched_cb(&sched_test_curr_length, status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + } if (!is_contig) { if (rank != root) { mpi_errno = MPID_Sched_copy(tmp_buf, nbytes, MPI_BYTE, @@ -565,7 +650,9 @@ int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype dat MPI_Aint true_extent, true_lb; void *tmp_buf = NULL; MPID_Datatype *dtp = NULL; - MPIR_SCHED_CHKPMEM_DECL(3); + + struct MPIR_Ibcast_status *status; + MPIR_SCHED_CHKPMEM_DECL(4); comm_size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -587,10 +674,12 @@ int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype dat is_homogeneous = 0; #endif MPIU_Assert(is_homogeneous); /* we don't handle the hetero case yet */ - + MPIR_SCHED_CHKPMEM_MALLOC(status, struct MPIR_Ibcast_status*, + sizeof(struct MPIR_Ibcast_status), mpi_errno, "MPI_Status"); MPID_Datatype_get_size_macro(datatype, type_size); nbytes = type_size * count; - + status->n_bytes = nbytes; + status->curr_bytes = 0; if (is_contig) { /* contiguous, no need to pack. */ MPIR_Type_get_true_extent_impl(datatype, &true_lb, &true_extent); @@ -639,14 +728,19 @@ int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype dat right_count, MPI_BYTE, right, comm_ptr, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* sendrecv, no barrier here */ - mpi_errno = MPID_Sched_recv(((char *)tmp_buf + left_disp), - left_count, MPI_BYTE, left, comm_ptr, s); + mpi_errno = MPID_Sched_recv_status(((char *)tmp_buf + left_disp), + left_count, MPI_BYTE, left, comm_ptr, &status->status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + MPID_SCHED_BARRIER(s); + mpi_errno = MPID_Sched_cb(&sched_add_length, status, s); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_SCHED_BARRIER(s); j = jnext; jnext = (comm_size + jnext - 1) % comm_size; } + mpi_errno = MPID_Sched_cb(&sched_test_curr_length, status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (!is_contig && rank != root) { mpi_errno = MPID_Sched_copy(tmp_buf, nbytes, MPI_BYTE, buffer, count, datatype, s); @@ -674,10 +768,14 @@ int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MP int mpi_errno = MPI_SUCCESS; int is_homogeneous; MPI_Aint type_size; + struct MPIR_Ibcast_status *status; + MPIR_SCHED_CHKPMEM_DECL(1); if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_BCAST) MPID_Abort(comm_ptr, MPI_ERR_OTHER, 1, "SMP collectives are disabled!"); MPIU_Assert(MPIR_Comm_is_node_aware(comm_ptr)); + MPIR_SCHED_CHKPMEM_MALLOC(status, struct MPIR_Ibcast_status*, + sizeof(struct MPIR_Ibcast_status), mpi_errno, "MPI_Status"); is_homogeneous = 1; #ifdef MPID_HAS_HETERO @@ -707,6 +805,7 @@ int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MP else MPIR_Pack_size_impl(1, datatype, &type_size); + status->n_bytes = type_size * count; /* TODO insert packing here */ /* send to intranode-rank 0 on the root's node */ @@ -717,11 +816,15 @@ int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MP mpi_errno = MPID_Sched_send(buffer, count, datatype, 0, comm_ptr->node_comm, s); } else if (0 == comm_ptr->node_comm->rank) { - mpi_errno = MPID_Sched_recv(buffer, count, datatype, MPIU_Get_intranode_rank(comm_ptr, root), - comm_ptr->node_comm, s); + mpi_errno = MPID_Sched_recv_status(buffer, count, datatype, MPIU_Get_intranode_rank(comm_ptr, root), + comm_ptr->node_comm, &status->status, s); } if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_SCHED_BARRIER(s); + MPID_SCHED_BARRIER(s); + mpi_errno = MPID_Sched_cb(&sched_test_length, status, s); + if (mpi_errno) MPIR_ERR_POP(mpi_errno); + MPID_SCHED_BARRIER(s); } /* perform the internode broadcast */ @@ -742,10 +845,11 @@ int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MP if (mpi_errno) MPIR_ERR_POP(mpi_errno); } + MPIR_SCHED_CHKPMEM_COMMIT(s); fn_exit: return mpi_errno; fn_fail: - goto fn_exit; + MPIR_SCHED_CHKPMEM_REAP(s); } http://git.mpich.org/mpich.git/commitdiff/0681d6976055185960b0ceee91f2554c3… commit 0681d6976055185960b0ceee91f2554c3355c97e Author: Lena Oden <loden(a)anl.gov> Date: Mon Sep 21 17:58:20 2015 -0500 mpid/common: fix scheduling of non-blocking recvs This patches fixes the handling of irecv calls which are added to a scheduler. The following things are fixed: 1.) If the MPIC_Irecv call fails, we still have to wait for the completion of the request, otherwise there will be a memory leak. 2.) If receive with status is used, the "received bytes count" must be set. This count is used by some non-blocking collectives (e.g. iallreduce). 3.) If "irecv with status" is used, now the MPI_ERROR field is set. This was not done by the previously used MPIR_Request_extract_status. Refs #2300 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c index 6f873d8..e669b22 100644 --- a/src/mpid/common/sched/mpid_sched.c +++ b/src/mpid/common/sched/mpid_sched.c @@ -183,8 +183,10 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI r->errflag = MPIR_ERR_OTHER; } } - e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; - MPIU_DBG_MSG_D(COMM, VERBOSE, "Sched SEND failed. Errflag: %d\n", (int) r->errflag); + /* We should set the status to failed here - since the request is not freed. this + * will be handled later in MPIDU_Sched_progress_state, so set to started here */ + e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; + MPIU_DBG_MSG_D(COMM, VERBOSE, "Sched RECV failed. Errflag: %d\n", (int) r->errflag); } else { e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; } @@ -231,7 +233,7 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI } e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; } else { - e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; + e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; } } else if (e->u.cb.cb_type == MPIDU_SCHED_CB_TYPE_2) { @@ -248,13 +250,14 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI } e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; } else { - e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; + e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; } } else { MPIU_DBG_MSG_D(COMM, TYPICAL, "unknown callback type, e->u.cb.cb_type=%d", e->u.cb.cb_type); + e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; } - e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; + break; default: MPIU_DBG_MSG_D(COMM, TYPICAL, "unknown entry type, e->type=%d", e->type); @@ -608,7 +611,7 @@ int MPID_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int e->u.recv.rreq = NULL; /* will be populated by _start_entry */ e->u.recv.comm = comm; e->u.recv.status = status; - + status->MPI_ERROR = MPI_SUCCESS; MPIR_Comm_add_ref(comm); dtype_add_ref_if_not_builtin(datatype); @@ -837,7 +840,6 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made size_t i; struct MPIDU_Sched *s; struct MPIDU_Sched *tmp; - if (made_progress) *made_progress = FALSE; @@ -865,7 +867,12 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made if (e->u.recv.rreq != NULL && MPID_Request_is_complete(e->u.recv.rreq)) { MPIU_DBG_MSG_FMT(COMM, VERBOSE, (MPIU_DBG_FDEST, "completed RECV entry %d, rreq=%p\n", (int) i, e->u.recv.rreq)); MPIR_Process_status(&e->u.recv.rreq->status, &s->req->errflag); - MPIR_Request_extract_status(e->u.recv.rreq, e->u.recv.status); + if (e->u.recv.status != MPI_STATUS_IGNORE) { + int recvd; + e->u.recv.status->MPI_ERROR = e->u.recv.rreq->status.MPI_ERROR; + MPIR_Get_count_impl(&e->u.recv.rreq->status, MPI_BYTE, &recvd); + MPIR_STATUS_SET_COUNT(*(e->u.recv.status), recvd); + } if (s->req->errflag != MPIR_ERR_NONE) e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; else ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/ibcast.c | 142 +++++++++++++++++++++++++++++++----- src/mpid/common/sched/mpid_sched.c | 23 ++++-- 2 files changed, 138 insertions(+), 27 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-17-gb7b118d
by noreply＠mpich.org 08 Dec '15

08 Dec '15

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 b7b118dab7cd8c7d21a5fb8e16f9dfdcee29c2a6 (commit) via 40123bec2c27ed296b4c2c83809acbbee6dc5b53 (commit) from 8e6ce14305048395df675d3f8636f8996c620627 (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/b7b118dab7cd8c7d21a5fb8e16f9dfdce… commit b7b118dab7cd8c7d21a5fb8e16f9dfdcee29c2a6 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Oct 2 13:45:36 2015 -0500 promote type size of intermediate values Ignacio Laguna applied static analysis to gather.c and found this location where the product of two large ints could overflow before being assigned to a 64 bit value. See discussion at http://lists.mpich.org/pipermail/discuss/2015-September/004186.html Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index e6387d3..5cd00f3 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -220,8 +220,8 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, * should cover the case where the root is * rank 0. */ mpi_errno = MPIC_Recv(((char *)recvbuf + - (((rank + mask) % comm_size)*recvcount*extent)), - recvblks * recvcount, recvtype, src, + (((rank + mask) % comm_size)*(MPI_Aint)recvcount*extent)), + (MPI_Aint)recvblks * recvcount, recvtype, src, MPIR_GATHER_TAG, comm_ptr, &status, errflag); if (mpi_errno) { http://git.mpich.org/mpich.git/commitdiff/40123bec2c27ed296b4c2c83809acbbee… commit 40123bec2c27ed296b4c2c83809acbbee6dc5b53 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Oct 2 11:25:59 2015 -0500 type promotions for igather Similar to the fixes done for gather over the summer, the igather path also had many areas where ints could overflow. Promote internal 'count' values on the non-blocking collective path to MPI_Aint. Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index e705e5d..91d6a62 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -3811,11 +3811,11 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, int sendtag, int source, int recvtag, MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); -int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); -int MPIC_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); -int MPIC_Irecv(void *buf, int count, MPI_Datatype datatype, int source, +int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm_ptr, MPID_Request **request); int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag); diff --git a/src/include/mpir_nbc.h b/src/include/mpir_nbc.h index 0e615e9..faca4ef 100644 --- a/src/include/mpir_nbc.h +++ b/src/include/mpir_nbc.h @@ -61,17 +61,17 @@ int MPID_Sched_clone(MPID_Sched_t orig, MPID_Sched_t *cloned); int MPID_Sched_start(MPID_Sched_t *sp, MPID_Comm *comm, int tag, MPID_Request **req); /* send and recv take a comm ptr to enable hierarchical collectives */ -int MPID_Sched_send(const void *buf, int count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); -int MPID_Sched_recv(void *buf, int count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPID_Sched_t s); /* just like MPI_Issend, can't complete until the matching recv is posted */ -int MPID_Sched_ssend(const void *buf, int count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); -int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s); +int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, MPI_Aint count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s); /* packing/unpacking can be accomplished by passing MPI_PACKED as either intype * or outtype */ -int MPID_Sched_copy(const void *inbuf, int incount, MPI_Datatype intype, - void *outbuf, int outcount, MPI_Datatype outtype, MPID_Sched_t s); +int MPID_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, + void *outbuf, MPI_Aint outcount, MPI_Datatype outtype, MPID_Sched_t s); /* require that all previously added ops are complete before subsequent ops * may begin to execute */ int MPID_Sched_barrier(MPID_Sched_t s); @@ -92,11 +92,11 @@ int MPID_Sched_barrier(MPID_Sched_t s); * A corresponding _recv_defer function is not currently provided because there * is no known use case. The recv count is just an upper bound, not an exact * amount to be received, so an oversized recv is used instead of deferral. */ -int MPID_Sched_send_defer(const void *buf, const int *count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_send_defer(const void *buf, const MPI_Aint *count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); /* Just like MPID_Sched_recv except it populates the given status object with * the received count and error information, much like a normal recv. Often * useful in conjunction with MPID_Sched_send_defer. */ -int MPID_Sched_recv_status(void *buf, int count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPI_Status *status, MPID_Sched_t s); +int MPID_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPI_Status *status, MPID_Sched_t s); /* Sched_cb_t funcitons take a comm parameter, the value of which will be the * comm passed to Sched_start */ diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 7b7fb83..6b2fd52 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -618,7 +618,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, #define FUNCNAME MPIC_Isend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -659,7 +659,7 @@ int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int #define FUNCNAME MPIC_Issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIC_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, +int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -700,7 +700,7 @@ int MPIC_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int #define FUNCNAME MPIC_Irecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIC_Irecv(void *buf, int count, MPI_Datatype datatype, int source, +int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPID_Comm *comm_ptr, MPID_Request **request_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index 961e73d..8cb2283 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -58,8 +58,9 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt { int mpi_errno = MPI_SUCCESS; int comm_size, rank; - int curr_cnt=0, relative_rank, nbytes, is_homogeneous; - int mask, sendtype_size, recvtype_size, src, dst, relative_src; + int relative_rank, is_homogeneous; + int mask, src, dst, relative_src; + MPI_Aint recvtype_size, sendtype_size, curr_cnt=0, nbytes; int recvblks; int tmp_buf_size, missing; void *tmp_buf = NULL; @@ -201,7 +202,7 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt } } else { /* Intermediate nodes store in temporary buffer */ - int offset; + MPI_Aint offset; /* Estimate the amount of data that is going to come in */ recvblks = mask; @@ -243,9 +244,16 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt blocks[0] = sendcount; struct_displs[0] = MPIU_VOID_PTR_CAST_TO_MPI_AINT sendbuf; types[0] = sendtype; - blocks[1] = curr_cnt - nbytes; + /* check for overflow. work around int limits if needed*/ + if (curr_cnt - nbytes != (int)(curr_cnt-nbytes)) { + blocks[1] = 1; + MPIR_Type_contiguous_x_impl(curr_cnt - nbytes, + MPI_BYTE, &(types[1])); + } else { + MPIU_Assign_trunc(blocks[1], curr_cnt - nbytes, int); + types[1] = MPI_BYTE; + } struct_displs[1] = MPIU_VOID_PTR_CAST_TO_MPI_AINT tmp_buf; - types[1] = MPI_BYTE; mpi_errno = MPIR_Type_create_struct_impl(2, blocks, struct_displs, types, &tmp_type); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -400,8 +408,10 @@ fn_fail: int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; - int rank, local_size, remote_size; - int i, nbytes, sendtype_size, recvtype_size; + int rank; + MPI_Aint local_size, remote_size; + int i; + MPI_Aint recvtype_size, sendtype_size, nbytes; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf = NULL; MPID_Comm *newcomm_ptr = NULL; @@ -661,7 +671,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* catch common aliasing cases */ if (recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { - int recvtype_size; + MPI_Aint recvtype_size; MPID_Datatype_get_size_macro(recvtype, recvtype_size); MPIR_ERRTEST_ALIAS_COLL(sendbuf, (char*)recvbuf + comm_ptr->rank*recvcount*recvtype_size, mpi_errno); } diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c index e3d7a76..6f873d8 100644 --- a/src/mpid/common/sched/mpid_sched.c +++ b/src/mpid/common/sched/mpid_sched.c @@ -476,7 +476,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* do these ops need an entry handle returned? */ -int MPID_Sched_send(const void *buf, int count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) +int MPID_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -514,7 +514,7 @@ fn_fail: #define FUNCNAME MPID_Sched_ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Sched_ssend(const void *buf, int count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) +int MPID_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -552,7 +552,7 @@ fn_fail: #define FUNCNAME MPID_Sched_send_defer #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Sched_send_defer(const void *buf, const int *count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) +int MPID_Sched_send_defer(const void *buf, const MPI_Aint *count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -589,7 +589,7 @@ fn_fail: #define FUNCNAME MPID_Sched_recv_status #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Sched_recv_status(void *buf, int count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPI_Status *status, MPID_Sched_t s) +int MPID_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPI_Status *status, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -622,7 +622,7 @@ fn_fail: #define FUNCNAME MPID_Sched_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Sched_recv(void *buf, int count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPID_Sched_t s) +int MPID_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -655,7 +655,7 @@ fn_fail: #define FUNCNAME MPID_Sched_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s) +int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, MPI_Aint count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -699,8 +699,8 @@ fn_fail: * * Packing/unpacking can be accomplished by passing MPI_PACKED as either intype * or outtype. */ -int MPID_Sched_copy(const void *inbuf, int incount, MPI_Datatype intype, - void *outbuf, int outcount, MPI_Datatype outtype, MPID_Sched_t s) +int MPID_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, + void *outbuf, MPI_Aint outcount, MPI_Datatype outtype, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; diff --git a/src/mpid/common/sched/mpid_sched.h b/src/mpid/common/sched/mpid_sched.h index ef040e6..296f304 100644 --- a/src/mpid/common/sched/mpid_sched.h +++ b/src/mpid/common/sched/mpid_sched.h @@ -30,8 +30,8 @@ enum MPIDU_Sched_entry_type { struct MPIDU_Sched_send { const void *buf; - int count; - const int *count_p; + MPI_Aint count; + const MPI_Aint *count_p; MPI_Datatype datatype; int dest; MPID_Comm *comm; @@ -41,7 +41,7 @@ struct MPIDU_Sched_send { struct MPIDU_Sched_recv { void *buf; - int count; + MPI_Aint count; MPI_Datatype datatype; int src; MPID_Comm *comm; @@ -52,17 +52,17 @@ struct MPIDU_Sched_recv { struct MPIDU_Sched_reduce { const void *inbuf; void *inoutbuf; - int count; + MPI_Aint count; MPI_Datatype datatype; MPI_Op op; }; struct MPIDU_Sched_copy { const void *inbuf; - int incount; + MPI_Aint incount; MPI_Datatype intype; void *outbuf; - int outcount; + MPI_Aint outcount; MPI_Datatype outtype; }; ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 6 +++--- src/include/mpir_nbc.h | 16 ++++++++-------- src/mpi/coll/gather.c | 4 ++-- src/mpi/coll/helper_fns.c | 6 +++--- src/mpi/coll/igather.c | 26 ++++++++++++++++++-------- src/mpid/common/sched/mpid_sched.c | 16 ++++++++-------- src/mpid/common/sched/mpid_sched.h | 12 ++++++------ 7 files changed, 48 insertions(+), 38 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-15-g8e6ce14
by noreply＠mpich.org 08 Dec '15

08 Dec '15

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 8e6ce14305048395df675d3f8636f8996c620627 (commit) from 0deaab3b9316ccba0aa64315cbd2e1b1ab3017b4 (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/8e6ce14305048395df675d3f8636f8996… commit 8e6ce14305048395df675d3f8636f8996c620627 Author: Kim McMahon <kmcmahon(a)cray.com> Date: Wed Dec 2 14:56:12 2015 -0600 remove use of send-side CQ tag field in ofi netmod description: The libfabric provider does not need to supply a valid tag field for send-side events on a fi_cq_read() call. The ofi netmod was relying on this field, and all MPI tests will hang during finalize if it isn't set. The TCP libfabric provider had originally supplied a valid tag for send events, but this has recently changed. The gni provider does not supply a valid tag field for send events. author: Kim McMahon, Cray, Inc. Signed-off-by: Charles J Archer <charles.j.archer(a)intel.com> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index 58491ce..46c6c64 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -112,6 +112,8 @@ /* General handler for RTS-CTS-Data protocol. Waits for the cc counter */ /* to hit two (send RTS and receive CTS decrementers) before kicking off the*/ /* bulk data transfer. On data send completion, the request can be freed */ +/* Handles SEND-side events only. We cannot rely on wc->tag field being */ +/* set for these events, so we must use the TAG stored in the sreq. */ /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_data_callback) @@ -122,49 +124,32 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre req_fn reqFn; uint64_t tag = 0; BEGIN_FUNC(FCNAME); - switch (wc->tag & MPID_PROTOCOL_MASK) { - case MPID_MSG_CTS | MPID_MSG_RTS: - vc = REQ_OFI(sreq)->vc; - if(REQ_OFI(sreq)->pack_buffer) { - FI_RC_RETRY(fi_tsend(gl_data.endpoint, - REQ_OFI(sreq)->pack_buffer, - REQ_OFI(sreq)->pack_buffer_size, - gl_data.mr, - VC_OFI(vc)->direct_addr, - wc->tag | MPID_MSG_DATA, - (void *) &(REQ_OFI(sreq)->ofi_context)), tsend); - } else { - struct fi_msg_tagged msg; - void *desc = NULL; - msg.msg_iov = REQ_OFI(sreq)->iov; - msg.desc = &desc; - msg.iov_count = REQ_OFI(sreq)->iov_count; - msg.addr = VC_OFI(vc)->direct_addr; - msg.tag = wc->tag | MPID_MSG_DATA, - msg.ignore = 0ULL; - msg.context = &(REQ_OFI(sreq)->ofi_context); - msg.data = 0ULL; - FI_RC_RETRY(fi_tsendmsg(gl_data.endpoint,&msg,0ULL),tsend); - } - MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(sreq)); - - break; + switch (REQ_OFI(sreq)->tag & MPID_PROTOCOL_MASK) { case MPID_MSG_CTS | MPID_MSG_RTS | MPID_MSG_DATA: - if (REQ_OFI(sreq)->pack_buffer) - MPIU_Free(REQ_OFI(sreq)->pack_buffer); + /* Verify request is complete prior to freeing buffers. + * Multiple DATA events may arrive because we need + * to store updated TAG values in the sreq. + */ + if (MPID_cc_get(sreq->cc) == 1) { + if (REQ_OFI(sreq)->pack_buffer) + MPIU_Free(REQ_OFI(sreq)->pack_buffer); - if (REQ_OFI(sreq)->real_hdr) - MPIU_Free(REQ_OFI(sreq)->real_hdr); + if (REQ_OFI(sreq)->real_hdr) + MPIU_Free(REQ_OFI(sreq)->real_hdr); - reqFn = sreq->dev.OnDataAvail; - if (!reqFn) { + reqFn = sreq->dev.OnDataAvail; + if (!reqFn) { + MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(sreq)); + } + else { + vc = REQ_OFI(sreq)->vc; + MPIDI_CH3I_NM_OFI_RC(reqFn(vc, sreq, &complete)); + } + gl_data.rts_cts_in_flight--; + + } else { MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(sreq)); } - else { - vc = REQ_OFI(sreq)->vc; - MPIDI_CH3I_NM_OFI_RC(reqFn(vc, sreq, &complete)); - } - gl_data.rts_cts_in_flight--; break; case MPID_MSG_RTS: MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(sreq)); @@ -176,14 +161,47 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre /* ------------------------------------------------------------------------ */ /* Signals the CTS has been received. Call MPID_nem_ofi_data_callback on */ /* the parent send request to kick off the bulk data transfer */ +/* Handles RECV-side events only. We rely on wc->tag field being set for */ +/* these events. */ /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_cts_recv_callback) static int MPID_nem_ofi_cts_recv_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) { int mpi_errno = MPI_SUCCESS; + MPID_Request *preq; + MPIDI_VC_t *vc; BEGIN_FUNC(FCNAME); - MPIDI_CH3I_NM_OFI_RC(MPID_nem_ofi_data_callback(wc, REQ_OFI(rreq)->parent)); + preq = REQ_OFI(rreq)->parent; + switch (wc->tag & MPID_PROTOCOL_MASK) { + case MPID_MSG_CTS | MPID_MSG_RTS: + vc = REQ_OFI(preq)->vc; + /* store tag in the request for SEND-side event processing */ + REQ_OFI(preq)->tag = wc->tag | MPID_MSG_DATA; + if(REQ_OFI(preq)->pack_buffer) { + FI_RC_RETRY(fi_tsend(gl_data.endpoint, + REQ_OFI(preq)->pack_buffer, + REQ_OFI(preq)->pack_buffer_size, + gl_data.mr, + VC_OFI(vc)->direct_addr, + REQ_OFI(preq)->tag, + (void *) &(REQ_OFI(preq)->ofi_context)), tsend); + } else { + struct fi_msg_tagged msg; + void *desc = NULL; + msg.msg_iov = REQ_OFI(preq)->iov; + msg.desc = &desc; + msg.iov_count = REQ_OFI(preq)->iov_count; + msg.addr = VC_OFI(vc)->direct_addr; + msg.tag = REQ_OFI(preq)->tag, + msg.ignore = 0ULL; + msg.context = &(REQ_OFI(preq)->ofi_context); + msg.data = 0ULL; + FI_RC_RETRY(fi_tsendmsg(gl_data.endpoint,&msg,0ULL),tsend); + } + MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(preq)); + break; + } MPIDI_CH3I_NM_OFI_RC(MPID_Request_complete(rreq)); END_FUNC_RC(FCNAME); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 96 ++++++++++++-------- 1 files changed, 57 insertions(+), 39 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-14-g0deaab3
by noreply＠mpich.org 08 Dec '15

08 Dec '15

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 0deaab3b9316ccba0aa64315cbd2e1b1ab3017b4 (commit) via f15293d982f832ba064a606423adf016acd968ce (commit) from 4e195146c8fd4d2130edba140798ebbc2fdf69c2 (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/0deaab3b9316ccba0aa64315cbd2e1b1a… commit 0deaab3b9316ccba0aa64315cbd2e1b1ab3017b4 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Wed Dec 2 15:12:55 2015 -0600 test/mpi/io: test case for external32 bug exercise more external32 paths. test case contributed by Adam Moody, LLNL Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 9be20f6..4466ece 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -490,6 +490,7 @@ /io/setinfo /io/setviewcur /io/userioerr +/io/external32-derived-dtype /maint/testmerge /maint/conftimestamp /maint/f77tof90 diff --git a/test/mpi/io/Makefile.am b/test/mpi/io/Makefile.am index e03cdb3..a7e53ac 100644 --- a/test/mpi/io/Makefile.am +++ b/test/mpi/io/Makefile.am @@ -26,7 +26,8 @@ noinst_PROGRAMS = \ resized2 \ bigtype \ hindexed_io \ - simple_collective + simple_collective \ + external32-derived-dtype if BUILD_MPIX_TESTS diff --git a/test/mpi/io/external32-derived-dtype.c b/test/mpi/io/external32-derived-dtype.c new file mode 100644 index 0000000..8391a22 --- /dev/null +++ b/test/mpi/io/external32-derived-dtype.c @@ -0,0 +1,106 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + * + */ +#include <stdlib.h> +#include <stdio.h> +#include "mpi.h" + +static void read_file(const char *name, void *buf, MPI_Datatype dt) +{ + int rank, rc; + MPI_File fh; + char datarep[] = "external32"; + int amode = MPI_MODE_RDONLY; + MPI_Status status; + MPI_Offset offset; + + /* get our rank */ + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + /* open file */ + rc = MPI_File_open(MPI_COMM_WORLD, (char *) name, + amode, MPI_INFO_NULL, &fh); + if (rc != MPI_SUCCESS) { + printf("Rank %d: Failed to open file %s\n", rank, name); + fflush(stdout); + MPI_Abort(MPI_COMM_WORLD, 1); + return; + } + + /* set file view to be sequence of datatypes past header */ + MPI_File_set_view(fh, 0, dt, dt, datarep, MPI_INFO_NULL); + + /* issue a collective read: In 3.2 and older the external32 code + * path had a bug that would cause an overlapping memcopy and crash + */ + offset = rank; + MPI_File_read_at_all(fh, offset, buf, 1, dt, &status); + + /* close file */ + MPI_File_close(&fh); + + return; +} + +static void write_file(const char *name, void *buf, MPI_Datatype dt) +{ + int rank, amode; + char datarep[] = "external32"; + MPI_Status status; + MPI_File fh; + MPI_Offset offset; + + /* get our rank in job */ + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + /* open file */ + amode = MPI_MODE_WRONLY | MPI_MODE_CREATE; + MPI_File_open(MPI_COMM_WORLD, (char *) name, amode, MPI_INFO_NULL, &fh); + + /* truncate file to 0 bytes */ + MPI_File_set_size(fh, 0); + + /* set file view to be sequence of datatypes past header */ + MPI_File_set_view(fh, 0, dt, dt, datarep, MPI_INFO_NULL); + + /* collective write of file info */ + offset = rank; + MPI_File_write_at_all(fh, offset, buf, 1, dt, &status); + + /* close file */ + MPI_File_close(&fh); + + return; +} + +/* write and read a file in which each process writes one int + * in rank order */ +int main(int argc, char *argv[]) +{ + + char buf[2] = "a"; + MPI_Datatype dt; + int blocks[2] = { 1, 1 }; + int disps[2] = { 0, 1 }; + + MPI_Init(&argc, &argv); + MPI_Type_indexed(2, blocks, disps, MPI_CHAR, &dt); + MPI_Type_commit(&dt); + + write_file("testfile", buf, dt); + + read_file("testfile", buf, dt); + + MPI_Type_free(&dt); + + /* if we get this far, then we've passed. No verification in this test at + * this time. */ + fprintf(stdout, " No Errors\n"); + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/io/testlist.in b/test/mpi/io/testlist.in index 9604d33..0760eb2 100644 --- a/test/mpi/io/testlist.in +++ b/test/mpi/io/testlist.in @@ -12,6 +12,7 @@ resized2 1 bigtype 1 hindexed_io 1 simple_collective 1 arg="simple_collective.testfile" +external32-derived-dtype 1 i_bigtype 1 mpiversion=3.1 i_hindexed_io 1 mpiversion=3.1 i_rdwrord 4 mpiversion=3.1 http://git.mpich.org/mpich.git/commitdiff/f15293d982f832ba064a606423adf016a… commit f15293d982f832ba064a606423adf016acd968ce Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Nov 13 14:52:21 2015 -0600 romio external32: convert correct buffer In commit [53f11fd73b] we picked up a "convert the correct buffer" fix, but did not propagate it to the other read cases The write case uses a different pattern and does not suffer from this bug see http://mailman.cse.ohio-state.edu/pipermail/mvapich-discuss/2015-October/00… Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpi/romio/mpi-io/iread_all.c b/src/mpi/romio/mpi-io/iread_all.c index afe44f6..2615e56 100644 --- a/src/mpi/romio/mpi-io/iread_all.c +++ b/src/mpi/romio/mpi-io/iread_all.c @@ -136,7 +136,7 @@ int MPIOI_File_iread_all(MPI_File fh, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } diff --git a/src/mpi/romio/mpi-io/read_all.c b/src/mpi/romio/mpi-io/read_all.c index e0b605d..efce783 100644 --- a/src/mpi/romio/mpi-io/read_all.c +++ b/src/mpi/romio/mpi-io/read_all.c @@ -129,7 +129,7 @@ int MPIOI_File_read_all(MPI_File fh, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } diff --git a/src/mpi/romio/mpi-io/read_allb.c b/src/mpi/romio/mpi-io/read_allb.c index 2110f71..ae1053b 100644 --- a/src/mpi/romio/mpi-io/read_allb.c +++ b/src/mpi/romio/mpi-io/read_allb.c @@ -126,7 +126,7 @@ int MPIOI_File_read_all_begin(MPI_File fh, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } diff --git a/src/mpi/romio/mpi-io/read_ordb.c b/src/mpi/romio/mpi-io/read_ordb.c index 5548bde..050934b 100644 --- a/src/mpi/romio/mpi-io/read_ordb.c +++ b/src/mpi/romio/mpi-io/read_ordb.c @@ -125,7 +125,7 @@ int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } diff --git a/src/mpi/romio/mpi-io/read_sh.c b/src/mpi/romio/mpi-io/read_sh.c index 8ebbf87..83c29da 100644 --- a/src/mpi/romio/mpi-io/read_sh.c +++ b/src/mpi/romio/mpi-io/read_sh.c @@ -144,7 +144,7 @@ int MPI_File_read_shared(MPI_File fh, void *buf, int count, /* --END ERROR HANDLING-- */ if (e32_buf != NULL) { - error_code = MPIU_read_external32_conversion_fn(xbuf, datatype, + error_code = MPIU_read_external32_conversion_fn(buf, datatype, count, e32_buf); ADIOI_Free(e32_buf); } ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/mpi-io/iread_all.c | 2 +- src/mpi/romio/mpi-io/read_all.c | 2 +- src/mpi/romio/mpi-io/read_allb.c | 2 +- src/mpi/romio/mpi-io/read_ordb.c | 2 +- src/mpi/romio/mpi-io/read_sh.c | 2 +- test/mpi/.gitignore | 1 + test/mpi/io/Makefile.am | 3 +- test/mpi/io/external32-derived-dtype.c | 106 ++++++++++++++++++++++++++++++++ test/mpi/io/testlist.in | 1 + 9 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 test/mpi/io/external32-derived-dtype.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-12-g4e19514
by noreply＠mpich.org 08 Dec '15

08 Dec '15

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 4e195146c8fd4d2130edba140798ebbc2fdf69c2 (commit) from 244d3fcdd5aa28bac8f7b1a6b8bbd7cca9d3f619 (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/4e195146c8fd4d2130edba140798ebbc2… commit 4e195146c8fd4d2130edba140798ebbc2fdf69c2 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Sep 25 10:53:36 2015 -0500 a portable version of backtrace There are several approaches available for backtracing. As a starting point, provide an MPL backtrace routine that looks for and uses one of several approaches. In this first stab, the order will be - libbacktrace - libunwind - glibc-like backtrace (available in glibc, freebsd, and solaris) - the "i can't do anything" handler Signed-off-by: Sangmin Seo <sseo(a)anl.gov> diff --git a/src/mpl/Makefile.am b/src/mpl/Makefile.am index d4a8675..34a7221 100644 --- a/src/mpl/Makefile.am +++ b/src/mpl/Makefile.am @@ -13,7 +13,8 @@ lib@MPLLIBNAME@_la_SOURCES = \ src/mpltrmem.c \ src/mplenv.c \ src/mplmsg.c \ - src/mplsock.c + src/mplsock.c \ + src/mplutil.c lib@MPLLIBNAME@_la_LDFLAGS = ${lib@MPLLIBNAME@_so_versionflags} MPL_TESTS = strsep @@ -32,7 +33,8 @@ mpl_headers = \ include/mpltrmem.h \ include/mplmsg.h \ include/mpliov.h \ - include/mplsock.h + include/mplsock.h \ + include/mplutil.h if MPL_EMBEDDED_MODE noinst_HEADERS = $(mpl_headers) diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index c4e798c..662e528 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -71,7 +71,7 @@ if test "$pac_cv_have___typeof" = "yes" ; then fi dnl Check if the necessary headers are available -AC_CHECK_HEADERS(stdio.h stdlib.h string.h stdarg.h ctype.h search.h sys/types.h sys/uio.h) +AC_CHECK_HEADERS(stdio.h stdlib.h string.h stdarg.h ctype.h search.h sys/types.h sys/uio.h execinfo.h backtrace.h libunwind.h) # A C99 compliant compiler should have inttypes.h for fixed-size int types AC_CHECK_HEADERS(inttypes.h stdint.h) @@ -200,6 +200,10 @@ if test "$ac_cv_func_strerror" = "yes" ; then PAC_FUNC_NEEDS_DECL([#include <string.h>],strerror) fi +AC_CHECK_FUNCS(backtrace_symbols) +AC_CHECK_LIB(backtrace, backtrace_create_state) +AC_CHECK_LIB(unwind, unw_backtrace) + dnl Check for ATTRIBUTE PAC_C_GNU_ATTRIBUTE diff --git a/src/mpl/include/mpl.h b/src/mpl/include/mpl.h index 4885750..0ceb887 100644 --- a/src/mpl/include/mpl.h +++ b/src/mpl/include/mpl.h @@ -114,5 +114,6 @@ #include "mplsock.h" #include "mplmsg.h" #include "mpliov.h" +#include "mplutil.h" #endif /* MPL_H_INCLUDED */ diff --git a/src/mpl/include/mplutil.h b/src/mpl/include/mplutil.h new file mode 100644 index 0000000..2937751 --- /dev/null +++ b/src/mpl/include/mplutil.h @@ -0,0 +1,25 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + + +#ifndef MPLUTIL_H_INCLUDED +#define MPLUTIL_H_INCLUDED + +#include "mplconfig.h" +#if defined(__cplusplus) +extern "C" { +#endif + +#define MPL_BACKTRACE_BUFFER_LEN 1024 +#define MPL_MAX_TRACE_DEPTH 32 +void MPL_backtrace_show(FILE *output); + +#if defined(__cplusplus) + +} +#endif + +#endif diff --git a/src/mpl/src/mplutil.c b/src/mpl/src/mplutil.c new file mode 100644 index 0000000..c55dd38 --- /dev/null +++ b/src/mpl/src/mplutil.c @@ -0,0 +1,132 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2015 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpl.h" +#ifdef MPL_HAVE_EXECINFO_H +#include <execinfo.h> +#endif + +#ifdef MPL_HAVE_BACKTRACE_H +#include <backtrace.h> +#endif + +#ifdef MPL_HAVE_LIBUNWIND_H +#define UNW_LOCAL_ONLY +#include <libunwind.h> +#endif + + +/* freebsd and linux have slightly different backtrace routines. + * solaris uses something totally different: a 'walkcontext' routine + * which takes a function pointer. solaris 'walkcontext' is simliar to + * libbacktrace, shipped with gcc-4.8 and newer. both share features + * with libunwind. + * + * For the case of "display the call stack to this point" the various + * approaches share a common pattern: + * - initialize the library + * - get the stack + * - decode the stack + * + * but for now we'll simply dispatch to one of several appraoches + * depending on what configure found + * + */ + +#ifdef MPL_HAVE_BACKTRACE_SYMBOLS +static inline void backtrace_libc(FILE *output) +{ +#ifndef MPL_MAX_TRACE_DEPTH +#define MPL_MAX_TRACE_DEPTH 32 +#endif + void *trace[MPL_MAX_TRACE_DEPTH]; + char **stack_strs; + char backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN]; + int frames, i, ret, chars = 0; + + frames = backtrace(trace, MPL_MAX_TRACE_DEPTH); + stack_strs = backtrace_symbols(trace, frames); + + for (i = 0; i < frames; i++) { + ret = MPL_snprintf(backtrace_buffer + chars, + MPL_BACKTRACE_BUFFER_LEN - chars, + "%s\n", stack_strs[i]); + if (ret + chars >= MPL_BACKTRACE_BUFFER_LEN) { + /* the extra new line will be more readable than a merely + * truncated string */ + backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN - 2] = '\n'; + backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN - 1] = '\0'; + break; + } + chars += ret; + } + fprintf(output, "%s", backtrace_buffer); + free(stack_strs); +} +#endif + +#ifdef MPL_HAVE_LIBBACKTRACE +static inline void backtrace_libback(FILE *output) +{ + struct backtrace_state *btstate; + btstate = backtrace_create_state(NULL, 1, NULL, NULL); + backtrace_print(btstate, 0, output); +} +#endif + +#ifdef MPL_HAVE_LIBUNWIND +static inline void backtrace_libunwind(FILE *output) +{ + unw_cursor_t cursor; + unw_context_t uc; + unw_word_t ip, offset; + int ret, chars = 0; + char buffer[MPL_BACKTRACE_BUFFER_LEN]; + char backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN]; + + unw_getcontext(&uc); + unw_init_local(&cursor, &uc); + while (unw_step(&cursor) > 0) { + unw_get_reg(&cursor, UNW_REG_IP, &ip); + unw_get_proc_name(&cursor, buffer, + MPL_BACKTRACE_BUFFER_LEN, &offset); + ret = MPL_snprintf(backtrace_buffer + chars, + MPL_BACKTRACE_BUFFER_LEN - chars, + "0x%lx %s() + 0x%lx\n", + (long)ip, buffer, (long)offset); + if (ret + chars >= MPL_BACKTRACE_BUFFER_LEN) { + /* the extra new line will be more readable than a merely + * truncated string */ + backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN - 2] = '\n'; + backtrace_buffer[MPL_BACKTRACE_BUFFER_LEN - 1] = '\0'; + break; + } + chars += ret; + } + fprintf(output, "%s", backtrace_buffer); +} +#endif + +static inline void backtrace_unsupported(FILE *output) +{ + fprintf(output, "No backtrace info available\n"); +} + +/* Pick one of the many ways one could dump out a call stack*/ +void MPL_backtrace_show(FILE *output) +{ +#ifdef MPL_HAVE_LIBBACKTRACE + backtrace_libback(output); +#elif defined MPL_HAVE_LIBUNWIND + /* libunwind is not able to get line numbers without forking off to + * addr2line (?)*/ + backtrace_libunwind(output); +#elif defined MPL_HAVE_BACKTRACE_SYMBOLS + backtrace_libc(output); +#else + backtrace_unsupported(output); +#endif +} diff --git a/src/util/other/assert.c b/src/util/other/assert.c index 5fae177..0439fed 100644 --- a/src/util/other/assert.c +++ b/src/util/other/assert.c @@ -27,6 +27,7 @@ int MPIR_Assert_fail(const char *cond, const char *file_name, int line_num) (MPIU_DBG_FDEST, "Assertion failed in file %s at line %d: %s", file_name, line_num, cond)); + MPL_backtrace_show(stderr); MPID_Abort(NULL, MPI_SUCCESS, 1, NULL); return MPI_ERR_INTERN; /* never get here, abort should kill us */ } ----------------------------------------------------------------------- Summary of changes: src/mpl/Makefile.am | 6 ++- src/mpl/configure.ac | 6 ++- src/mpl/include/mpl.h | 1 + src/mpl/include/mplutil.h | 25 +++++++++ src/mpl/src/mplutil.c | 132 +++++++++++++++++++++++++++++++++++++++++++++ src/util/other/assert.c | 1 + 6 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 src/mpl/include/mplutil.h create mode 100644 src/mpl/src/mplutil.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-11-g244d3fc
by noreply＠mpich.org 04 Dec '15

04 Dec '15

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 244d3fcdd5aa28bac8f7b1a6b8bbd7cca9d3f619 (commit) from c3dbc09ae20a503ac4b870893e3e330d52ea5a3b (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/244d3fcdd5aa28bac8f7b1a6b8bbd7cca… commit 244d3fcdd5aa28bac8f7b1a6b8bbd7cca9d3f619 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Dec 3 13:35:12 2015 -0600 dbg/memarena: check memory writes at function exit Memarena checking at function exit was inadvertently lost in commit [2bd984a295cf]. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/include/mpifunc.h b/src/include/mpifunc.h index 8630cd4..402c6bc 100644 --- a/src/include/mpifunc.h +++ b/src/include/mpifunc.h @@ -32,7 +32,7 @@ #if defined(USE_DBG_LOGGING) #define MPIR_FUNC_EXIT(a) MPIU_DBG_MSG(ROUTINE_EXIT,TYPICAL,"Leaving "#a) #elif defined(MPICH_DEBUG_MEMARENA) -#define MPIR_FUNC_EXIT(a) MPIU_DBG_MSG(ROUTINE_EXIT,TYPICAL,"Leaving "#a) +#define MPIR_FUNC_EXIT(a) MPIU_trvalid("Leaving " #a) #endif #endif /* MPIFUNC_H_INCLUDED */ ----------------------------------------------------------------------- Summary of changes: src/include/mpifunc.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-10-gc3dbc09
by noreply＠mpich.org 03 Dec '15

03 Dec '15

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 c3dbc09ae20a503ac4b870893e3e330d52ea5a3b (commit) from f0ee51dcf99276370c8f904d2150ce95a04e265f (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/c3dbc09ae20a503ac4b870893e3e330d5… commit c3dbc09ae20a503ac4b870893e3e330d52ea5a3b Author: Jeff Hammond <jeff.science(a)gmail.com> Date: Mon Nov 30 20:50:23 2015 -0800 Remove const from declaration of MPI-2 functions The following functions were deprecated in MPI-2 and deleted in MPI-3, hence should not have const arguments, since that is an MPI-3 addition. MPI_Type_hindexed MPI_Type_struct MPI_Address PMPI_Type_hindexed PMPI_Type_struct PMPI_Address See http://lists.mpich.org/pipermail/discuss/2015-November/004348.html for related discussion. Closes #2318 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 39cdec3..ddba429 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -980,13 +980,13 @@ int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype o int MPI_Type_indexed(int count, const int *array_of_blocklengths, const int *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPI_Type_hindexed(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, MPI_Datatype oldtype, +int MPI_Type_hindexed(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPI_Type_struct(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, - const MPI_Datatype *array_of_types, MPI_Datatype *newtype); -int MPI_Address(const void *location, MPI_Aint *address); +int MPI_Type_struct(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, + MPI_Datatype *array_of_types, MPI_Datatype *newtype); +int MPI_Address(void *location, MPI_Aint *address); int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent); int MPI_Type_size(MPI_Datatype datatype, int *size); int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement); @@ -1626,13 +1626,13 @@ int PMPI_Type_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype int PMPI_Type_indexed(int count, const int *array_of_blocklengths, const int *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype); -int PMPI_Type_hindexed(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, MPI_Datatype oldtype, +int PMPI_Type_hindexed(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype); -int PMPI_Type_struct(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, - const MPI_Datatype *array_of_types, MPI_Datatype *newtype); -int PMPI_Address(const void *location, MPI_Aint *address); +int PMPI_Type_struct(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, + MPI_Datatype *array_of_types, MPI_Datatype *newtype); +int PMPI_Address(void *location, MPI_Aint *address); int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent); int PMPI_Type_size(MPI_Datatype datatype, int *size); int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement); diff --git a/src/mpi/datatype/address.c b/src/mpi/datatype/address.c index 4557846..bd5819a 100644 --- a/src/mpi/datatype/address.c +++ b/src/mpi/datatype/address.c @@ -15,7 +15,7 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPI_Address as PMPI_Address #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_Address(const void *location, MPI_Aint *address) __attribute__((weak,alias("PMPI_Address"))); +int MPI_Address(void *location, MPI_Aint *address) __attribute__((weak,alias("PMPI_Address"))); #endif /* -- End Profiling Symbol Block */ @@ -59,7 +59,7 @@ The replacement for this routine is 'MPI_Get_address'. .N MPI_SUCCESS .N MPI_ERR_OTHER @*/ -int MPI_Address(const void *location, MPI_Aint *address) +int MPI_Address(void *location, MPI_Aint *address) { int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ADDRESS); diff --git a/src/mpi/datatype/type_hindexed.c b/src/mpi/datatype/type_hindexed.c index 7ed7a2f..94d6cb4 100644 --- a/src/mpi/datatype/type_hindexed.c +++ b/src/mpi/datatype/type_hindexed.c @@ -15,8 +15,8 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPI_Type_hindexed as PMPI_Type_hindexed #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_Type_hindexed(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, MPI_Datatype oldtype, +int MPI_Type_hindexed(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_hindexed"))); #endif /* -- End Profiling Symbol Block */ @@ -81,8 +81,8 @@ consider declaring the Fortran array with a zero origin .N MPI_ERR_ARG @*/ int MPI_Type_hindexed(int count, - const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, + int *array_of_blocklengths, + MPI_Aint *array_of_displacements, MPI_Datatype oldtype, MPI_Datatype *newtype) { diff --git a/src/mpi/datatype/type_struct.c b/src/mpi/datatype/type_struct.c index fde6b8a..ca4e012 100644 --- a/src/mpi/datatype/type_struct.c +++ b/src/mpi/datatype/type_struct.c @@ -15,9 +15,9 @@ #elif defined(HAVE_PRAGMA_CRI_DUP) #pragma _CRI duplicate MPI_Type_struct as PMPI_Type_struct #elif defined(HAVE_WEAK_ATTRIBUTE) -int MPI_Type_struct(int count, const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, - const MPI_Datatype *array_of_types, MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_struct"))); +int MPI_Type_struct(int count, int *array_of_blocklengths, + MPI_Aint *array_of_displacements, + MPI_Datatype *array_of_types, MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_struct"))); #endif /* -- End Profiling Symbol Block */ @@ -149,9 +149,9 @@ for the structure foo .N MPI_ERR_EXHAUSTED @*/ int MPI_Type_struct(int count, - const int *array_of_blocklengths, - const MPI_Aint *array_of_displacements, - const MPI_Datatype *array_of_types, + int *array_of_blocklengths, + MPI_Aint *array_of_displacements, + MPI_Datatype *array_of_types, MPI_Datatype *newtype) { int mpi_errno = MPI_SUCCESS; ----------------------------------------------------------------------- Summary of changes: src/include/mpi.h.in | 24 ++++++++++++------------ src/mpi/datatype/address.c | 4 ++-- src/mpi/datatype/type_hindexed.c | 8 ++++---- src/mpi/datatype/type_struct.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) hooks/post-receive -- MPICH primary repository

1 0