October 2014 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1.3-28-ge37e0ee
by noreply＠mpich.org 20 Oct '14

20 Oct '14

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 e37e0ee93ee2398b22a6465c79c924cc7d0b814b (commit) via c1e81b78f8dec1f8e24bf938c84873d1e809276e (commit) via 3611b89ff76b4fd6e7ee5d68910e929741684d82 (commit) via f86004a5318c83c8bd1e23c4f304ea69bec08b48 (commit) via c668ce8c4ea3ac096c3185922b60821e551585d3 (commit) from b065ce2e89e03683c89e57a0d06f8106c805b7bf (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/e37e0ee93ee2398b22a6465c79c924cc7… commit e37e0ee93ee2398b22a6465c79c924cc7d0b814b Author: Wesley Bland <wbland(a)anl.gov> Date: Wed Oct 15 16:32:04 2014 -0500 Add a test for combining agree and shrink Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/test/mpi/ft/Makefile.am b/test/mpi/ft/Makefile.am index 11d9136..080e7dc 100644 --- a/test/mpi/ft/Makefile.am +++ b/test/mpi/ft/Makefile.am @@ -10,4 +10,7 @@ include $(top_srcdir)/Makefile.mtest ## for all programs that are just built from the single corresponding source ## file, we don't need per-target _SOURCES rules, automake will infer them ## correctly -noinst_PROGRAMS = die abort sendalive isendalive senddead recvdead isenddead irecvdead barrier gather reduce bcast scatter failure_ack anysource revoke_nofail shrink agree multi_isendalive +noinst_PROGRAMS = die abort sendalive isendalive senddead recvdead isenddead \ + irecvdead barrier gather reduce bcast scatter failure_ack \ + anysource revoke_nofail shrink agree multi_isendalive \ + agree_shrink diff --git a/test/mpi/ft/agree_shrink.c b/test/mpi/ft/agree_shrink.c new file mode 100644 index 0000000..0420b66 --- /dev/null +++ b/test/mpi/ft/agree_shrink.c @@ -0,0 +1,64 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include "mpitest.h" + +int main(int argc, char **argv) +{ + int rank, size, rc, ec, errs = 0; + int flag = 1; + MPI_Comm dup, shrunk; + + MPI_Init(&argc, &argv); + MPI_Comm_dup(MPI_COMM_WORLD, &dup); + MPI_Comm_rank(dup, &rank); + MPI_Comm_size(dup, &size); + MPI_Comm_set_errhandler(dup, MPI_ERRORS_RETURN); + + if (size < 4) { + fprintf(stderr, "Must run with at least 4 processes\n"); + MPI_Abort(dup, 1); + } + + if (2 == rank) exit(EXIT_FAILURE); + + if (MPI_SUCCESS == (rc = MPIX_Comm_agree(dup, &flag))) { + MPI_Error_class(rc, &ec); + fprintf(stderr, "[%d] Expected MPIX_ERR_PROC_FAILED after agree. Received: %d\n", rank, ec); + errs++; + MPI_Abort(dup, 1); + } + + if (MPI_SUCCESS != (rc = MPIX_Comm_shrink(dup, &shrunk))) { + MPI_Error_class(rc, &ec); + fprintf(stderr, "[%d] Expected MPI_SUCCESS after shrink. Received: %d\n", rank, ec); + errs++; + MPI_Abort(dup, 1); + } + + if (MPI_SUCCESS != (rc = MPIX_Comm_agree(shrunk, &flag))) { + MPI_Error_class(rc, &ec); + fprintf(stderr, "[%d] Expected MPI_SUCCESS after agree. Received: %d\n", rank, ec); + errs++; + MPI_Abort(dup, 1); + } + + MPI_Comm_free(&shrunk); + MPI_Comm_free(&dup); + + if (0 == rank) { + if (errs) + fprintf(stdout, " Found %d errors\n", errs); + else + fprintf(stdout, " No errors\n"); + } + + MPI_Finalize(); +} http://git.mpich.org/mpich.git/commitdiff/c1e81b78f8dec1f8e24bf938c84873d1e… commit c1e81b78f8dec1f8e24bf938c84873d1e809276e Author: Wesley Bland <wbland(a)anl.gov> Date: Wed Oct 15 16:06:26 2014 -0500 Don't test tags when unnecessary Tags were sometimes being tested when the communication call had already failed, leading to bad asserts later due to uninitialized values. Sometimes, these results would have ended up with an error anyway, but sometimes not. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index c98690c..869d193 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -328,7 +328,6 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, mpi_errno = MPIC_Wait(request_ptr); if (mpi_errno == MPI_SUCCESS) { *status = request_ptr->status; - mpi_errno = request_ptr->status.MPI_ERROR; } else { MPIU_ERR_POP(mpi_errno); } @@ -336,10 +335,14 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, } if (source != MPI_PROC_NULL) { - if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) { + int ec; + MPI_Error_class(status->MPI_ERROR, &ec); + if (MPIX_ERR_REVOKED != MPIR_ERR_GET_CLASS(status->MPI_ERROR) && + MPIX_ERR_PROC_FAILED != MPIR_ERR_GET_CLASS(status->MPI_ERROR) && + MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) { *errflag = TRUE; MPIR_TAG_CLEAR_ERROR_BIT(status->MPI_TAG); - } else if (MPIX_ERR_REVOKED != MPIR_ERR_GET_CLASS(status->MPI_ERROR)) { + } else if (MPI_SUCCESS == MPIR_ERR_GET_CLASS(status->MPI_ERROR)) { MPIU_Assert(status->MPI_TAG == tag); } } http://git.mpich.org/mpich.git/commitdiff/3611b89ff76b4fd6e7ee5d68910e92974… commit 3611b89ff76b4fd6e7ee5d68910e929741684d82 Author: Wesley Bland <wbland(a)anl.gov> Date: Thu Aug 21 10:21:10 2014 -0500 Fix FUNC_ENTER macros for some ft functions The calls in MPID_Comm_get_all_failed_procs and MPID_Comm_agree were the wrong macros for entering and exiting an MPID function. This corrects it. Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/mpid_comm_agree.c b/src/mpid/ch3/src/mpid_comm_agree.c index 12ae988..3bd5849 100644 --- a/src/mpid/ch3/src/mpid_comm_agree.c +++ b/src/mpid/ch3/src/mpid_comm_agree.c @@ -64,8 +64,8 @@ int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_ int errflag = new_fail; int tmp_flag; - MPID_MPI_STATE_DECL(MPID_STATE_MPID_COMM_AGREE); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPID_COMM_AGREE); + MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_AGREE); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_AGREE); children = (int *) MPIU_Malloc(sizeof(int) * ((comm_ptr->local_size) / 2)); @@ -113,7 +113,7 @@ int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_ MPIU_Free(children); fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE); + MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c index 9d29cf6..98e8230 100644 --- a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c +++ b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c @@ -90,7 +90,7 @@ int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_grou MPID_Group *local_fail; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); /* Kick the progress engine in case it's been a while so we get all the * latest updates about failures */ @@ -152,7 +152,7 @@ int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_grou MPIU_Free(remote_bitarray); fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); + MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); return mpi_errno; fn_fail: goto fn_exit; http://git.mpich.org/mpich.git/commitdiff/f86004a5318c83c8bd1e23c4f304ea69b… commit f86004a5318c83c8bd1e23c4f304ea69bec08b48 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Fri Aug 8 15:53:24 2014 -0500 Fixes one missing case in MPIDI_CH3U_Clean_recvq Revoke will call MPIDI_CH3U_Clean_recvq to dequeue all requests with revoked communicators. There is one missing case: when there's hierarchy communicators that use a different context id. This patch adds a case to check the hierarchy communicators. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index c37e4b3..e4b7a38 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -958,7 +958,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr) match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { - if (rreq->dev.match.parts.tag != MPIR_AGREE_TAG && rreq->dev.match.parts.tag != MPIR_SHRINK_TAG) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, "cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d", rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); @@ -967,12 +968,56 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr) } } - if (MPIR_CVAR_ENABLE_SMP_COLLECTIVES && MPIR_Comm_is_node_aware(comm_ptr)) { - int offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + if (MPIR_Comm_is_node_aware(comm_ptr)) { + int offset; + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { - if (rreq->dev.match.parts.tag != MPIR_AGREE_TAG && rreq->dev.match.parts.tag != MPIR_SHRINK_TAG) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up unexpected pt2pt pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_unexpected_head, &recvq_unexpected_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_unexpected_head, &recvq_unexpected_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up unexpected pt2pt pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_unexpected_head, &recvq_unexpected_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, "cleaning up unexpected collective pkt rank=%d tag=%d contextid=%d", rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); @@ -1005,7 +1050,8 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr) match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { - if (rreq->dev.match.parts.tag != MPIR_AGREE_TAG && rreq->dev.match.parts.tag != MPIR_SHRINK_TAG) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, "cleaning up posted collective pkt rank=%d tag=%d contextid=%d", rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); @@ -1014,12 +1060,54 @@ int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr) } } - if (MPIR_CVAR_ENABLE_SMP_COLLECTIVES && MPIR_Comm_is_node_aware(comm_ptr)) { - int offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + if (MPIR_Comm_is_node_aware(comm_ptr)) { + int offset; + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { - if (rreq->dev.match.parts.tag != MPIR_AGREE_TAG && rreq->dev.match.parts.tag != MPIR_SHRINK_TAG) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up posted pt2pt pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_posted_head, &recvq_posted_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up posted collective pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_posted_head, &recvq_posted_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { + MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, + "cleaning up posted pt2pt pkt rank=%d tag=%d contextid=%d", + rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); + dequeue_and_set_error(&rreq, prev_rreq, &recvq_posted_head, &recvq_posted_tail, &error, MPI_PROC_NULL); + continue; + } + } + + offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + + if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { + if (MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && + MPIR_TAG_MASK_ERROR_BIT(rreq->dev.match.parts.tag) != MPIR_SHRINK_TAG) { MPIU_DBG_MSG_FMT(CH3_OTHER,VERBOSE,(MPIU_DBG_FDEST, "cleaning up posted collective pkt rank=%d tag=%d contextid=%d", rreq->dev.match.parts.rank, rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id)); http://git.mpich.org/mpich.git/commitdiff/c668ce8c4ea3ac096c3185922b60821e5… commit c668ce8c4ea3ac096c3185922b60821e551585d3 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Thu Aug 7 16:32:04 2014 -0500 Simplify revoke_nofail test Simplifies the test to only use 2 processes and not make as many MPI calls. Modifications by Wesley Bland. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/ft/revoke_nofail.c b/test/mpi/ft/revoke_nofail.c index 9e48712..df7b470 100644 --- a/test/mpi/ft/revoke_nofail.c +++ b/test/mpi/ft/revoke_nofail.c @@ -18,23 +18,23 @@ int main(int argc, char **argv) int rank, size; int rc, ec; char error[MPI_MAX_ERROR_STRING]; - MPI_Comm world_dup, world_dup2; + MPI_Comm world_dup; MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); - if (size < 4) { - fprintf( stderr, "Must run with at least 4 processes\n" ); + if (size < 2) { + fprintf( stderr, "Must run with at least 2 processes\n" ); MPI_Abort(MPI_COMM_WORLD, 1); } MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); MPI_Comm_dup(MPI_COMM_WORLD, &world_dup); - MPI_Comm_dup(MPI_COMM_WORLD, &world_dup2); - if (rank == 3) + if (rank == 1) { MPIX_Comm_revoke(world_dup); + } rc = MPI_Barrier(world_dup); MPI_Error_class(rc, &ec); @@ -45,17 +45,7 @@ int main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, 1); } - rc = MPI_Barrier(world_dup2); - MPI_Error_class(rc, &ec); - if (ec != MPI_SUCCESS) { - MPI_Error_string(ec, error, &size); - fprintf(stderr, "[%d] MPI_Barrier should have returned MPI_SUCCESS, but it actually returned: %d\n%s\n", - rank, ec, error); - MPI_Abort(MPI_COMM_WORLD, 1); - } - MPI_Comm_free(&world_dup); - MPI_Comm_free(&world_dup2); if (rank == 0) fprintf(stdout, " No errors\n"); diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index f26bd47..2f93edd 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -13,6 +13,6 @@ reduce 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=f bcast 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 scatter 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 anysource 3 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 -revoke_nofail 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 +revoke_nofail 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 shrink 8 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 agree 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/helper_fns.c | 9 +- src/mpid/ch3/src/ch3u_recvq.c | 104 +++++++++++++++++++-- src/mpid/ch3/src/mpid_comm_agree.c | 6 +- src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c | 4 +- test/mpi/ft/Makefile.am | 5 +- test/mpi/ft/agree_shrink.c | 64 +++++++++++++ test/mpi/ft/revoke_nofail.c | 20 +--- test/mpi/ft/testlist | 2 +- 8 files changed, 181 insertions(+), 33 deletions(-) create mode 100644 test/mpi/ft/agree_shrink.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-23-gb065ce2
by noreply＠mpich.org 20 Oct '14

20 Oct '14

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 b065ce2e89e03683c89e57a0d06f8106c805b7bf (commit) via 3ffe739574ddd8a77a9189f2e1bbbfff14284c67 (commit) from f91a57d30ffba0fad02bb4b36b551e5fcf2a9f2c (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/b065ce2e89e03683c89e57a0d06f8106c… commit b065ce2e89e03683c89e57a0d06f8106c805b7bf Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Oct 16 18:13:22 2014 -0500 Change macros to use standard format This makes sure that macros work the normal way (using a semicolon at the end, etc.) It also removes a block of unused code from mx_cancel.c. Modified by Wesley to split from previous patch. Signed-off-by: Wesley Bland <wbland(a)anl.gov> Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c index 9106eb9..e6cc5b4 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c @@ -24,14 +24,16 @@ static int entered_drain_scq = 0; #define MPID_NEM_IB_SEND_PROGRESS_POLLINGSET MPID_nem_ib_send_progress(vc); #else #define MPID_NEM_IB_SEND_PROGRESS_POLLINGSET { \ - int n; \ - for (n = 0; n < MPID_NEM_IB_NRINGBUF; n++) { \ - if (((MPID_nem_ib_ringbuf_allocated[n / 64] >> (n & 63)) & 1) == 0) { \ - continue; \ - } \ - mpi_errno = MPID_nem_ib_poll_eager(&MPID_nem_ib_ringbuf[n]); /*FIXME: perform send_progress for all sendqs */\ - MPIU_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**MPID_nem_ib_poll_eager"); \ - } \ + do { \ + int n; \ + for (n = 0; n < MPID_NEM_IB_NRINGBUF; n++) { \ + if (((MPID_nem_ib_ringbuf_allocated[n / 64] >> (n & 63)) & 1) == 0) { \ + continue; \ + } \ + mpi_errno = MPID_nem_ib_poll_eager(&MPID_nem_ib_ringbuf[n]); /*FIXME: perform send_progress for all sendqs */ \ + MPIU_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**MPID_nem_ib_poll_eager"); \ + } \ + } while (0) } #if 0 int n; \ @@ -45,11 +47,16 @@ static int entered_drain_scq = 0; #endif #if 1 #define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS \ - if (!MPID_nem_ib_sendq_empty(vc_ib->sendq) && MPID_nem_ib_sendq_ready_to_send_head(vc_ib)) { \ - MPID_nem_ib_send_progress(vc); \ -} + do { \ + if (!MPID_nem_ib_sendq_empty(vc_ib->sendq) && MPID_nem_ib_sendq_ready_to_send_head(vc_ib)) { \ + MPID_nem_ib_send_progress(vc); \ + } \ + } while (0) #else -#define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS MPID_NEM_IB_SEND_PROGRESS_POLLINGSET +#define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS \ + do { \ + MPID_NEM_IB_SEND_PROGRESS_POLLINGSET; \ + } while (0) #endif #undef FUNCNAME @@ -1690,13 +1697,13 @@ int MPID_nem_ib_PktHandler_EagerSend(MPIDI_VC_t * vc, * progress_send for all of VCs using nces in ib_poll. */ dprintf("pkthandler,eagersend,send_progress\n"); fflush(stdout); - MPID_NEM_IB_CHECK_AND_SEND_PROGRESS - /* fall back to the original handler */ - /* we don't need to worry about the difference caused by embedding seq_num - * because size of MPI-header of MPIDI_CH3_PKT_EAGER_SEND equals to sizeof(MPIDI_CH3_Pkt_t) - * see MPID_nem_ib_iSendContig - */ - //ch3_pkt->type = MPIDI_CH3_PKT_EAGER_SEND; + MPID_NEM_IB_CHECK_AND_SEND_PROGRESS; + /* fall back to the original handler */ + /* we don't need to worry about the difference caused by embedding seq_num + * because size of MPI-header of MPIDI_CH3_PKT_EAGER_SEND equals to sizeof(MPIDI_CH3_Pkt_t) + * see MPID_nem_ib_iSendContig + */ + //ch3_pkt->type = MPIDI_CH3_PKT_EAGER_SEND; #if 0 mpi_errno = MPID_nem_handle_pkt(vc, (char *) pkt_parent_class, *buflen); #else @@ -2254,7 +2261,8 @@ int MPID_nem_ib_pkt_GET_DONE_handler(MPIDI_VC_t * vc, if (REQ_FIELD(req, seg_seq_num) == REQ_FIELD(req, seg_num)) { /* last packet of segments */ - MPID_NEM_IB_CHECK_AND_SEND_PROGRESS mpi_errno = vc->ch.lmt_done_send(vc, req); + MPID_NEM_IB_CHECK_AND_SEND_PROGRESS; + mpi_errno = vc->ch.lmt_done_send(vc, req); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } @@ -2446,8 +2454,10 @@ int MPID_nem_ib_PktHandler_reply_seq_num(MPIDI_VC_t * vc, /* try to send from sendq because at least one RDMA-write-to buffer has been released */ //dprintf("pkthandler,reply_seq_num,send_progress\n"); dprintf("pkthandler,reply_seq_num,send_progress\n"); - MPID_NEM_IB_CHECK_AND_SEND_PROGRESS fn_exit:MPIDI_FUNC_EXIT - (MPID_STATE_MPID_NEM_IB_PKTHANDLER_REPLY_SEQ_NUM); + MPID_NEM_IB_CHECK_AND_SEND_PROGRESS; + + fn_exit: + MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_IB_PKTHANDLER_REPLY_SEQ_NUM); return mpi_errno; //fn_fail: goto fn_exit; http://git.mpich.org/mpich.git/commitdiff/3ffe739574ddd8a77a9189f2e1bbbfff1… commit 3ffe739574ddd8a77a9189f2e1bbbfff14284c67 Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Oct 9 13:35:56 2014 -0500 Function state cleanup. We were not setting the function states correctly in a bunch of functions. Modifications by Wesley to split up big commit. Signed-off-by: Wesley Bland <wbland(a)anl.gov> Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c index a211331..8522d40 100644 --- a/src/mpi/attr/win_set_attr.c +++ b/src/mpi/attr/win_set_attr.c @@ -200,6 +200,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val) { int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ATTR); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_WIN_SET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c index 870f43d..49a71d7 100644 --- a/src/mpi/comm/comm_agree.c +++ b/src/mpi/comm/comm_agree.c @@ -98,6 +98,7 @@ int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag) } fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_AGREE); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpi/comm/comm_set_info.c b/src/mpi/comm/comm_set_info.c index e6940a8..0acbfbe 100644 --- a/src/mpi/comm/comm_set_info.c +++ b/src/mpi/comm/comm_set_info.c @@ -62,6 +62,7 @@ int MPIR_Comm_set_info_impl(MPID_Comm * comm_ptr, MPID_Info * info_ptr) } fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_SET_INFO_IMPL); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c index 24560e7..844d617 100644 --- a/src/mpi/comm/comm_shrink.c +++ b/src/mpi/comm/comm_shrink.c @@ -82,6 +82,7 @@ int MPIR_Comm_shrink(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr) fn_exit: MPIR_Group_release(comm_grp); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_SHRINK); return mpi_errno; fn_fail: if (*newcomm_ptr) MPIU_Object_set_ref(*newcomm_ptr, 0); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 1934ce6..1032a2b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -163,6 +163,8 @@ static inline void save_iov(MPID_Request *sreq, void *hdr, void *data, MPIDI_msg ++index; } sreq->dev.iov_count = index; + + MPIDI_FUNC_EXIT(MPID_STATE_SAVE_IOV); } #undef FUNCNAME diff --git a/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c index a6f5099..fec9e89 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c @@ -1972,7 +1972,7 @@ static int state_c_tmpvcack_success_handler(MPIU_EXOVERLAPPED *rd_ov) } fn_exit: - MPIDI_FUNC_ENTER(MPID_STATE_STATE_C_TMPVCACK_SUCCESS_HANDLER); + MPIDI_FUNC_EXIT(MPID_STATE_STATE_C_TMPVCACK_SUCCESS_HANDLER); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 02c0b9c..8024bf2 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -1095,7 +1095,7 @@ static inline int MPIDI_CH3I_Wait_for_pt_ops_finish(MPID_Win *win_ptr) } fn_exit: - MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_WAIT_FOR_PT_OPS_FINISH); + MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_WAIT_FOR_PT_OPS_FINISH); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_comm_agree.c b/src/mpid/ch3/src/mpid_comm_agree.c index 6377397..12ae988 100644 --- a/src/mpid/ch3/src/mpid_comm_agree.c +++ b/src/mpid/ch3/src/mpid_comm_agree.c @@ -113,6 +113,7 @@ int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_ MPIU_Free(children); fn_exit: + MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE); return mpi_errno; fn_fail: goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index fe70fdc..e5034a1 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -139,6 +139,7 @@ int MPID_Comm_failed_bitarray(MPID_Comm *comm_ptr, uint32_t **bitarray, int acke fn_exit: MPIU_CHKLMEM_FREEALL(); + MPIDI_FUNC_EXIT(MPID_STATE_COMM_FAILED_BITARRAY); return mpi_errno; fn_fail: goto fn_exit; ----------------------------------------------------------------------- Summary of changes: src/mpi/attr/win_set_attr.c | 1 + src/mpi/comm/comm_agree.c | 1 + src/mpi/comm/comm_set_info.c | 1 + src/mpi/comm/comm_shrink.c | 1 + src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 54 ++++++++++++-------- .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 2 + .../ch3/channels/nemesis/netmod/wintcp/socksm.c | 2 +- src/mpid/ch3/include/mpidrma.h | 2 +- src/mpid/ch3/src/mpid_comm_agree.c | 1 + src/mpid/ch3/src/mpid_comm_failure_ack.c | 1 + 10 files changed, 42 insertions(+), 24 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-21-gf91a57d
by noreply＠mpich.org 17 Oct '14

17 Oct '14

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 f91a57d30ffba0fad02bb4b36b551e5fcf2a9f2c (commit) via 713eadd7d0278f780dcde3be7ca2189c545256c9 (commit) via ca75812b1d125d32a0b47d6b64f062065ae5bb82 (commit) via ec6af78bdd6e07c2346b48395fd3dc719b81f428 (commit) via ef09dabfbfcd545eded2510c59557c49ec7b2594 (commit) via 803512476afbbb5bbfed01a7fb518a34cbb95e5c (commit) from 1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b (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/f91a57d30ffba0fad02bb4b36b551e5fc… commit f91a57d30ffba0fad02bb4b36b551e5fcf2a9f2c Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Oct 16 09:47:38 2014 -0500 disable interlibrary dependencies on BGQ The default linker behavior on BGQ makes interlibrary dependencies tricky to support correctly. Just disable them to make our lives easier. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index d9f2bb7..f67f86e 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -228,6 +228,13 @@ if test "${pamid_platform}" = "BGQ" ; then dnl dnl Only the 'cpi', 'mpivars', and 'mpichversion' executables have this problem. MPID_LIBTOOL_STATIC_FLAG="-all-static" + + dnl Another bgq special case. The default linker behavior is to use static versions + dnl of libraries. This makes supporting interlibrary dependencies difficult. Just + dnl disable them to make our lives easier. + if test "$INTERLIB_DEPS" = "yes"; then + INTERLIB_DEPS="no" + fi fi if test "${pamid_platform}" = "PE" ; then http://git.mpich.org/mpich.git/commitdiff/713eadd7d0278f780dcde3be7ca2189c5… commit 713eadd7d0278f780dcde3be7ca2189c545256c9 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 14 15:00:46 2014 -0500 Allow ROMIO to propagate library dependencies to MPICH. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/configure.ac b/configure.ac index c7e4592..5c3d291 100644 --- a/configure.ac +++ b/configure.ac @@ -5977,7 +5977,7 @@ AC_DEFINE(HAVE_MPICHCONF,1,[Define so that we can test whether the mpichconf.h f # add the LDFLAGS/LIBS we got so far to WRAPPERs if test "$INTERLIB_DEPS" = "no" ; then WRAPPER_LDFLAGS="$WRAPPER_LDFLAGS $LDFLAGS" - WRAPPER_LIBS="$WRAPPER_LIBS $EXTERNAL_LIBS $ROMIO_EXTERNAL_LIBS" + WRAPPER_LIBS="$WRAPPER_LIBS $EXTERNAL_LIBS" fi if test "$USE_PMI2_API" = "yes" ; then diff --git a/src/mpi/romio/localdefs.in b/src/mpi/romio/localdefs.in index 11edc9e..bf057d1 100644 --- a/src/mpi/romio/localdefs.in +++ b/src/mpi/romio/localdefs.in @@ -1,4 +1,7 @@ #! /bin/sh -ROMIO_EXTERNAL_LIBS="@LIBS@" + +# Append ROMIO library dependencies to the global list +EXTERNAL_LIBS="$EXTERNAL_LIBS @LIBS@" + MPI_OFFSET_TYPE="@MPI_OFFSET_TYPE@" FORTRAN_MPI_OFFSET="@FORTRAN_MPI_OFFSET@" http://git.mpich.org/mpich.git/commitdiff/ca75812b1d125d32a0b47d6b64f062065… commit ca75812b1d125d32a0b47d6b64f062065ae5bb82 Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Tue Oct 7 21:11:27 2014 -0500 MPIDI_Coll_comm_create unsetting default collops for inTERcomms There are no pami optimized collectives available for inTERcomms so when MPIDI_Coll_comm_create is called it checks to see if the comm is an inTRAcomm and if not just returns, however it was doing the new malloc for comm->coll_fns before the if-check which was unsetting the MPICH defaults. The solution is to move the malloc after the inTRAcomm if-check. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 173c352..5359da8 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -227,12 +227,12 @@ void MPIDI_Coll_comm_create(MPID_Comm *comm) if (!MPIDI_Process.optimized.collectives) return; - comm->coll_fns = MPIU_Calloc0(1, MPID_Collops); - MPID_assert(comm->coll_fns != NULL); - if(comm->comm_kind != MPID_INTRACOMM) return; /* Create a geometry */ + comm->coll_fns = MPIU_Calloc0(1, MPID_Collops); + MPID_assert(comm->coll_fns != NULL); + if(comm->mpid.geometry != MPIDI_Process.world_geometry) { if(unlikely(MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_0 && comm->rank == 0)) http://git.mpich.org/mpich.git/commitdiff/ec6af78bdd6e07c2346b48395fd3dc719… commit ec6af78bdd6e07c2346b48395fd3dc719b81f428 Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Tue Oct 7 21:05:26 2014 -0500 MPIDO_Ibarrier optimized pami code incorrect The optimized pami code currently within MPIDO_Ibarrier is incorrect - for now do not run it, instead just kick back to MPICH if mpir_nbc is set, otherwise call the blocking MPIR_Barrier(). Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c index 10607c7..fd33193 100644 --- a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c +++ b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c @@ -34,8 +34,11 @@ int MPIDO_Ibarrier(MPID_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering MPIDO_Ibarrier\n"); - if(unlikely(comm_ptr->mpid.user_selected_type[PAMI_XFER_BARRIER] == MPID_COLL_USE_MPICH)) - { + /* + * There is actually no current pami optimization for this + * so just kick it back to MPICH if mpir_nbc is set, otherwise + * call the blocking MPIR_Barrier(). + */ if (MPIDI_Process.mpir_nbc != 0) return 0; @@ -56,61 +59,4 @@ int MPIDO_Ibarrier(MPID_Comm *comm_ptr, MPID_Request **request) MPIDI_Request_complete_norelease_inline(mpid_request); return rc; - } - - MPIDI_Post_coll_t barrier_post; - pami_xfer_t barrier; - pami_algorithm_t my_barrier; - pami_metadata_t *my_barrier_md; - int queryreq = 0; - - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; - *request = mpid_request; - - barrier.cb_done = cb_ibarrier; - barrier.cookie = (void *)mpid_request; - - if(comm_ptr->mpid.user_selected_type[PAMI_XFER_BARRIER] == MPID_COLL_OPTIMIZED) - { - TRACE_ERR("Optimized barrier (%s) was pre-selected\n", comm_ptr->mpid.opt_protocol_md[PAMI_XFER_BARRIER][0].name); - my_barrier = comm_ptr->mpid.opt_protocol[PAMI_XFER_BARRIER][0]; - my_barrier_md = &comm_ptr->mpid.opt_protocol_md[PAMI_XFER_BARRIER][0]; - queryreq = comm_ptr->mpid.must_query[PAMI_XFER_BARRIER][0]; - } - else - { - TRACE_ERR("Barrier (%s) was specified by user\n", comm_ptr->mpid.user_metadata[PAMI_XFER_BARRIER].name); - my_barrier = comm_ptr->mpid.user_selected[PAMI_XFER_BARRIER]; - my_barrier_md = &comm_ptr->mpid.user_metadata[PAMI_XFER_BARRIER]; - queryreq = comm_ptr->mpid.user_selected_type[PAMI_XFER_BARRIER]; - } - - barrier.algorithm = my_barrier; - /* There is no support for query-required barrier protocols here */ - MPID_assert_always(queryreq != MPID_COLL_ALWAYS_QUERY); - MPID_assert_always(queryreq != MPID_COLL_CHECK_FN_REQUIRED); - - /* TODO Name needs fixed somehow */ - MPIDI_Update_last_algorithm(comm_ptr, my_barrier_md->name); - if(unlikely(MPIDI_Process.verbose >= MPIDI_VERBOSE_DETAILS_ALL && comm_ptr->rank == 0)) - { - unsigned long long int threadID; - MPIU_Thread_id_t tid; - MPIU_Thread_self(&tid); - threadID = (unsigned long long int)tid; - fprintf(stderr,"<%llx> Using protocol %s for barrier on %u\n", - threadID, - my_barrier_md->name, - (unsigned) comm_ptr->context_id); - } - TRACE_ERR("%s barrier\n", MPIDI_Process.context_post.active>0?"posting":"invoking"); - MPIDI_Context_post(MPIDI_Context[0], &barrier_post.state, - MPIDI_Pami_post_wrapper, (void *)&barrier); - TRACE_ERR("barrier %s rc: %d\n", MPIDI_Process.context_post.active>0?"posted":"invoked", rc); - - MPID_Progress_wait_inline(1); - - TRACE_ERR("exiting mpido_ibarrier\n"); - return 0; } http://git.mpich.org/mpich.git/commitdiff/ef09dabfbfcd545eded2510c59557c49e… commit ef09dabfbfcd545eded2510c59557c49ec7b2594 Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Tue Oct 7 20:51:16 2014 -0500 Disable MPIDI_Init_collsel_extension call on BGQ At the end of MPIDI_PAMI_context_init the MPIDI_Init_collsel_extension is called to enable the dynamic optimized collective advisor. This is not supported on BGQ so ifdef out the call. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 51ccd9b..064f085 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -810,8 +810,12 @@ MPIDI_PAMI_context_init(int* threading, int *size) /* Get collective selection advisor and cache it */ /* --------------------------------------------- */ /* Context is created, i.e. collective selection extension is initialized in PAMI. Now I can get the - advisor if I am not in TUNE mode. If in TUNE mode, I can init collsel and generate the table */ + advisor if I am not in TUNE mode. If in TUNE mode, I can init collsel and generate the table. + This is not supported on BGQ. + */ +#ifndef __BGQ_ MPIDI_Init_collsel_extension(); +#endif #if (MPIDI_STATISTICS || MPIDI_PRINTENV) MPIDI_open_pe_extension(); http://git.mpich.org/mpich.git/commitdiff/803512476afbbb5bbfed01a7fb518a34c… commit 803512476afbbb5bbfed01a7fb518a34cbb95e5c Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Tue Oct 7 20:35:59 2014 -0500 Remove Blue Gene/Q specific MPID_VCR_GET_LPIDS Since Blue Gene/Q does not support dynamic tasking there was only 1 element in the MPID_VCR_t data structure so a shortcut was taken to avoid a malloc and free of a new list of pami_task_t in a form the pami geometry creation was expecting. However it seems an array of structures with 1 pami_task_t element in it is not exactly the same in memory as an array of pami_task_t themselves so the pami geometry creation was failing. The fix is to simply do what all other platforms do and malloc a separate list of pami_task_t. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/pamid/include/mpidi_macros.h b/src/mpid/pamid/include/mpidi_macros.h index b8a1b45..5c59753 100644 --- a/src/mpid/pamid/include/mpidi_macros.h +++ b/src/mpid/pamid/include/mpidi_macros.h @@ -133,14 +133,6 @@ _data_sz_out) \ vcr[index]->taskid; \ }) -#ifdef __BGQ__ -/* BGQ just shares the MPICH vcr/tasklist. - This relies on the VCR being a simple task list which is asserted - in static_assertions() in mpid_init.c */ -#define MPID_VCR_GET_LPIDS(comm, taskids) taskids = &((*comm->vcr)->taskid); -#define MPID_VCR_FREE_LPIDS(taskids) -#else -/* non-BGQ mallocs and copies the MPICH vcr/tasklist */ #define MPID_VCR_GET_LPIDS(comm, taskids) \ ({ \ int i; \ @@ -151,8 +143,6 @@ _data_sz_out) \ }) #define MPID_VCR_FREE_LPIDS(taskids) MPIU_Free(taskids) -#endif - #define MPID_GPID_Get(comm_ptr, rank, gpid) \ ({ \ gpid[1] = MPID_VCR_GET_LPID(comm_ptr->vcr, rank); \ ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- src/mpi/romio/localdefs.in | 5 ++- src/mpid/pamid/include/mpidi_macros.h | 10 ---- src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c | 64 ++-------------------- src/mpid/pamid/src/comm/mpid_comm.c | 6 +- src/mpid/pamid/src/mpid_init.c | 6 ++- src/mpid/pamid/subconfigure.m4 | 7 +++ 7 files changed, 25 insertions(+), 75 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-15-g1a4265d
by noreply＠mpich.org 16 Oct '14

16 Oct '14

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 1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b (commit) via 007484728272fce06476159d38c62ddce47e583a (commit) from f0151661c7276b57e39a31c092c8c63de0fb94f0 (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/1a4265d0710eddc5cdcdd6a1599d41e9a… commit 1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Oct 14 18:10:01 2014 -0500 portals4: large threshold comparison If a message size is <= PTL_LARGE_THRESHOLD, use a single operation. Previously, this would generate unnecessary 0-byte operations when messages were exactly the size of the threshold. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index 005b678..15a9345 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -399,7 +399,7 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "count=%d datatype=%#x contig=%d data_sz=%lu", rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz)); - if (data_sz < PTL_LARGE_THRESHOLD) { + if (data_sz <= PTL_LARGE_THRESHOLD) { if (dt_contig) { /* small contig message */ MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "Small contig message"); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index f86cbcc..0ab2bc7 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -202,7 +202,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * MPIDI_Datatype_get_info(count, datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "count=%d datatype=%#x contig=%d data_sz=%lu", count, datatype, dt_contig, data_sz)); - if (data_sz < PTL_LARGE_THRESHOLD) { + if (data_sz <= PTL_LARGE_THRESHOLD) { /* Small message. Send all data eagerly */ if (dt_contig) { MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "Small contig message"); http://git.mpich.org/mpich.git/commitdiff/007484728272fce06476159d38c62ddce… commit 007484728272fce06476159d38c62ddce47e583a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Oct 13 12:29:52 2014 -0500 portals4: remove pointer update from unmatched improbe Previously, the message pointer in an improbe call in the portals4 netmod layer was set to MPI_MESSAGE_NULL if there was no match. This is incorrect because the ch3 layer eventually returns either a valid pointer or NULL. As ch3 already starts the value at NULL, we can just omit the update. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index b7c7dcc..f686381 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -241,7 +241,6 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, i } else { MPID_Request_release(req); - *message = MPI_MESSAGE_NULL; } fn_exit: ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_probe.c | 1 - .../channels/nemesis/netmod/portals4/ptl_recv.c | 2 +- .../channels/nemesis/netmod/portals4/ptl_send.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-13-gf015166
by noreply＠mpich.org 15 Oct '14

15 Oct '14

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 f0151661c7276b57e39a31c092c8c63de0fb94f0 (commit) from c11ccde6bd3e9ceca312d1976c89f344e6560e82 (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/f0151661c7276b57e39a31c092c8c63de… commit f0151661c7276b57e39a31c092c8c63de0fb94f0 Author: Wesley Bland <wbland(a)anl.gov> Date: Tue Oct 14 12:50:41 2014 -0500 Remove MPIR_CVAR_ENABLE_COLL_FT_RET This CVAR was deprecated in MPICH 3.1 and will now be removed for MPICH 3.2. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 1ee252c..c98690c 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -8,32 +8,6 @@ #include "mpiimpl.h" #include "datatype.h" -/* -=== BEGIN_MPI_T_CVAR_INFO_BLOCK === - -categories: - - name : FAULT_TOLERANCE - description : cvars that control fault tolerance behavior - -cvars: - - name : MPIR_CVAR_ENABLE_COLL_FT_RET - category : FAULT_TOLERANCE - type : boolean - default : true - class : device - verbosity : MPI_T_VERBOSITY_USER_BASIC - scope : MPI_T_SCOPE_ALL_EQ - description : >- - DEPRECATED! Will be removed in MPICH-3.2 - Collectives called on a communicator with a failed process - should not hang, however the result of the operation may be - invalid even though the function returns MPI_SUCCESS. This - option enables an experimental feature that will return an error - if the result of the collective is invalid. - -=== END_MPI_T_CVAR_INFO_BLOCK === -*/ - #define COPY_BUFFER_SZ 16384 /* These functions are used in the implementation of collective @@ -293,7 +267,7 @@ int MPIC_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int t MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET) + if (*errflag) MPIR_TAG_SET_ERROR_BIT(tag); MPID_Comm_get_ptr(comm, comm_ptr); @@ -361,8 +335,6 @@ int MPIC_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, MPID_Request_release(request_ptr); } - if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit; - if (source != MPI_PROC_NULL) { if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) { *errflag = TRUE; @@ -407,7 +379,7 @@ int MPIC_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; - if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET) + if (*errflag) MPIR_TAG_SET_ERROR_BIT(tag); mpi_errno = MPID_Ssend(buf, count, datatype, dest, tag, comm_ptr, @@ -459,8 +431,7 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; if (status == MPI_STATUS_IGNORE) status = &mystatus; - if (MPIR_CVAR_ENABLE_COLL_FT_RET) - if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag); + if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag); mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag, comm_ptr, context_id, &recv_req_ptr); @@ -480,8 +451,6 @@ int MPIC_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Request_release(send_req_ptr); MPID_Request_release(recv_req_ptr); - if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit; - if (source != MPI_PROC_NULL) { if (MPIR_TAG_CHECK_ERROR_BIT(status->MPI_TAG)) { *errflag = TRUE; @@ -536,8 +505,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, "**countneg", "**countneg %d", count); if (status == MPI_STATUS_IGNORE) status = &mystatus; - if (MPIR_CVAR_ENABLE_COLL_FT_RET) - if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag); + if (*errflag) MPIR_TAG_SET_ERROR_BIT(sendtag); MPID_Comm_get_ptr(comm, comm_ptr); context_id_offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? @@ -595,7 +563,6 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, MPID_Request_release(sreq); MPID_Request_release(rreq); - if (!MPIR_CVAR_ENABLE_COLL_FT_RET) goto fn_exit; if (mpi_errno) MPIU_ERR_POP(mpi_errno); if (source != MPI_PROC_NULL) { @@ -636,7 +603,7 @@ int MPIC_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int MPIU_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - if (*errflag && MPIR_CVAR_ENABLE_COLL_FT_RET) + if (*errflag) MPIR_TAG_SET_ERROR_BIT(tag); MPID_Comm_get_ptr(comm, comm_ptr); @@ -717,8 +684,7 @@ int MPIC_Waitall(int numreq, MPI_Request requests[], MPI_Status statuses[], int mpi_errno = MPIR_Waitall_impl(numreq, requests, statuses); if (mpi_errno) MPIU_ERR_POP(mpi_errno); - if (*errflag || !MPIR_CVAR_ENABLE_COLL_FT_RET) - goto fn_exit; + if (*errflag) goto fn_exit; for (i = 0; i < numreq; ++i) { if (MPIR_TAG_CHECK_ERROR_BIT(statuses[i].MPI_TAG)) { ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/helper_fns.c | 46 +++++--------------------------------------- 1 files changed, 6 insertions(+), 40 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-12-gc11ccde
by noreply＠mpich.org 14 Oct '14

14 Oct '14

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 c11ccde6bd3e9ceca312d1976c89f344e6560e82 (commit) from 866598b9d77a5c953ff5cc12cda2b78ae713bf33 (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/c11ccde6bd3e9ceca312d1976c89f344e… commit c11ccde6bd3e9ceca312d1976c89f344e6560e82 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Tue Oct 14 13:49:40 2014 -0500 Mark two MPI_Comm_idup related tests as xfail They are known to be failing. Mark them as xfail so they will not send false alarms to other patches. No reviewer. diff --git a/test/mpi/threads/comm/testlist b/test/mpi/threads/comm/testlist index 2dfc780..d3b6b5e 100644 --- a/test/mpi/threads/comm/testlist +++ b/test/mpi/threads/comm/testlist @@ -3,5 +3,5 @@ dup_leak_test 2 comm_dup_deadlock 4 comm_create_threads 4 comm_create_group_threads 4 -comm_idup 4 mpiversion=3.0 -ctxidup 4 +comm_idup 4 mpiversion=3.0 xfail=ticket2108 +ctxidup 4 mpiversion=3.0 xfail=ticket2108 ----------------------------------------------------------------------- Summary of changes: test/mpi/threads/comm/testlist | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-11-g866598b
by noreply＠mpich.org 14 Oct '14

14 Oct '14

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 866598b9d77a5c953ff5cc12cda2b78ae713bf33 (commit) from 3aa3c3369139a862620d4f40c03027fea759ff80 (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/866598b9d77a5c953ff5cc12cda2b78ae… commit 866598b9d77a5c953ff5cc12cda2b78ae713bf33 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 14 12:54:47 2014 -0500 Fixes to the man and www page builds. We need to check both the build and src directories before installing the man and www pages. We were only checking the build directory for man and the src directory for www. Also, make sure to install both the man pages and the www pages on install. Signed-off-by: Sangmin Seo <sseo(a)anl.gov> diff --git a/Makefile.am b/Makefile.am index fe42721..d08430e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -453,7 +453,14 @@ htmldoc-local: $(mpi_sources:.c=.html-phony) $(doc1_src_txt:.txt=.html1-phony) INSTALL_DATA_LOCAL_TARGETS += install-man-local # this is a variation on the recipe that was previously generated by simplemake install-man-local: - @if test -d $(top_builddir)/man && cd $(top_builddir)/man ; then \ + @dir= ; \ + if test -d $(builddir)/man ; then \ + dir=$(builddir)/man ; \ + elif test -d $(srcdir)/man ; then \ + dir=$(srcdir)/man ; \ + fi ; \ + export dir ; \ + if test ! -z $$dir && test -d $$dir && cd $$dir ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ @@ -477,8 +484,16 @@ install-man-local: done ; \ fi +INSTALL_DATA_LOCAL_TARGETS += install-html-local install-html-local: - @if test -d $(builddir)/www && cd $(builddir)/www ; then \ + @dir= ; \ + if test -d $(builddir)/www ; then \ + dir=$(builddir)/www ; \ + elif test -d $(srcdir)/www ; then \ + dir=$(srcdir)/www ; \ + fi ; \ + export dir ; \ + if test ! -z $$dir && test -d $$dir && cd $$dir ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ ----------------------------------------------------------------------- Summary of changes: Makefile.am | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-10-g3aa3c33
by noreply＠mpich.org 14 Oct '14

14 Oct '14

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 3aa3c3369139a862620d4f40c03027fea759ff80 (commit) from 4d07079d6caf14011de77bbbd3a3b1822b2a6451 (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/3aa3c3369139a862620d4f40c03027fea… commit 3aa3c3369139a862620d4f40c03027fea759ff80 Author: Wesley Bland <wbland(a)anl.gov> Date: Tue Oct 14 11:16:13 2014 -0500 Test MPI_IN_PLACE variants of NBCs. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/test/mpi/coll/nonblocking.c b/test/mpi/coll/nonblocking.c index 3a306f5..b9f4f5b 100644 --- a/test/mpi/coll/nonblocking.c +++ b/test/mpi/coll/nonblocking.c @@ -86,48 +86,108 @@ int main(int argc, char **argv) MPI_Igather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + if (0 == rank) + MPI_Igather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); + else + MPI_Igather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Igatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + if (0 == rank) + MPI_Igatherv(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); + else + MPI_Igatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + if (0 == rank) + MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); + else + MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + if (0 == rank) + MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); + else + MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgatherv(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoall(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoall(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallv(sbuf, scounts, sdispls, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallv(MPI_IN_PLACE, NULL, NULL, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallw(sbuf, scounts, sdispls, types, rbuf, rcounts, rdispls, types, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallw(MPI_IN_PLACE, NULL, NULL, NULL, rbuf, rcounts, rdispls, types, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + if (0 == rank) + MPI_Ireduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); + else + MPI_Ireduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallreduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallreduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter(sbuf, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter(MPI_IN_PLACE, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter_block(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter_block(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iexscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iexscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + if (sbuf) free(sbuf); if (rbuf) free(rbuf); if (scounts) free(scounts); ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/nonblocking.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-9-g4d07079
by noreply＠mpich.org 13 Oct '14

13 Oct '14

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 4d07079d6caf14011de77bbbd3a3b1822b2a6451 (commit) from bc9ce83ea2cb8cdf975811a66bcca59b34c1563c (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/4d07079d6caf14011de77bbbd3a3b1822… commit 4d07079d6caf14011de77bbbd3a3b1822b2a6451 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Oct 10 16:30:16 2014 -0500 portals4: PTL_EVENT_PUT is only valid at the target Remove incorrect event from send handler assertion. PTL_EVENT_PUT should only be seen at the target. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index 12b942c..f86cbcc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -20,7 +20,7 @@ static int handler_send_complete(const ptl_event_t *e) MPIDI_FUNC_ENTER(MPID_STATE_HANDLER_SEND_COMPLETE); - MPIU_Assert(e->type == PTL_EVENT_ACK || e->type == PTL_EVENT_PUT || e->type == PTL_EVENT_GET); + MPIU_Assert(e->type == PTL_EVENT_ACK || e->type == PTL_EVENT_GET); if (REQ_PTL(sreq)->md != PTL_INVALID_HANDLE) { ret = PtlMDRelease(REQ_PTL(sreq)->md); ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-8-gbc9ce83
by noreply＠mpich.org 10 Oct '14

10 Oct '14

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 bc9ce83ea2cb8cdf975811a66bcca59b34c1563c (commit) from dd62e80936512f3bf9e69ff466ff462202b44d00 (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/bc9ce83ea2cb8cdf975811a66bcca59b3… commit bc9ce83ea2cb8cdf975811a66bcca59b34c1563c Author: Wesley Bland <wbland(a)anl.gov> Date: Fri Oct 10 23:51:56 2014 -0500 Revert "Test MPI_IN_PLACE variants of NBCs." This reverts commit dd62e80936512f3bf9e69ff466ff462202b44d00. diff --git a/test/mpi/coll/nonblocking.c b/test/mpi/coll/nonblocking.c index bbd2f95..3a306f5 100644 --- a/test/mpi/coll/nonblocking.c +++ b/test/mpi/coll/nonblocking.c @@ -86,93 +86,48 @@ int main(int argc, char **argv) MPI_Igather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Igather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Igatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Igatherv(NULL, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallgather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallgather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallgatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallgatherv(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoall(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoall(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoallv(sbuf, scounts, sdispls, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoallv(MPI_IN_PLACE, NULL, NULL, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoallw(sbuf, scounts, sdispls, types, rbuf, rcounts, rdispls, types, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ialltoallw(MPI_IN_PLACE, NULL, NULL, NULL, rbuf, rcounts, rdispls, types, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallreduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iallreduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce_scatter(sbuf, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce_scatter(MPI_IN_PLACE, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce_scatter_block(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Ireduce_scatter_block(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iexscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); - MPI_Iexscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); - MPI_Wait(&req, MPI_STATUS_IGNORE); - if (sbuf) free(sbuf); if (rbuf) free(rbuf); if (scounts) free(scounts); ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/nonblocking.c | 45 ------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) hooks/post-receive -- MPICH primary repository

1 0