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

[mpich] MPICH primary repository branch, master, updated. v3.2a1-30-gbb8f2b9
by noreply＠mpich.org 30 Sep '14

30 Sep '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 bb8f2b9a7ae4f624bb3fbf16a56d085326159582 (commit) from 0e945ae71025b195bb1211407785ebd2c7817776 (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/bb8f2b9a7ae4f624bb3fbf16a56d08532… commit bb8f2b9a7ae4f624bb3fbf16a56d085326159582 Author: Nysal Jan K.A <jnysal(a)in.ibm.com> Date: Tue Sep 30 09:54:25 2014 -0400 pamid: Fix a hang in scatter The logic used to periodically issue a barrier for PAMI algorithms that request flow control was erroneous. The root ended up issuing a barrier before the non-root tasks. (ibm) D199034 Signed-off-by: Sameh Sharkawi <sssharka(a)us.ibm.com> diff --git a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c index b034064..4e76fad 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c @@ -331,72 +331,53 @@ int MPIDO_Scatter_simple(const void *sendbuf, int success = 1, snd_contig = 1, rcv_contig = 1; void *snd_noncontig_buff = NULL, *rcv_noncontig_buff = NULL; void *sbuf = NULL, *rbuf = NULL; - size_t send_size = 0; - size_t recv_size = 0; + size_t send_size = 0, recv_size = 0, data_size = 0; MPI_Aint snd_true_lb = 0, rcv_true_lb = 0; MPID_Segment segment; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); const int size = comm_ptr->local_size; + advisor_algorithm_t advisor_algorithms[1]; - if (rank == root && sendtype != MPI_DATATYPE_NULL && sendcount >= 0) + if (rank == root) { - MPIDI_Datatype_get_info(sendcount, sendtype, snd_contig, - send_size, data_ptr, snd_true_lb); - if(MPIDI_Pamix_collsel_advise != NULL && mpid->collsel_fast_query != NULL) - { - advisor_algorithm_t advisor_algorithms[1]; - int num_algorithms = MPIDI_Pamix_collsel_advise(mpid->collsel_fast_query, PAMI_XFER_SCATTER, send_size, advisor_algorithms, 1); - if(num_algorithms) - { - if(advisor_algorithms[0].algorithm_type == COLLSEL_EXTERNAL_ALGO) - { - return MPIR_Scatter(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, - root, comm_ptr, mpierrno); - } - else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) - { - comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; - int tmpmpierrno; - MPIDO_Barrier(comm_ptr, &tmpmpierrno); - } - } + MPIDI_Datatype_get_info(sendcount, sendtype, snd_contig, + send_size, data_ptr, snd_true_lb); + + if (recvbuf != MPI_IN_PLACE && recvtype != MPI_DATATYPE_NULL && recvcount >= 0) + { + MPIDI_Datatype_get_info(recvcount, recvtype, rcv_contig, + recv_size, data_ptr, rcv_true_lb); } + data_size = send_size; } - - if (recvtype != MPI_DATATYPE_NULL && recvcount >= 0) + else if (recvtype != MPI_DATATYPE_NULL && recvcount >= 0) { MPIDI_Datatype_get_info(recvcount, recvtype, rcv_contig, recv_size, data_ptr, rcv_true_lb); - if(MPIDI_Pamix_collsel_advise != NULL && mpid->collsel_fast_query != NULL) + data_size = recv_size; + } + + advisor_algorithms[0].metadata = NULL;/* We check for NULL further down */ + if(MPIDI_Pamix_collsel_advise != NULL && mpid->collsel_fast_query != NULL) + { + int num_algorithms = MPIDI_Pamix_collsel_advise(mpid->collsel_fast_query, + PAMI_XFER_SCATTER, data_size, advisor_algorithms, 1); + if(num_algorithms) { - advisor_algorithm_t advisor_algorithms[1]; - int num_algorithms = MPIDI_Pamix_collsel_advise(mpid->collsel_fast_query, PAMI_XFER_SCATTER, recv_size, advisor_algorithms, 1); - if(num_algorithms) + if(advisor_algorithms[0].algorithm_type == COLLSEL_EXTERNAL_ALGO) { - if(advisor_algorithms[0].algorithm_type == COLLSEL_EXTERNAL_ALGO) - { - return MPIR_Scatter(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, - root, comm_ptr, mpierrno); - } - else if(advisor_algorithms[0].metadata && advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && !(--(comm_ptr->mpid.num_requests))) - { - comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; - int tmpmpierrno; - MPIDO_Barrier(comm_ptr, &tmpmpierrno); - } - + return MPIR_Scatter(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, + root, comm_ptr, mpierrno); } } } sbuf = (char *)sendbuf + snd_true_lb; rbuf = (char *)recvbuf + rcv_true_lb; if (rank == root) - { + { if (send_size) { - sbuf = (char *)sendbuf + snd_true_lb; if (!snd_contig) { snd_noncontig_buff = MPIU_Malloc(send_size * size); @@ -418,7 +399,6 @@ int MPIDO_Scatter_simple(const void *sendbuf, { if (recv_size) { - rbuf = (char *)recvbuf + rcv_true_lb; if (!rcv_contig) { rcv_noncontig_buff = MPIU_Malloc(recv_size); @@ -433,12 +413,10 @@ int MPIDO_Scatter_simple(const void *sendbuf, else success = 0; } } - else { if (recv_size)/* Should this be send or recv? */ { - rbuf = (char *)recvbuf + rcv_true_lb; if (!rcv_contig) { rcv_noncontig_buff = MPIU_Malloc(recv_size); @@ -462,6 +440,15 @@ int MPIDO_Scatter_simple(const void *sendbuf, root, comm_ptr, mpierrno); } + if(advisor_algorithms[0].metadata && + advisor_algorithms[0].metadata->check_correct.values.asyncflowctl && + !(--(comm_ptr->mpid.num_requests))) + { + comm_ptr->mpid.num_requests = MPIDI_Process.optimized.num_requests; + int tmpmpierrno; + MPIDO_Barrier(comm_ptr, &tmpmpierrno); + } + pami_xfer_t scatter; MPIDI_Post_coll_t scatter_post; volatile unsigned scatter_active = 1; @@ -483,8 +470,7 @@ int MPIDO_Scatter_simple(const void *sendbuf, { scatter.cmd.xfer_scatter.rcvbuf = PAMI_IN_PLACE; } - - + TRACE_ERR("%s scatter\n", MPIDI_Process.context_post.active>0?"Posting":"Invoking"); MPIDI_Context_post(MPIDI_Context[0], &scatter_post.state, MPIDI_Pami_post_wrapper, (void *)&scatter); ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/coll/scatter/mpido_scatter.c | 86 ++++++++++------------- 1 files changed, 36 insertions(+), 50 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-29-g0e945ae
by noreply＠mpich.org 28 Sep '14

28 Sep '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 0e945ae71025b195bb1211407785ebd2c7817776 (commit) via aa36f043253d93e11a1de3c8fa10410de72e7a3d (commit) via 32596b62b8d4b85cca3424a85fae216843b20e06 (commit) from 52a42c266c6d5610a99ed14b0d82c3d392a8df8e (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/0e945ae71025b195bb1211407785ebd2c… commit 0e945ae71025b195bb1211407785ebd2c7817776 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 25 14:18:53 2014 -0500 Add a RMA test for target side completion in Active Target. In this test, during Active Target epoch, the origin process issues a large GET operation followed by a small PUT operation to the target process. Win_wait / Win_fence should guarantee all operations are completed at target when they returns. So after they return, we make the target process to update one window location accessed by that GET before. The GET operation should not get the updated value. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 5975aea..13529c3 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -136,7 +136,8 @@ noinst_PROGRAMS = \ nb_test \ acc-loc \ fence_shm \ - get-struct + get-struct \ + at_complete strided_acc_indexed_LDADD = $(LDADD) -lm strided_acc_onelock_LDADD = $(LDADD) -lm diff --git a/test/mpi/rma/at_complete.c b/test/mpi/rma/at_complete.c new file mode 100644 index 0000000..9ba38a3 --- /dev/null +++ b/test/mpi/rma/at_complete.c @@ -0,0 +1,129 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2014 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include <stdio.h> +#include <mpi.h> + +#define PUT_SIZE 1 +#define GET_SIZE 100000 +#define WIN_SIZE (PUT_SIZE+GET_SIZE) +#define LOOP 100 + +int main (int argc, char **argv) { + MPI_Win win; + int i, k, rank, nproc; + int win_buf[WIN_SIZE], orig_get_buf[GET_SIZE], orig_put_buf[PUT_SIZE]; + int orig_rank = 0, dest_rank = 1; + int errors = 0; + MPI_Group comm_group, orig_group, dest_group; + + MPI_Init(&argc, &argv); + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + MPI_Comm_group(MPI_COMM_WORLD, &comm_group); + MPI_Group_incl(comm_group, 1, &orig_rank, &orig_group); + MPI_Group_incl(comm_group, 1, &dest_rank, &dest_group); + + for (i = 0; i < PUT_SIZE; i++) orig_put_buf[i] = 1; + for (i = 0; i < GET_SIZE; i++) orig_get_buf[i] = 0; + for (i = 0; i < WIN_SIZE; i++) win_buf[i] = 1; + + MPI_Win_create(win_buf, sizeof(int) * WIN_SIZE, sizeof(int), MPI_INFO_NULL, + MPI_COMM_WORLD, &win); + + for (k = 0; k < LOOP; k++) { + + /* test for FENCE */ + + if (rank == orig_rank) { + MPI_Win_fence(MPI_MODE_NOPRECEDE, win); + MPI_Get(orig_get_buf, GET_SIZE, MPI_INT, + dest_rank, PUT_SIZE/*disp*/, GET_SIZE, MPI_INT, win); + MPI_Put(orig_put_buf, PUT_SIZE, MPI_INT, + dest_rank, 0/*disp*/, PUT_SIZE, MPI_INT, win); + MPI_Win_fence(MPI_MODE_NOSUCCEED, win); + + /* check GET result values */ + for (i = 0; i < GET_SIZE; i++) { + if (orig_get_buf[i] != 1) { + printf("LOOP=%d, FENCE, orig_get_buf[%d] = %d, expected 1.\n", + k, i, orig_get_buf[i]); + errors++; + } + } + } else if (rank == dest_rank) { + MPI_Win_fence(MPI_MODE_NOPRECEDE, win); + MPI_Win_fence(MPI_MODE_NOSUCCEED, win); + + /* modify the last element in window */ + MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win); + win_buf[WIN_SIZE-1] = 2; + MPI_Win_unlock(rank, win); + } + + MPI_Barrier(MPI_COMM_WORLD); + /* reset buffers */ + for (i = 0; i < PUT_SIZE; i++) orig_put_buf[i] = 1; + for (i = 0; i < GET_SIZE; i++) orig_get_buf[i] = 0; + MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win); + for (i = 0; i < WIN_SIZE; i++) win_buf[i] = 1; + MPI_Win_unlock(rank, win); + MPI_Barrier(MPI_COMM_WORLD); + + /* test for PSCW */ + + if (rank == orig_rank) { + MPI_Win_start(dest_group, 0, win); + MPI_Get(orig_get_buf, GET_SIZE, MPI_INT, + dest_rank, PUT_SIZE/*disp*/, GET_SIZE, MPI_INT, win); + MPI_Put(orig_put_buf, PUT_SIZE, MPI_INT, + dest_rank, 0/*disp*/, PUT_SIZE, MPI_INT, win); + MPI_Win_complete(win); + + /* check GET result values */ + for (i = 0; i < GET_SIZE; i++) { + if (orig_get_buf[i] != 1) { + printf("LOOP=%d, PSCW, orig_get_buf[%d] = %d, expected 1.\n", + k, i, orig_get_buf[i]); + errors++; + } + } + } + else if (rank == dest_rank) { + MPI_Win_post(orig_group, 0, win); + MPI_Win_wait(win); + + /* modify the last element in window */ + MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win); + win_buf[WIN_SIZE-1] = 2; + MPI_Win_unlock(rank, win); + } + + MPI_Barrier(MPI_COMM_WORLD); + /* reset buffers */ + for (i = 0; i < PUT_SIZE; i++) orig_put_buf[i] = 1; + for (i = 0; i < GET_SIZE; i++) orig_get_buf[i] = 0; + MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, win); + for (i = 0; i < WIN_SIZE; i++) win_buf[i] = 1; + MPI_Win_unlock(rank, win); + MPI_Barrier(MPI_COMM_WORLD); + } + + MPI_Win_free(&win); + + MPI_Group_free(&orig_group); + MPI_Group_free(&dest_group); + MPI_Group_free(&comm_group); + + if (rank == orig_rank && errors == 0) { + printf(" No Errors\n"); + } + + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index cd867c5..d13d7cf 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -121,6 +121,7 @@ fence_shm 2 mpiversion=3.0 win_shared_zerobyte 4 mpiversion=3.0 win_shared_put_flush_get 4 mpiversion=3.0 get-struct 2 +at_complete 2 ## This test is not strictly correct. This was meant to test out the ## case when MPI_Test is not nonblocking. However, we ended up http://git.mpich.org/mpich.git/commitdiff/aa36f043253d93e11a1de3c8fa10410de… commit aa36f043253d93e11a1de3c8fa10410de72e7a3d Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Sep 25 13:21:23 2014 -0500 Fix completion on target side in Active Target synchronization. For Active Target synchronization, the original implementation does not guarantee the completion of all ops on target side when Win_wait / Win_fence returns. It is implemented using a counter, which is decremented when the last operation from that origin finishes. Win_wait / Win_fence waits until that counter reaches zero. Problem is that, when the last operation finishes, the previous GET-like operation (for example with a large data volume) may have not finished yet. This breaks the semantic of Win_wait / Win_fence. Here we fix this by increment the counter whenever we meet a GET-like operation, and decrement it when that operation finishes on target side. This will guarantee that when counter reaches zero and Win_wait / Win_fence returns, all operations are completed on the target. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 4d07c94..df5583a 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -82,6 +82,7 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, int *complete ) { int mpi_errno = MPI_SUCCESS; + int get_acc_flag = 0; MPID_Win *win_ptr; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTACCUMRESPCOMPLETE); @@ -139,6 +140,8 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, /* Mark get portion as handled */ rreq->dev.resp_request_handle = MPI_REQUEST_NULL; + + get_acc_flag = 1; } MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); @@ -161,6 +164,13 @@ int MPIDI_CH3_ReqHandler_PutAccumRespComplete( MPIDI_VC_t *vc, rreq->dev.source_win_handle); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } + if (get_acc_flag) { + /* here we decrement the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter--; + MPIU_Assert(win_ptr->my_counter >= 0); + } + /* mark data transfer as complete and decrement CC */ MPIDI_CH3U_Request_complete(rreq); *complete = TRUE; @@ -571,6 +581,11 @@ int MPIDI_CH3_ReqHandler_FOPComplete( MPIDI_VC_t *vc, rreq->dev.source_win_handle); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } + /* here we decrement the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter--; + MPIU_Assert(win_ptr->my_counter >= 0); + *complete = 1; fn_exit: @@ -1189,6 +1204,10 @@ static int do_simple_get(MPID_Win *win_ptr, MPIDI_Win_lock_queue *lock_queue) req->kind = MPID_REQUEST_SEND; req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendRespComplete; req->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendRespComplete; + + /* here we increment the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter++; MPIDI_Pkt_init(get_resp_pkt, MPIDI_CH3_PKT_GET_RESP); get_resp_pkt->request_handle = lock_queue->pt_single_op->request_handle; diff --git a/src/mpid/ch3/src/ch3u_handle_send_req.c b/src/mpid/ch3/src/ch3u_handle_send_req.c index 47026d5..78d740c 100644 --- a/src/mpid/ch3/src/ch3u_handle_send_req.c +++ b/src/mpid/ch3/src/ch3u_handle_send_req.c @@ -55,6 +55,11 @@ int MPIDI_CH3_ReqHandler_GetSendRespComplete( MPIDI_VC_t *vc ATTRIBUTE((unused)) mpi_errno = MPIDI_CH3_Finish_rma_op_target(NULL, win_ptr, FALSE, sreq->dev.flags, MPI_WIN_NULL); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } + /* here we decrement the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter--; + MPIU_Assert(win_ptr->my_counter >= 0); + /* mark data transfer as complete and decrement CC */ MPIDI_CH3U_Request_complete(sreq); *complete = TRUE; diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 3944655..19e8b60 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1269,7 +1269,7 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) RMA ops on its window */ /* first initialize the completion counter. */ - win_ptr->my_counter = comm_size; + win_ptr->my_counter += comm_size; mpi_errno = MPIR_Reduce_scatter_block_impl(MPI_IN_PLACE, rma_target_proc, 1, MPI_INT, MPI_SUM, comm_ptr, &errflag); @@ -1286,8 +1286,8 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) /* Set the completion counter */ /* FIXME: MT: this needs to be done atomically because other procs have the address and could decrement it. */ - win_ptr->my_counter = win_ptr->my_counter - comm_size + - rma_target_proc[0]; + win_ptr->my_counter -= comm_size; + win_ptr->my_counter += rma_target_proc[0]; MPIR_T_PVAR_TIMER_START(RMA, rma_winfence_issue); MPIR_T_PVAR_COUNTER_INC(RMA, rma_winfence_issue_aux, total_op_count); @@ -2292,7 +2292,7 @@ int MPIDI_Win_post(MPID_Group *post_grp_ptr, int assert, MPID_Win *win_ptr) } /* initialize the completion counter */ - win_ptr->my_counter = post_grp_size; + win_ptr->my_counter += post_grp_size; if ((assert & MPI_MODE_NOCHECK) == 0) { @@ -4600,6 +4600,10 @@ int MPIDI_CH3_PktHandler_Get( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.target_win_handle = get_pkt->target_win_handle; req->dev.source_win_handle = get_pkt->source_win_handle; req->dev.flags = get_pkt->flags; + + /* here we increment the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter++; if (MPIR_DATATYPE_IS_PREDEFINED(get_pkt->datatype)) { @@ -4733,6 +4737,12 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req = MPID_Request_create(); MPIU_Object_set_ref(req, 1); *rreqp = req; + + if (accum_pkt->type == MPIDI_CH3_PKT_GET_ACCUM) { + /* here we increment the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter++; + } req->dev.user_count = accum_pkt->count; req->dev.op = accum_pkt->op; @@ -5086,6 +5096,10 @@ int MPIDI_CH3_PktHandler_FOP( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIU_Object_set_ref(req, 1); /* Ref is held by progress engine */ *rreqp = NULL; + /* here we increment the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter++; + req->dev.user_buf = NULL; /* will be set later */ req->dev.user_count = 1; req->dev.datatype = fop_pkt->datatype; @@ -5511,6 +5525,10 @@ int MPIDI_CH3_PktHandler_LockGetUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendRespComplete; req->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendRespComplete; req->kind = MPID_REQUEST_SEND; + + /* here we increment the Active Target counter to guarantee the GET-like + operation are completed when counter reaches zero. */ + win_ptr->my_counter++; MPIDI_Pkt_init(get_resp_pkt, MPIDI_CH3_PKT_GET_RESP); get_resp_pkt->request_handle = lock_get_unlock_pkt->request_handle; http://git.mpich.org/mpich.git/commitdiff/32596b62b8d4b85cca3424a85fae21684… commit 32596b62b8d4b85cca3424a85fae216843b20e06 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Sep 24 21:28:10 2014 -0500 Revert "Bug-fix: waiting for ACKs for Active Target Synchronization." This reverts commit 7418944673507d4fd3d3025e9e5ecfde809e9210. diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index ffb6802..76ef00f 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -302,7 +302,6 @@ struct MPIDI_Win_target_state { int start_assert; /* assert passed to MPI_Win_start */ \ int shm_allocated; /* flag: TRUE iff this window has a shared memory \ region associated with it */ \ - int ack_counter; /* counter for acknowledgement message at origin */ \ #ifdef MPIDI_CH3_WIN_DECL #define MPID_DEV_WIN_DECL \ diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 918423f..3944655 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1308,11 +1308,6 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) if (curr_ops_cnt[curr_ptr->target_rank] == nops_to_proc[curr_ptr->target_rank] - 1) { flags = MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE; - if (curr_ptr->type == MPIDI_RMA_PUT || - curr_ptr->type == MPIDI_RMA_ACCUMULATE) { - flags |= MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK; - win_ptr->ack_counter++; - } } source_win_handle = win_ptr->handle; @@ -1385,12 +1380,11 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) finish_up: /* wait for all operations from other processes to finish */ - /* waiting for acknowledgement packets from targets to arrive */ - if (win_ptr->my_counter || win_ptr->ack_counter) + if (win_ptr->my_counter) { MPIR_T_PVAR_TIMER_START(RMA, rma_winfence_wait); MPID_Progress_start(&progress_state); - while (win_ptr->my_counter || win_ptr->ack_counter) + while (win_ptr->my_counter) { mpi_errno = MPID_Progress_wait(&progress_state); /* --BEGIN ERROR HANDLING-- */ @@ -2609,7 +2603,6 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) MPID_Comm *comm_ptr; MPI_Win source_win_handle, target_win_handle; int start_grp_size, *ranks_in_win_grp, rank; - MPID_Progress_state progress_state; int nRequest = 0; int nRequestNew = 0; MPIU_CHKLMEM_DECL(6); @@ -2621,6 +2614,12 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) win_ptr->epoch_state != MPIDI_EPOCH_START, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); + /* Track access epoch state */ + if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) + win_ptr->epoch_state = MPIDI_EPOCH_POST; + else + win_ptr->epoch_state = MPIDI_EPOCH_NONE; + comm_ptr = win_ptr->comm_ptr; comm_size = comm_ptr->local_size; @@ -2701,11 +2700,6 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) if (curr_ops_cnt[curr_ptr->target_rank] == nops_to_proc[curr_ptr->target_rank] - 1) { flags = MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE; - if (curr_ptr->type == MPIDI_RMA_PUT || - curr_ptr->type == MPIDI_RMA_ACCUMULATE) { - win_ptr->ack_counter++; - flags |= MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK; - } } source_win_handle = win_ptr->handle; @@ -2808,33 +2802,10 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) } MPIU_Assert(MPIDI_CH3I_RMA_Ops_isempty(ops_list)); - - /* waiting for acknowledgement packets from targets to arrive */ - if (win_ptr->ack_counter) - { - MPID_Progress_start(&progress_state); - while (win_ptr->ack_counter) - { - mpi_errno = MPID_Progress_wait(&progress_state); - /* --BEGIN ERROR HANDLING-- */ - if (mpi_errno != MPI_SUCCESS) { - MPID_Progress_end(&progress_state); - MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**winnoprogress"); - } - /* --END ERROR HANDLING-- */ - } - MPID_Progress_end(&progress_state); - } /* free the group stored in window */ MPIR_Group_release(win_ptr->start_group_ptr); win_ptr->start_group_ptr = NULL; - - /* Track access epoch state */ - if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) - win_ptr->epoch_state = MPIDI_EPOCH_POST; - else - win_ptr->epoch_state = MPIDI_EPOCH_NONE; fn_exit: MPIU_CHKLMEM_FREEALL(); @@ -5836,21 +5807,12 @@ int MPIDI_CH3_PktHandler_PtRMADone( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); MPID_Win_get_ptr(pt_rma_done_pkt->source_win_handle, win_ptr); - - if (win_ptr->epoch_state == MPIDI_EPOCH_FENCE || - win_ptr->epoch_state == MPIDI_EPOCH_PSCW || - win_ptr->epoch_state == MPIDI_EPOCH_START) { - win_ptr->ack_counter--; - MPIU_Assert(win_ptr->ack_counter >= 0); - } - else { MPIU_Assert(win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state != MPIDI_CH3_WIN_LOCK_NONE); if (win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state == MPIDI_CH3_WIN_LOCK_FLUSH) win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state = MPIDI_CH3_WIN_LOCK_GRANTED; else win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state = MPIDI_CH3_WIN_LOCK_NONE; - } *rreqp = NULL; MPIDI_CH3_Progress_signal_completion(); @@ -6175,11 +6137,6 @@ int MPIDI_CH3_Finish_rma_op_target(MPIDI_VC_t *vc, MPID_Win *win_ptr, int is_rma win_ptr->my_counter -= 1; MPIU_Assert(win_ptr->my_counter >= 0); - if (flags & MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK) { - mpi_errno = MPIDI_CH3I_Send_pt_rma_done_pkt(vc, win_ptr, source_win_handle); - if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); - } - /* Signal the local process when the op counter reaches 0. */ if (win_ptr->my_counter == 0) MPIDI_CH3_Progress_signal_completion(); diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 8bfe842..c112db0 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -299,7 +299,6 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, (*win_ptr)->epoch_count = 0; (*win_ptr)->at_rma_ops_list = NULL; (*win_ptr)->shm_allocated = FALSE; - (*win_ptr)->ack_counter = 0; /* Initialize the passive target lock state */ MPIU_CHKPMEM_MALLOC((*win_ptr)->targets, struct MPIDI_Win_target_state *, ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidpre.h | 1 - src/mpid/ch3/src/ch3u_handle_recv_req.c | 19 +++++ src/mpid/ch3/src/ch3u_handle_send_req.c | 5 + src/mpid/ch3/src/ch3u_rma_sync.c | 85 +++++++------------- src/mpid/ch3/src/mpid_rma.c | 1 - test/mpi/rma/Makefile.am | 3 +- test/mpi/rma/at_complete.c | 129 +++++++++++++++++++++++++++++++ test/mpi/rma/testlist.in | 1 + 8 files changed, 186 insertions(+), 58 deletions(-) create mode 100644 test/mpi/rma/at_complete.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-26-g52a42c2
by noreply＠mpich.org 26 Sep '14

26 Sep '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 52a42c266c6d5610a99ed14b0d82c3d392a8df8e (commit) from f0c8fe8eda452fc7b08726b8c782af010990d505 (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/52a42c266c6d5610a99ed14b0d82c3d39… commit 52a42c266c6d5610a99ed14b0d82c3d392a8df8e Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Sep 23 13:31:58 2014 -0500 add libraries needed to build MPICH to EXTERNAL_LIBS Libraries needed to build MPICH (and ROMIO) were missing from EXTERNAL_LIBS. This posed an issue when interlibrary dependencies were not supported, as in static builds, causing user programs to fail to build. Fixes #2172 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/configure.ac b/configure.ac index 2ce0acf..c7e4592 100644 --- a/configure.ac +++ b/configure.ac @@ -5283,6 +5283,7 @@ case $with_thread_package in AC_CHECK_LIB([pthread],[pthread_key_create],have_pthreads=yes) if test "$have_pthreads" = "yes" ; then PAC_PREPEND_FLAG([-lpthread],[LIBS]) + PAC_PREPEND_FLAG([-lpthread],[EXTERNAL_LIBS]) fi AC_CHECK_FUNCS(pthread_yield) @@ -5976,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" + WRAPPER_LIBS="$WRAPPER_LIBS $EXTERNAL_LIBS $ROMIO_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 5b3d670..11edc9e 100644 --- a/src/mpi/romio/localdefs.in +++ b/src/mpi/romio/localdefs.in @@ -1,4 +1,4 @@ #! /bin/sh -LIBS="@LIBS@" +ROMIO_EXTERNAL_LIBS="@LIBS@" MPI_OFFSET_TYPE="@MPI_OFFSET_TYPE@" FORTRAN_MPI_OFFSET="@FORTRAN_MPI_OFFSET@" ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 ++- src/mpi/romio/localdefs.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-25-gf0c8fe8
by noreply＠mpich.org 25 Sep '14

25 Sep '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 f0c8fe8eda452fc7b08726b8c782af010990d505 (commit) from 239010d56ee5a7a28d337fb76ae0abb41409b333 (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/f0c8fe8eda452fc7b08726b8c782af010… commit f0c8fe8eda452fc7b08726b8c782af010990d505 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Sep 24 13:41:52 2014 -0500 portals4: support for MPI_ANY_TAG recvs Ignore tag matching when MPI_ANY_TAG is passed to a recv operation. Signed-off-by: Sangmin Seo <sseo(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 3db3bbe..1e469f1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -390,7 +390,11 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "tag=%#x ctx=%#x rank=%#x", rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id, rreq->dev.match.parts.rank)); me.match_bits = NPTL_MATCH(rreq->dev.match.parts.tag, rreq->dev.match.parts.context_id, rreq->dev.match.parts.rank); - me.ignore_bits = NPTL_MATCH_IGNORE; + if (rreq->dev.match.parts.tag == MPI_ANY_TAG) + me.ignore_bits = NPTL_MATCH_IGNORE_ANY_TAG; + else + me.ignore_bits = NPTL_MATCH_IGNORE; + me.min_free = 0; MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); ----------------------------------------------------------------------- Summary of changes: .../channels/nemesis/netmod/portals4/ptl_recv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-24-g239010d
by noreply＠mpich.org 24 Sep '14

24 Sep '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 239010d56ee5a7a28d337fb76ae0abb41409b333 (commit) from 2479d8922a29cb9c000aaef9c5d8e29bccbd931e (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/239010d56ee5a7a28d337fb76ae0abb41… commit 239010d56ee5a7a28d337fb76ae0abb41409b333 Author: Sameh Sharkawi <sssharka(a)us.ibm.com> Date: Wed Sep 24 17:29:05 2014 -0400 pamid: Fix for configure error in src/mpid/pamid/subconfigure.m4 diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index c9160e0..d9f2bb7 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -25,6 +25,7 @@ dnl _PREREQ handles the former role of mpichprereq, setup_device, etc [#] expansion is: PAC_SUBCFG_PREREQ_[]PAC_SUBCFG_AUTO_SUFFIX AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ AM_CONDITIONAL([BUILD_PAMID],[test "$device_name" = "pamid"]) +AM_CONDITIONAL([QUEUE_BINARY_SEARCH_SUPPORT],[test "$enable_queue_binary_search" = "yes"]) AC_ARG_VAR([PAMILIBNAME],[can be used to override the name of the PAMI library (default: "pami")]) original_PAMILIBNAME=${PAMILIBNAME} @@ -109,8 +110,6 @@ if test "${pamid_platform}" = "BGQ" ; then enable_queue_binary_search=no fi -AC_ARG_ENABLE(queue-binary-search, - AC_HELP_STRING([--queue-binary-search], [Enable C++ binary search]),enable_queue_binary_search=no,enable_queue_binary_search=yes) AM_CONDITIONAL([QUEUE_BINARY_SEARCH_SUPPORT],[test "$enable_queue_binary_search" = "yes"]) dnl ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/subconfigure.m4 | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-23-g2479d89
by noreply＠mpich.org 24 Sep '14

24 Sep '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 2479d8922a29cb9c000aaef9c5d8e29bccbd931e (commit) from 9d53f02b923994a31e54d294aa2f81ebe289aa37 (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/2479d8922a29cb9c000aaef9c5d8e29bc… commit 2479d8922a29cb9c000aaef9c5d8e29bccbd931e Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Mon Sep 22 13:15:40 2014 -0500 Added mb in flush handler. Resolves #2177. Since flush call guarantees the completion of operations on target side, a memory barrier on target side is necessary in order to ensure all store instructions are exactly performed before that flush call finished on origin side. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 3e2daf0..918423f 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -6205,6 +6205,10 @@ int MPIDI_CH3_Finish_rma_op_target(MPIDI_VC_t *vc, MPID_Win *win_ptr, int is_rma MPIDI_CH3_Progress_signal_completion(); } else if (flags & MPIDI_CH3_PKT_FLAG_RMA_FLUSH) { + /* Ensure store instructions have been performed before flush call is + * finished on origin process. */ + OPA_read_write_barrier(); + if (flags & MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK) { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_flush_t *flush_pkt = &upkt.flush; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_rma_sync.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-22-g9d53f02
by noreply＠mpich.org 23 Sep '14

23 Sep '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 9d53f02b923994a31e54d294aa2f81ebe289aa37 (commit) from 7d470066ce297d407a79bf10fdd9676d10c7b202 (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/9d53f02b923994a31e54d294aa2f81ebe… commit 9d53f02b923994a31e54d294aa2f81ebe289aa37 Author: Sameh Sharkawi <sssharka(a)us.ibm.com> Date: Tue Sep 23 12:38:54 2014 -0400 pamid: Adding empty implementation new MPID_Comm functions Added an empty implementation for MPID_Comm_get_all_failed_procs and MPID_Comm_revoke in pamid. Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index 7f00d95..4472c1e 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -89,3 +89,15 @@ int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_ MPID_abort(); return 0; } + +int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_group, int tag) +{ + MPID_abort(); + return 0; +} + +int MPID_Comm_revoke(MPID_Comm *comm_ptr, int is_remote) +{ + MPID_abort(); + return 0; +} ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/misc/mpid_unimpl.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-21-g7d47006
by noreply＠mpich.org 23 Sep '14

23 Sep '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 7d470066ce297d407a79bf10fdd9676d10c7b202 (commit) via e8b11d0a99db3f814a093d4a3c1949669aea6746 (commit) from 04a01da2240f956fcd43b42bef9c46ae89010f97 (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/7d470066ce297d407a79bf10fdd9676d1… commit 7d470066ce297d407a79bf10fdd9676d10c7b202 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Sep 17 11:43:23 2014 -0500 pamid: Do not compile/link C++ source if it is not used. Signed-off-by: Sameh Sharkawi <sssharka(a)us.ibm.com> diff --git a/src/mpid/pamid/include/mpidi_platform.h b/src/mpid/pamid/include/mpidi_platform.h index e9d6e5b..e5ac1d8 100644 --- a/src/mpid/pamid/include/mpidi_platform.h +++ b/src/mpid/pamid/include/mpidi_platform.h @@ -142,7 +142,6 @@ static const char _ibm_release_version_[] = "V1R2M0"; #define MPIDI_NO_ASSERT 1 #define TOKEN_FLOW_CONTROL 1 #define DYNAMIC_TASKING 1 -#define QUEUE_BINARY_SEARCH_SUPPORT 1 /* 'is local task' extension and limits */ #define PAMIX_IS_LOCAL_TASK diff --git a/src/mpid/pamid/src/Makefile.mk b/src/mpid/pamid/src/Makefile.mk index 9ccd933..0ec7698 100644 --- a/src/mpid/pamid/src/Makefile.mk +++ b/src/mpid/pamid/src/Makefile.mk @@ -58,8 +58,14 @@ mpi_core_sources += \ src/mpid/pamid/src/mpid_mprobe.c \ src/mpid/pamid/src/mpid_imrecv.c \ src/mpid/pamid/src/mpid_improbe.c \ - src/mpid/pamid/src/mpidi_nbc_sched.c \ + src/mpid/pamid/src/mpidi_nbc_sched.c + +if QUEUE_BINARY_SEARCH_SUPPORT +mpi_core_sources += \ src/mpid/pamid/src/mpid_recvq_mmap.cpp +endif QUEUE_BINARY_SEARCH_SUPPORT + + endif BUILD_PAMID diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index 2fd507a..c9160e0 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -101,6 +101,19 @@ if test "$with_shared_memory" != "mmap" -a "$with_shared_memory" != "sysv"; then fi dnl +dnl The default is to enable the use of the recv queue binary search +dnl ... except on BGQ +dnl +enable_queue_binary_search=yes +if test "${pamid_platform}" = "BGQ" ; then + enable_queue_binary_search=no +fi + +AC_ARG_ENABLE(queue-binary-search, + AC_HELP_STRING([--queue-binary-search], [Enable C++ binary search]),enable_queue_binary_search=no,enable_queue_binary_search=yes) +AM_CONDITIONAL([QUEUE_BINARY_SEARCH_SUPPORT],[test "$enable_queue_binary_search" = "yes"]) + +dnl dnl This configure option allows "sandbox" bgq system software to be used. dnl AC_ARG_WITH(bgq-install-dir, @@ -325,7 +338,6 @@ fi - ])dnl end AM_COND_IF(BUILD_PAMID,...) ])dnl end _BODY http://git.mpich.org/mpich.git/commitdiff/e8b11d0a99db3f814a093d4a3c1949669… commit e8b11d0a99db3f814a093d4a3c1949669aea6746 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Sep 17 14:22:58 2014 -0500 pamid: Add bgq libraries to wrapper scripts Signed-off-by: Sameh Sharkawi <sssharka(a)us.ibm.com> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index c1992b1..2fd507a 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -196,6 +196,17 @@ if test "${pamid_platform}" = "BGQ" ; then PAC_APPEND_FLAG([-lpthread], [LIBS]) PAC_APPEND_FLAG([-lstdc++], [LIBS]) + dnl + dnl The wrapper scripts require these libraries. + dnl + PAC_APPEND_FLAG([-l${PAMILIBNAME}], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lSPI], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lSPI_cnk], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lrt], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lpthread], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lstdc++], [WRAPPER_LIBS]) + + AC_SEARCH_LIBS([PAMI_Send], [${PAMILIBNAME} pami-gcc]) ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/include/mpidi_platform.h | 1 - src/mpid/pamid/src/Makefile.mk | 8 +++++++- src/mpid/pamid/subconfigure.m4 | 25 ++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-19-g04a01da
by noreply＠mpich.org 23 Sep '14

23 Sep '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 04a01da2240f956fcd43b42bef9c46ae89010f97 (commit) via 7418944673507d4fd3d3025e9e5ecfde809e9210 (commit) from c2c30a614da6bb4a9c2a39e9cf9bc3246e6ac3e8 (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/04a01da2240f956fcd43b42bef9c46ae8… commit 04a01da2240f956fcd43b42bef9c46ae89010f97 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Mon Sep 22 12:42:01 2014 -0500 Pass tail pointer to MPL single direction linked-list API. Pass tail pointer to single direction linked-list API so that we optimize CONCAT and APPEND operations from O(N) to O(1). Note that we do not need MPL_LL_APPEND_VS2008 anymore because we no longer need to work around temporary variable. Similiarly, we can support MPL_LL_CONCAT for VS2008 now. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> 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 bd3ee25..1934ce6 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -24,6 +24,7 @@ typedef struct MPID_nem_ptl_sendbuf { static MPID_nem_ptl_sendbuf_t sendbuf[NUM_SEND_BUFS]; static MPID_nem_ptl_sendbuf_t *free_head = NULL; +static MPID_nem_ptl_sendbuf_t *free_tail = NULL; static char recvbuf[BUFLEN][NUM_RECV_BUFS]; static ptl_me_t recvbuf_me[NUM_RECV_BUFS]; @@ -31,8 +32,8 @@ static ptl_handle_me_t recvbuf_me_handle[NUM_RECV_BUFS]; #define FREE_EMPTY() (free_head == NULL) #define FREE_HEAD() free_head -#define FREE_PUSH(buf_p) MPL_LL_PREPEND(free_head, buf_p) -#define FREE_POP(buf_pp) do { *(buf_pp) = free_head; MPL_LL_DELETE(free_head, free_head); } while (0) +#define FREE_PUSH(buf_p) MPL_LL_PREPEND(free_head, free_tail, buf_p) +#define FREE_POP(buf_pp) do { *(buf_pp) = free_head; MPL_LL_DELETE(free_head, free_tail, free_head); } while (0) static struct {MPID_Request *head, *tail;} send_queue; diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index fc3278a..b0e10c3 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -45,8 +45,10 @@ typedef struct hook_elt struct hook_elt *next; } hook_elt; -static hook_elt *create_hooks = NULL; -static hook_elt *destroy_hooks = NULL; +static hook_elt *create_hooks_head = NULL; +static hook_elt *destroy_hooks_head = NULL; +static hook_elt *create_hooks_tail = NULL; +static hook_elt *destroy_hooks_tail = NULL; #undef FUNCNAME #define FUNCNAME MPIDI_CH3U_Comm_init @@ -98,7 +100,7 @@ int MPIDI_CH3I_Comm_create_hook(MPID_Comm *comm) MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_COMM_CREATE_HOOK); - MPL_LL_FOREACH(create_hooks, elt) { + MPL_LL_FOREACH(create_hooks_head, elt) { mpi_errno = elt->hook_fn(comm, elt->param); if (mpi_errno) MPIU_ERR_POP(mpi_errno);; } @@ -122,7 +124,7 @@ int MPIDI_CH3I_Comm_destroy_hook(MPID_Comm *comm) MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_COMM_DESTROY_HOOK); - MPL_LL_FOREACH(destroy_hooks, elt) { + MPL_LL_FOREACH(destroy_hooks_head, elt) { mpi_errno = elt->hook_fn(comm, elt->param); if (mpi_errno) MPIU_ERR_POP(mpi_errno); } @@ -153,7 +155,7 @@ int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPID_Comm *, void elt->hook_fn = hook_fn; elt->param = param; - MPL_LL_PREPEND(create_hooks, elt); + MPL_LL_PREPEND(create_hooks_head, create_hooks_tail, elt); fn_exit: MPIU_CHKPMEM_COMMIT(); @@ -182,7 +184,7 @@ int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPID_Comm *, voi elt->hook_fn = hook_fn; elt->param = param; - MPL_LL_PREPEND(destroy_hooks, elt); + MPL_LL_PREPEND(destroy_hooks_head, destroy_hooks_tail, elt); fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_COMM_REGISTER_DESTROY_HOOK); @@ -204,13 +206,13 @@ static int register_hook_finalize(void *param) MPIDI_FUNC_ENTER(MPID_STATE_REGISTER_HOOK_FINALIZE); - MPL_LL_FOREACH_SAFE(create_hooks, elt, tmp) { - MPL_LL_DELETE(create_hooks, elt); + MPL_LL_FOREACH_SAFE(create_hooks_head, elt, tmp) { + MPL_LL_DELETE(create_hooks_head, create_hooks_tail, elt); MPIU_Free(elt); } - MPL_LL_FOREACH_SAFE(destroy_hooks, elt, tmp) { - MPL_LL_DELETE(destroy_hooks, elt); + MPL_LL_FOREACH_SAFE(destroy_hooks_head, elt, tmp) { + MPL_LL_DELETE(destroy_hooks_head, destroy_hooks_tail, elt); MPIU_Free(elt); } diff --git a/src/mpl/include/mpl_utlist.h b/src/mpl/include/mpl_utlist.h index 1f4e8a9..cadc0b0 100644 --- a/src/mpl/include/mpl_utlist.h +++ b/src/mpl/include/mpl_utlist.h @@ -326,46 +326,48 @@ do { /****************************************************************************** * singly linked list macros (non-circular) * *****************************************************************************/ -#define MPL_LL_PREPEND(head,add) MPL_LL_PREPEND_N(head,add,next) -#define MPL_LL_PREPEND_N(head,add,_next) \ +#define MPL_LL_PREPEND(head,tail,add) MPL_LL_PREPEND_N(head,tail,add,next) +#define MPL_LL_PREPEND_N(head,tail,add,_next) \ do { \ (add)->_next = head; \ head = add; \ + if ((add)->_next == NULL) \ + (tail) = (add); \ } while (0) -#define MPL_LL_CONCAT(head1,head2) MPL_LL_CONCAT_N(head1,head2,next) -#define MPL_LL_CONCAT_N(head1,head2,_next) \ +#define MPL_LL_CONCAT(head1,head2,tail1,tail2) MPL_LL_CONCAT_N(head1,head2,tail1,tail2,next) +#define MPL_LL_CONCAT_N(head1,head2,tail1,tail2,_next) \ do { \ - MPL_LDECLTYPE(head1) _tmp; \ - if (head1) { \ - _tmp = head1; \ - while (_tmp->_next) { _tmp = _tmp->_next; } \ - _tmp->_next=(head2); \ + if (tail1) { \ + (tail1)->_next=(head2); \ } else { \ (head1)=(head2); \ } \ + if (tail2) { \ + (tail1)=(tail2); \ + } \ } while (0) -#define MPL_LL_APPEND(head,add) MPL_LL_APPEND_N(head,add,next) -#define MPL_LL_APPEND_N(head,add,_next) \ +#define MPL_LL_APPEND(head,tail,add) MPL_LL_APPEND_N(head,tail,add,next) +#define MPL_LL_APPEND_N(head,tail,add,_next) \ do { \ - MPL_LDECLTYPE(head) _tmp; \ (add)->_next=NULL; \ - if (head) { \ - _tmp = head; \ - while (_tmp->_next) { _tmp = _tmp->_next; } \ - _tmp->_next=(add); \ + if (tail) { \ + (tail)->_next=(add); \ } else { \ (head)=(add); \ } \ + (tail)=(add); \ } while (0) -#define MPL_LL_DELETE(head,del) MPL_LL_DELETE_N(head,del,next) -#define MPL_LL_DELETE_N(head,del,_next) \ +#define MPL_LL_DELETE(head,tail,del) MPL_LL_DELETE_N(head,tail,del,next) +#define MPL_LL_DELETE_N(head,tail,del,_next) \ do { \ MPL_LDECLTYPE(head) _tmp; \ if ((head) == (del)) { \ (head)=(head)->_next; \ + if ((tail) == (del)) \ + (tail)=(head); \ } else { \ _tmp = head; \ while (_tmp->_next && (_tmp->_next != (del))) { \ @@ -373,29 +375,20 @@ do { } \ if (_tmp->_next) { \ _tmp->_next = ((del)->_next); \ + if ((tail) == (del)) \ + (tail)=_tmp; \ } \ } \ } while (0) -/* Here are VS2008 replacements for MPL_LL_APPEND and MPL_LL_DELETE */ -#define MPL_LL_APPEND_VS2008(head,add) MPL_LL_APPEND_N_VS2008(head,add,next) -#define MPL_LL_APPEND_N_VS2008(head,add,_next) \ -do { \ - if (head) { \ - (add)->_next = head; /* use add->_next as a temp variable */ \ - while ((add)->_next->_next) { (add)->_next = (add)->_next->_next; } \ - (add)->_next->_next=(add); \ - } else { \ - (head)=(add); \ - } \ - (add)->_next=NULL; \ -} while (0) - -#define MPL_LL_DELETE_VS2008(head,del) MPL_LL_DELETE_N_VS2008(head,del,next) -#define MPL_LL_DELETE_N_VS2008(head,del,_next) \ +/* Here are VS2008 replacements for MPL_LL_DELETE */ +#define MPL_LL_DELETE_VS2008(head,tail,del) MPL_LL_DELETE_N_VS2008(head,tail,del,next) +#define MPL_LL_DELETE_N_VS2008(head,tail,del,_next) \ do { \ if ((head) == (del)) { \ (head)=(head)->_next; \ + if ((tail) == (del)) \ + (tail)=(head); \ } else { \ char *_tmp = (char*)(head); \ while (head->_next && (head->_next != (del))) { \ @@ -403,6 +396,8 @@ do { } \ if (head->_next) { \ head->_next = ((del)->_next); \ + if ((tail) == (del)) \ + (tail)=(head); \ } \ { \ char **_head_alias = (char**)&(head); \ @@ -411,11 +406,8 @@ do { } \ } while (0) #ifdef MPL_NO_DECLTYPE -#undef MPL_LL_APPEND -#define MPL_LL_APPEND MPL_LL_APPEND_VS2008 #undef MPL_LL_DELETE #define MPL_LL_DELETE MPL_LL_DELETE_VS2008 -#undef MPL_LL_CONCAT /* no MPL_LL_CONCAT_VS2008 */ #undef MPL_DL_CONCAT /* no MPL_DL_CONCAT_VS2008 */ #endif /* end VS2008 replacements */ http://git.mpich.org/mpich.git/commitdiff/7418944673507d4fd3d3025e9e5ecfde8… commit 7418944673507d4fd3d3025e9e5ecfde809e9210 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Sun Sep 21 11:38:28 2014 -0500 Bug-fix: waiting for ACKs for Active Target Synchronization. The original implementation of FENCE and PSCW does not guarantee the remote completion of issued-out RMA operations when MPI_Win_complete and MPI_Win_fence returns. They only guarantee the local completion of issued-out operations and the completion of coming-in operations. This is not correct if we try to get updated values on target side using synchronizations with MPI_MODE_NOCHECK. Here we modify it by making runtime wait for ACKs from all targets before returning from MPI_Win_fence and MPI_Win_complete. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 76ef00f..ffb6802 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -302,6 +302,7 @@ struct MPIDI_Win_target_state { int start_assert; /* assert passed to MPI_Win_start */ \ int shm_allocated; /* flag: TRUE iff this window has a shared memory \ region associated with it */ \ + int ack_counter; /* counter for acknowledgement message at origin */ \ #ifdef MPIDI_CH3_WIN_DECL #define MPID_DEV_WIN_DECL \ diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 6b48ac3..3e2daf0 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -1308,6 +1308,11 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) if (curr_ops_cnt[curr_ptr->target_rank] == nops_to_proc[curr_ptr->target_rank] - 1) { flags = MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE; + if (curr_ptr->type == MPIDI_RMA_PUT || + curr_ptr->type == MPIDI_RMA_ACCUMULATE) { + flags |= MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK; + win_ptr->ack_counter++; + } } source_win_handle = win_ptr->handle; @@ -1380,11 +1385,12 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) finish_up: /* wait for all operations from other processes to finish */ - if (win_ptr->my_counter) + /* waiting for acknowledgement packets from targets to arrive */ + if (win_ptr->my_counter || win_ptr->ack_counter) { MPIR_T_PVAR_TIMER_START(RMA, rma_winfence_wait); MPID_Progress_start(&progress_state); - while (win_ptr->my_counter) + while (win_ptr->my_counter || win_ptr->ack_counter) { mpi_errno = MPID_Progress_wait(&progress_state); /* --BEGIN ERROR HANDLING-- */ @@ -2603,6 +2609,7 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) MPID_Comm *comm_ptr; MPI_Win source_win_handle, target_win_handle; int start_grp_size, *ranks_in_win_grp, rank; + MPID_Progress_state progress_state; int nRequest = 0; int nRequestNew = 0; MPIU_CHKLMEM_DECL(6); @@ -2614,12 +2621,6 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) win_ptr->epoch_state != MPIDI_EPOCH_START, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); - /* Track access epoch state */ - if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) - win_ptr->epoch_state = MPIDI_EPOCH_POST; - else - win_ptr->epoch_state = MPIDI_EPOCH_NONE; - comm_ptr = win_ptr->comm_ptr; comm_size = comm_ptr->local_size; @@ -2700,6 +2701,11 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) if (curr_ops_cnt[curr_ptr->target_rank] == nops_to_proc[curr_ptr->target_rank] - 1) { flags = MPIDI_CH3_PKT_FLAG_RMA_AT_COMPLETE; + if (curr_ptr->type == MPIDI_RMA_PUT || + curr_ptr->type == MPIDI_RMA_ACCUMULATE) { + win_ptr->ack_counter++; + flags |= MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK; + } } source_win_handle = win_ptr->handle; @@ -2802,10 +2808,33 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) } MPIU_Assert(MPIDI_CH3I_RMA_Ops_isempty(ops_list)); + + /* waiting for acknowledgement packets from targets to arrive */ + if (win_ptr->ack_counter) + { + MPID_Progress_start(&progress_state); + while (win_ptr->ack_counter) + { + mpi_errno = MPID_Progress_wait(&progress_state); + /* --BEGIN ERROR HANDLING-- */ + if (mpi_errno != MPI_SUCCESS) { + MPID_Progress_end(&progress_state); + MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**winnoprogress"); + } + /* --END ERROR HANDLING-- */ + } + MPID_Progress_end(&progress_state); + } /* free the group stored in window */ MPIR_Group_release(win_ptr->start_group_ptr); win_ptr->start_group_ptr = NULL; + + /* Track access epoch state */ + if (win_ptr->epoch_state == MPIDI_EPOCH_PSCW) + win_ptr->epoch_state = MPIDI_EPOCH_POST; + else + win_ptr->epoch_state = MPIDI_EPOCH_NONE; fn_exit: MPIU_CHKLMEM_FREEALL(); @@ -5807,12 +5836,21 @@ int MPIDI_CH3_PktHandler_PtRMADone( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); MPID_Win_get_ptr(pt_rma_done_pkt->source_win_handle, win_ptr); + + if (win_ptr->epoch_state == MPIDI_EPOCH_FENCE || + win_ptr->epoch_state == MPIDI_EPOCH_PSCW || + win_ptr->epoch_state == MPIDI_EPOCH_START) { + win_ptr->ack_counter--; + MPIU_Assert(win_ptr->ack_counter >= 0); + } + else { MPIU_Assert(win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state != MPIDI_CH3_WIN_LOCK_NONE); if (win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state == MPIDI_CH3_WIN_LOCK_FLUSH) win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state = MPIDI_CH3_WIN_LOCK_GRANTED; else win_ptr->targets[pt_rma_done_pkt->target_rank].remote_lock_state = MPIDI_CH3_WIN_LOCK_NONE; + } *rreqp = NULL; MPIDI_CH3_Progress_signal_completion(); @@ -6137,6 +6175,11 @@ int MPIDI_CH3_Finish_rma_op_target(MPIDI_VC_t *vc, MPID_Win *win_ptr, int is_rma win_ptr->my_counter -= 1; MPIU_Assert(win_ptr->my_counter >= 0); + if (flags & MPIDI_CH3_PKT_FLAG_RMA_REQ_ACK) { + mpi_errno = MPIDI_CH3I_Send_pt_rma_done_pkt(vc, win_ptr, source_win_handle); + if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); + } + /* Signal the local process when the op counter reaches 0. */ if (win_ptr->my_counter == 0) MPIDI_CH3_Progress_signal_completion(); diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index c112db0..8bfe842 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -299,6 +299,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, (*win_ptr)->epoch_count = 0; (*win_ptr)->at_rma_ops_list = NULL; (*win_ptr)->shm_allocated = FALSE; + (*win_ptr)->ack_counter = 0; /* Initialize the passive target lock state */ MPIU_CHKPMEM_MALLOC((*win_ptr)->targets, struct MPIDI_Win_target_state *, ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 5 +- src/mpid/ch3/include/mpidpre.h | 1 + src/mpid/ch3/src/ch3u_comm.c | 22 ++++--- src/mpid/ch3/src/ch3u_rma_sync.c | 59 +++++++++++++++--- src/mpid/ch3/src/mpid_rma.c | 1 + src/mpl/include/mpl_utlist.h | 66 +++++++++----------- 6 files changed, 97 insertions(+), 57 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-17-gc2c30a6
by noreply＠mpich.org 22 Sep '14

22 Sep '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 c2c30a614da6bb4a9c2a39e9cf9bc3246e6ac3e8 (commit) from 09930cc20a8532a2cfd9f7e022787bf40af8286f (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/c2c30a614da6bb4a9c2a39e9cf9bc3246… commit c2c30a614da6bb4a9c2a39e9cf9bc3246e6ac3e8 Author: Pavan Balaji <balaji(a)anl.gov> Date: Mon Sep 22 00:25:12 2014 -0500 Cleanup release.pl to remove unnecessary code. The release.pl code was essentially a simple svn to git conversion. With our current testing model, some of this code is irrelevant. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/maint/release.pl b/maint/release.pl index 8dddd65..004301a 100755 --- a/maint/release.pl +++ b/maint/release.pl @@ -3,13 +3,6 @@ # (C) 2008 by Argonne National Laboratory. # See COPYRIGHT in top-level directory. # -# -# Known limitations: -# -# 1. ABI mismatch checks are run using a git diff in mpi.h.in and -# the binding directory. This can come up with false positives, and -# is only meant to be a worst-case guess. -# use strict; use warnings; @@ -20,17 +13,12 @@ use File::Temp qw( tempdir ); my $arg = 0; my $branch = ""; -my $pbranch = ""; my $version = ""; my $append_commit_id; -my $since = ""; my $root = cwd(); my $with_autoconf = ""; my $with_automake = ""; -my $remote_git_repo = ""; - -# Default to MPICH -my $prefix = "mpich"; +my $git_repo = ""; my $logfile = "release.log"; @@ -39,14 +27,10 @@ sub usage print "Usage: $0 [OPTIONS]\n\n"; print "OPTIONS:\n"; + print "\t--git-repo path to root of the git repository (required)\n"; print "\t--branch git branch to be packaged (required)\n"; - print "\t--pbranch git previous version branch for ABI compliance (required)\n"; print "\t--version tarball version (required)\n"; - print "\t--remote-git-repo path to root of the git repository (required)\n"; - - print "\t--prefix package prefix to use (optional)\n"; - print "\t--append-commit-id append git commit ID (optional)\n"; - print "\t--newer-than date (optional)\n"; + print "\t--append-commit-id append git commit description (optional)\n"; print "\n"; @@ -137,14 +121,11 @@ sub run_cmd GetOptions( "branch=s" => \$branch, - "pbranch=s" => \$pbranch, - "prefix:s" => \$prefix, "version=s" => \$version, "append-commit-id!" => \$append_commit_id, - "newer-than=s" => \$since, "with-autoconf" => \$with_autoconf, "with-automake" => \$with_automake, - "remote-git-repo=s" => \$remote_git_repo, + "git-repo=s" => \$git_repo, "help" => \&usage, # old deprecated args, retained with usage() to help catch non-updated cron @@ -156,7 +137,7 @@ if (scalar(@ARGV) != 0) { usage(); } -if (!$branch || !$version || !$pbranch) { +if (!$branch || !$version) { usage(); } @@ -178,50 +159,31 @@ print("\n"); my $tdir = tempdir(CLEANUP => 1); -my $local_git_clone = "${tdir}/${prefix}-clone"; +my $local_git_clone = "${tdir}/mpich-clone"; # clone git repo print("===> Cloning git repo... "); -run_cmd("git clone ${remote_git_repo} ${local_git_clone}"); +run_cmd("git clone ${git_repo} ${local_git_clone}"); print("done\n"); # chdirs to $local_git_clone if valid check_git_repo($local_git_clone); print("\n"); -if ($since) { - # If there have been no commits in the past some amount of time, - # do not create a tarball - if (!(`git log --since='$since' ${branch}`)) { - chdir("${tdir}/.."); - print "No recent commits found... aborting\n"; - exit; - } -} - my $current_ver = `git show ${branch}:maint/version.m4 | grep MPICH_VERSION_m4 | \ sed -e 's/^.*\\[MPICH_VERSION_m4\\],\\[\$.*\$\\].*/\\1/g'`; if ("$current_ver" ne "$version\n") { print("\tWARNING: Version mismatch\n\n"); } -if ($pbranch) { - # Check diff - my $d = `git diff ${pbranch}:src/include/mpi.h.in ${branch}:src/include/mpi.h.in`; - $d .= `git diff ${pbranch}:src/binding ${branch}:src/binding`; - if ("$d" ne "") { - print("\tWARNING: ABI mismatch\n\n"); - } -} - if ($append_commit_id) { my $desc = `git describe --always ${branch}`; chomp $desc; $version .= "-${desc}"; } -my $expdir = "${tdir}/${prefix}-${version}"; +my $expdir = "${tdir}/mpich-${version}"; # Clean up the log file system("rm -f ${root}/$logfile"); @@ -230,7 +192,7 @@ system("rm -f ${root}/$logfile"); print("===> Exporting code from git... "); run_cmd("rm -rf ${expdir}"); run_cmd("mkdir -p ${expdir}"); -run_cmd("git archive ${branch} --prefix='${prefix}-${version}/' | tar -x -C $tdir"); +run_cmd("git archive ${branch} --prefix='mpich-${version}/' | tar -x -C $tdir"); print("done\n"); print("===> Create release date and version information... "); @@ -307,10 +269,10 @@ run_cmd("rm -f users-guide.blg users-guide.toc users-guide.aux users-guide.bbl u print("done\n"); # Create the main tarball -print("===> Creating the final ${prefix} tarball... "); +print("===> Creating the final mpich tarball... "); chdir("${tdir}"); -run_cmd("tar -czvf ${prefix}-${version}.tar.gz ${prefix}-${version}"); -run_cmd("cp -a ${prefix}-${version}.tar.gz ${root}/"); +run_cmd("tar -czvf mpich-${version}.tar.gz mpich-${version}"); +run_cmd("cp -a mpich-${version}.tar.gz ${root}/"); print("done\n"); # Create the hydra tarball ----------------------------------------------------------------------- Summary of changes: maint/release.pl | 62 ++++++++++------------------------------------------- 1 files changed, 12 insertions(+), 50 deletions(-) hooks/post-receive -- MPICH primary repository

1 0