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

[mpich] MPICH primary repository branch, master, updated. v3.1.2-74-g43bbd02
by noreply＠mpich.org 07 Aug '14

07 Aug '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 43bbd02bab428e1f6dab359ba77d49f5be9efd15 (commit) from bfc09241bd576e70546de494a8df6ae67c4d21be (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/43bbd02bab428e1f6dab359ba77d49f5b… commit 43bbd02bab428e1f6dab359ba77d49f5be9efd15 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Tue Aug 5 05:53:43 2014 -0500 Add a zero byte MPI_Win_allocate_shared test The first and the last rank allocate 16 bytes shared window, and the others allocate 0 byte window. Then write 1 to base_ptr of rank 0, check the value from base_ptr of the last rank. This test is used for checking overlapped segments of different processes in a shared window. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index ecdd63f..40f3717 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -84,6 +84,7 @@ noinst_PROGRAMS = \ win_shared \ win_shared_noncontig \ win_shared_noncontig_put \ + win_shared_zerobyte \ win_zero \ win_large_shm \ win_dynamic_acc \ diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in index 04ddc4e..72606d2 100644 --- a/test/mpi/rma/testlist.in +++ b/test/mpi/rma/testlist.in @@ -108,6 +108,7 @@ rma-contig 2 mpiversion=3.0 timeLimit=600 badrma 2 mpiversion=3.0 acc-loc 4 fence_shm 2 mpiversion=3.0 +win_shared_zerobyte 4 mpiversion=3.0 ## This test is not strictly correct. This was meant to test out the ## case when MPI_Test is not nonblocking. However, we ended up diff --git a/test/mpi/rma/win_shared_zerobyte.c b/test/mpi/rma/win_shared_zerobyte.c new file mode 100644 index 0000000..1f602a7 --- /dev/null +++ b/test/mpi/rma/win_shared_zerobyte.c @@ -0,0 +1,106 @@ +/* -*- 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 <stdlib.h> +#include <assert.h> +#include <mpi.h> +#include "mpitest.h" + +const int verbose = 0; + +int main(int argc, char **argv) +{ + int i, j, rank, nproc; + int shm_rank, shm_nproc; + MPI_Aint size; + int errors = 0, all_errors = 0; + int **bases = NULL, *abs_base, *my_base; + int disp_unit; + MPI_Win shm_win; + MPI_Comm shm_comm; + int ELEM_PER_PROC = 0; + + MPI_Init(&argc, &argv); + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + + MPI_Comm_split_type(MPI_COMM_WORLD, MPI_COMM_TYPE_SHARED, rank, MPI_INFO_NULL, &shm_comm); + + MPI_Comm_rank(shm_comm, &shm_rank); + MPI_Comm_size(shm_comm, &shm_nproc); + + bases = calloc(shm_nproc, sizeof(int *)); + + if (shm_rank == 0 || shm_rank == shm_nproc - 1) { + ELEM_PER_PROC = 16; + } + + /* Allocate ELEM_PER_PROC integers for each process */ + MPI_Win_allocate_shared(sizeof(int) * ELEM_PER_PROC, sizeof(int), MPI_INFO_NULL, + shm_comm, &my_base, &shm_win); + + /* Locate absolute base */ + MPI_Win_shared_query(shm_win, MPI_PROC_NULL, &size, &disp_unit, &abs_base); + + if (verbose) + printf("%d -- allocate shared: my_base = %p, absolute base\n", shm_rank, my_base, abs_base); + + for (i = 0; i < shm_nproc; i++) { + MPI_Win_shared_query(shm_win, i, &size, &disp_unit, &bases[i]); + if (verbose) + printf("%d -- shared query: base[%d]=%p, size %ld, unit %d\n", + shm_rank, i, bases[i], size, disp_unit); + } + + MPI_Win_lock_all(MPI_MODE_NOCHECK, shm_win); + + /* Reset data */ + for (i = 0; i < ELEM_PER_PROC; i++) { + my_base[i] = 0; + } + + MPI_Win_sync(shm_win); + MPI_Barrier(shm_comm); + MPI_Win_sync(shm_win); + + /* Read and verify everyone's data */ + if (shm_rank == 0) { + bases[0][0] = 1; + } + + MPI_Win_sync(shm_win); + MPI_Barrier(shm_comm); + MPI_Win_sync(shm_win); + + if (bases[0][0] != 1) { + errors++; + printf("%d -- Got %d at rank %d index %d, expected %d\n", shm_rank, bases[0][0], 0, 0, 1); + } + + if (bases[shm_nproc - 1][0] != 0) { + errors++; + printf("%d -- Got %d at rank %d index %d, expected %d\n", shm_rank, + bases[shm_nproc - 1][0], shm_nproc - 1, 0, 0); + } + + MPI_Win_unlock_all(shm_win); + MPI_Win_free(&shm_win); + MPI_Comm_free(&shm_comm); + + MPI_Reduce(&errors, &all_errors, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + if (rank == 0 && all_errors == 0) + printf(" No Errors\n"); + + MPI_Finalize(); + + free(bases); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 1 + test/mpi/rma/testlist.in | 1 + test/mpi/rma/win_shared_zerobyte.c | 106 ++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 test/mpi/rma/win_shared_zerobyte.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-73-gbfc0924
by noreply＠mpich.org 07 Aug '14

07 Aug '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 bfc09241bd576e70546de494a8df6ae67c4d21be (commit) from 12909511b352b3b6d069b8d1f933b383f8447704 (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/bfc09241bd576e70546de494a8df6ae67… commit bfc09241bd576e70546de494a8df6ae67c4d21be Author: Paul Coffman <pkcoff(a)us.ibm.com> Date: Wed Jul 30 00:05:22 2014 -0500 Reduce P2PContig communication with local compute P2PContig additional optimizations for performance improvement to exchange some communication during aggregation for local computation - most helpful at scale Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/p2p_aggregation.c b/src/mpi/romio/adio/common/p2p_aggregation.c index b8e00e8..46cfe55 100644 --- a/src/mpi/romio/adio/common/p2p_aggregation.c +++ b/src/mpi/romio/adio/common/p2p_aggregation.c @@ -4,6 +4,8 @@ #include <pthread.h> +// #define p2pcontigtrace 1 + void ADIOI_P2PContigWriteAggregation(ADIO_File fd, const void *buf, int *error_code, @@ -28,6 +30,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, MPI_Comm_size(fd->comm, &nprocs); MPI_Comm_rank(fd->comm, &myrank); + ADIO_Offset myOffsetStart = st_offsets[myrank], myOffsetEnd = end_offsets[myrank]; + int myAggRank = -1; // if I am an aggregor this is my index into fd->hints->ranklist int iAmUsedAgg = 0; @@ -54,28 +58,19 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, } } - /* determine how much data and to whom I need to send (also record the - * offset in the buffer for procs that span file domains) */ + /* Determine how much data and to whom I need to send. For source proc + * targets, also determine the target file domain offsets locally to + * reduce communication overhead */ int *targetAggsForMyData = (int *)ADIOI_Malloc(naggs * sizeof(int)); - int *dataSizeToSendPerTargetAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); - int *bufferOffsetToSendPerTargetAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); + ADIO_Offset *targetAggsForMyDataFDStart = (ADIO_Offset *)ADIOI_Malloc(naggs * sizeof(ADIO_Offset)); + ADIO_Offset *targetAggsForMyDataFDEnd = (ADIO_Offset *)ADIOI_Malloc(naggs * sizeof(ADIO_Offset)); int numTargetAggs = 0; int i; for (i=0;i<naggs;i++) { - if ( ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) || ((end_offsets[myrank] >= fd_start[i]) && (end_offsets[myrank] <= fd_end[i]))) { + if ( ((myOffsetStart >= fd_start[i]) && (myOffsetStart <= fd_end[i])) || ((myOffsetEnd >= fd_start[i]) && (myOffsetEnd <= fd_end[i]))) { targetAggsForMyData[numTargetAggs] = fd->hints->ranklist[i]; - if ( ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) && ((end_offsets[myrank] >= fd_start[i]) && (end_offsets[myrank] <= fd_end[i]))) { - dataSizeToSendPerTargetAgg[numTargetAggs] = (end_offsets[myrank] - st_offsets[myrank])+1; - bufferOffsetToSendPerTargetAgg[numTargetAggs] = 0; - } - else if ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) { // starts in this fd and goes past it - dataSizeToSendPerTargetAgg[numTargetAggs] = (fd_end[i] - st_offsets[myrank]) +1; - bufferOffsetToSendPerTargetAgg[numTargetAggs] = 0; - } - else { // starts in fd before this and ends in it - dataSizeToSendPerTargetAgg[numTargetAggs] = (end_offsets[myrank] - fd_start[i]) +1; - bufferOffsetToSendPerTargetAgg[numTargetAggs] = fd_start[i]- st_offsets[myrank]; - } + targetAggsForMyDataFDStart[numTargetAggs] = fd_start[i]; + targetAggsForMyDataFDEnd[numTargetAggs] = fd_end[i]; numTargetAggs++; } } @@ -86,7 +81,6 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, ADIO_Offset *remainingDataOffsetToGetPerProc=NULL; int numSourceProcs = 0; - int totalDataSizeToGet = 0; if (iAmUsedAgg) { /* for the used aggregators figure out how much data I need from what procs */ @@ -100,8 +94,6 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, remainingDataAmountToGetPerProc = (int *)ADIOI_Malloc(numSourceProcs * sizeof(int)); remainingDataOffsetToGetPerProc = (ADIO_Offset *)ADIOI_Malloc(numSourceProcs * sizeof(ADIO_Offset)); - /* TODO: here was a spot where the balancecontig code figured out bridge ranks */ - /* everybody has the st_offsets and end_offsets for all ranks so if I am a * used aggregator go thru them and figure out which ranks have data that * falls into my file domain assigned to me */ @@ -121,9 +113,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, remainingDataAmountToGetPerProc[numSourceProcs] = (end_offsets[i] - fd_start[myAggRank]) +1; remainingDataOffsetToGetPerProc[numSourceProcs] = fd_start[myAggRank]; } - totalDataSizeToGet += remainingDataAmountToGetPerProc[numSourceProcs]; #ifdef p2pcontigtrace - printf("getting %ld bytes from source proc %d in fd %d with borders %ld to %ld\n",remainingDataAmountToGetPerProc[numSourceProcs],fd->hints->ranklist[myAggRank],i,fd_start[myAggRank],fd_end[myAggRank]); + printf("getting %ld bytes from source proc %d in fd rank %d with borders %ld to %ld\n",remainingDataAmountToGetPerProc[numSourceProcs],i,fd->hints->ranklist[myAggRank],fd_start[myAggRank],fd_end[myAggRank]); #endif numSourceProcs++; } @@ -133,12 +124,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, int *amountOfDataReqestedByTargetAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); for (i=0;i<numTargetAggs;i++) { amountOfDataReqestedByTargetAgg[i] = 0; -#ifdef p2pcontigtrace - printf("Need to send %ld bytes at buffer offset %d to agg %d\n", dataSizeToSendPerTargetAgg[i],bufferOffsetToSendPerTargetAgg[i],targetAggsForMyData[i]); -#endif } - int totalAmountDataSent = 0; int totalAmountDataReceived = 0; MPI_Request *mpiSizeToSendRequest = (MPI_Request *) ADIOI_Malloc(numTargetAggs * sizeof(MPI_Request)); MPI_Request *mpiRecvDataRequest = (MPI_Request *) ADIOI_Malloc(numSourceProcs * sizeof(MPI_Request)); @@ -177,7 +164,9 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, int *dataSizeGottenThisRoundPerProc = (int *)ADIOI_Malloc(numSourceProcs * sizeof(int)); int *mpiRequestMapPerProc = (int *)ADIOI_Malloc(numSourceProcs * sizeof(int)); - int *mpiSendRequestMapPerProc = (int *)ADIOI_Malloc(numTargetAggs * sizeof(int)); + int *targetAggIndexesForMyDataThisRound = (int *)ADIOI_Malloc(numTargetAggs * sizeof(int)); + int *sendBufferOffsetsThisRound = (int *)ADIOI_Malloc(numTargetAggs * sizeof(int)); + int *bufferAmountsToSendThisRound = (int *)ADIOI_Malloc(numTargetAggs * sizeof(int)); #ifdef ROMIO_GPFS endTimeBase = MPI_Wtime(); @@ -190,6 +179,71 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, int roundIter; for (roundIter=0;roundIter<numberOfRounds;roundIter++) { + /* determine what target aggs I need to send data to this round */ + int numTargetAggsThisRound = 0; + for (i=0;i<numTargetAggs;i++) { + if ( ((myOffsetStart >= targetAggsForMyDataFDStart[i]) && (myOffsetStart <= targetAggsForMyDataFDEnd[i])) || + ((myOffsetEnd >= targetAggsForMyDataFDStart[i]) && (myOffsetEnd <= targetAggsForMyDataFDEnd[i]))) { + // we know that we need to send data to this target agg at some point, now need to figure out how much this round + + // here are the offsets currently being collected by the aggregator during this round + ADIO_Offset currentRoundFDStartForMyTargetAgg = (ADIO_Offset)((ADIO_Offset)targetAggsForMyDataFDStart[i] + (ADIO_Offset)((ADIO_Offset)roundIter*(ADIO_Offset)coll_bufsize)); + ADIO_Offset currentRoundFDEndForMyTargetAgg = (ADIO_Offset)((ADIO_Offset)targetAggsForMyDataFDStart[i] + (ADIO_Offset)((ADIO_Offset)(roundIter+1)*(ADIO_Offset)coll_bufsize) - (ADIO_Offset)1); + if (currentRoundFDEndForMyTargetAgg > targetAggsForMyDataFDEnd[i]) + currentRoundFDEndForMyTargetAgg = targetAggsForMyDataFDEnd[i]; + +#ifdef p2pcontigtrace + printf("roundIter %d target iter %d targetAggsForMyData is %d myOffsetStart is %ld myOffsetEnd is %ld targetAggsForMyDataFDStart is %ld targetAggsForMyDataFDEnd is %ld currentRoundFDStartForMyTargetAgg is %ld currentRoundFDEndForMyTargetAgg is %ld\n", + roundIter,i,targetAggsForMyData[i],myOffsetStart,myOffsetEnd, + targetAggsForMyDataFDStart[i],targetAggsForMyDataFDEnd[i], + currentRoundFDStartForMyTargetAgg,currentRoundFDEndForMyTargetAgg); +#endif + + /* send the portion of my data that is within + * currentRoundFDStartForMyTargetAgg to + * currentRoundFDEndForMyTargetAgg */ + /* find the offset into the send buffer and the amount + * of data to send */ + int sendBufferOffset = 0; + int bufferAmountToSend = 0; + + if ((myOffsetStart >= currentRoundFDStartForMyTargetAgg) && (myOffsetStart <= currentRoundFDEndForMyTargetAgg)) { + if (myOffsetEnd > currentRoundFDEndForMyTargetAgg) + bufferAmountToSend = (currentRoundFDEndForMyTargetAgg - myOffsetStart) +1; + else + bufferAmountToSend = (myOffsetEnd - myOffsetStart) +1; + } + else if ((myOffsetEnd >= currentRoundFDStartForMyTargetAgg) && (myOffsetEnd <= currentRoundFDEndForMyTargetAgg)) { + sendBufferOffset = (int) (currentRoundFDStartForMyTargetAgg - myOffsetStart); + if (myOffsetEnd > currentRoundFDEndForMyTargetAgg) + bufferAmountToSend = (currentRoundFDEndForMyTargetAgg - currentRoundFDStartForMyTargetAgg) +1; + else + bufferAmountToSend = (myOffsetEnd - currentRoundFDStartForMyTargetAgg) +1; + } + else if ((myOffsetStart <= currentRoundFDStartForMyTargetAgg) && (myOffsetEnd >= currentRoundFDEndForMyTargetAgg)) { + sendBufferOffset = (int) (currentRoundFDStartForMyTargetAgg - myOffsetStart); + bufferAmountToSend = (currentRoundFDEndForMyTargetAgg - currentRoundFDStartForMyTargetAgg) +1; + } + + if (bufferAmountToSend > 0) { // we have data to send this round + targetAggIndexesForMyDataThisRound[numTargetAggsThisRound] = i; + sendBufferOffsetsThisRound[numTargetAggsThisRound] = sendBufferOffset; + bufferAmountsToSendThisRound[numTargetAggsThisRound] = bufferAmountToSend; +#ifdef p2pcontigtrace + printf("bufferAmountToSend is %d sendBufferOffset is %d\n",bufferAmountToSend,sendBufferOffset); +#endif + /* only need to be pinged by the agg for rounds after the first one - for the first one just + * send the data without being pinged */ + if (roundIter > 0) + MPI_Irecv(&amountOfDataReqestedByTargetAgg[numTargetAggsThisRound],1, + MPI_INT,targetAggsForMyData[i],0, + fd->comm,&mpiSizeToSendRequest[numTargetAggsThisRound]); + numTargetAggsThisRound++; + + } + } + } + // determine what offsets define the portion of the file domain the agg is writing this round if (iAmUsedAgg) { if ((fd_end[myAggRank] - currentRoundFDStart) < coll_bufsize) { @@ -202,22 +256,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, #endif } - int numRecvToWaitFor = 0; int irecv,isend; - - /* the source procs receive the amount of data the aggs want them to send */ -#ifdef ROMIO_GPFS - startTimeBase = MPI_Wtime(); -#endif - for (i=0;i<numTargetAggs;i++) { - MPI_Irecv(&amountOfDataReqestedByTargetAgg[i],1, - MPI_INT,targetAggsForMyData[i],0, - fd->comm,&mpiSizeToSendRequest[i]); - numRecvToWaitFor++; -#ifdef p2pcontigtrace - printf("MPI_Irecv from rank %d\n",targetAggsForMyData[i]); -#endif - } + int numSourceProcsSentData = 0; // the aggs send the amount of data they need to their source procs for (i=0;i<numSourceProcs;i++) { @@ -239,30 +279,44 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, #ifdef p2pcontigtrace printf("dataSizeGottenThisRoundPerProc[%d] set to %d - remainingDataOffsetToGetPerProc is %d remainingDataAmountToGetPerProc is %d currentRoundFDStart is %d currentRoundFDEnd is %d\n",i,dataSizeGottenThisRoundPerProc[i],remainingDataOffsetToGetPerProc[i],remainingDataAmountToGetPerProc[i],currentRoundFDStart,currentRoundFDEnd); #endif - MPI_Isend(&dataSizeGottenThisRoundPerProc[i],1,MPI_INT, - sourceProcsForMyData[i],0,fd->comm,&mpiSendDataSizeRequest[i]); - + if (dataSizeGottenThisRoundPerProc[i] > 0) { + if (roundIter > 0) { + MPI_Isend(&dataSizeGottenThisRoundPerProc[i],1,MPI_INT, + sourceProcsForMyData[i],0,fd->comm, + &mpiSendDataSizeRequest[numSourceProcsSentData]); + numSourceProcsSentData++; + } + } } - int numDataSendToWaitFor = 0; - /* the source procs send the requested data to the aggs - only send if - * requested more than 0 bytes */ - for (i = 0; i < numRecvToWaitFor; i++) { - MPI_Waitany(numRecvToWaitFor,mpiSizeToSendRequest,&irecv,&mpiWaitAnyStatusFromTargetAggs); + int numDataSendToWaitFor = 0; + /* the source procs send the requested data to the aggs */ + for (i = 0; i < numTargetAggsThisRound; i++) { + + /* the source procs aren't pinged by the target aggs on the first round */ + if (roundIter > 0) { + + MPI_Waitany(numTargetAggsThisRound,mpiSizeToSendRequest, + &irecv,&mpiWaitAnyStatusFromTargetAggs); #ifdef p2pcontigtrace - printf("was sent request for %d bytes from rank %d irecv index %d\n",amountOfDataReqestedByTargetAgg[irecv],targetAggsForMyData[irecv],irecv); + printf("irecv is %d amountOfDataReqestedByTargetAgg is %d bufferAmountsToSendThisRound is %d sendBufferOffsetsThisRound is %d targetAggsForMyData is %d\n",irecv,amountOfDataReqestedByTargetAgg[irecv], bufferAmountsToSendThisRound[irecv], sendBufferOffsetsThisRound[irecv],targetAggsForMyData[targetAggIndexesForMyDataThisRound[irecv]]); #endif + ADIOI_Assert(amountOfDataReqestedByTargetAgg[irecv] == bufferAmountsToSendThisRound[irecv]); + MPI_Isend(&((char*)buf)[sendBufferOffsetsThisRound[irecv]], + bufferAmountsToSendThisRound[irecv],MPI_BYTE, + targetAggsForMyData[targetAggIndexesForMyDataThisRound[irecv]], + 0,fd->comm,&mpiSendDataToTargetAggRequest[irecv]); - if (amountOfDataReqestedByTargetAgg[irecv] > 0) { - MPI_Isend(&((char*)buf)[bufferOffsetToSendPerTargetAgg[irecv]],amountOfDataReqestedByTargetAgg[irecv],MPI_BYTE, - targetAggsForMyData[irecv],0,fd->comm,&mpiSendDataToTargetAggRequest[irecv]); - totalAmountDataSent += amountOfDataReqestedByTargetAgg[irecv]; - bufferOffsetToSendPerTargetAgg[irecv] += amountOfDataReqestedByTargetAgg[irecv]; - mpiSendRequestMapPerProc[numDataSendToWaitFor] = irecv; - numDataSendToWaitFor++; } - + else { +#ifdef p2pcontigtrace + printf("i is %d bufferAmountsToSendThisRound is %d sendBufferOffsetsThisRound is %d targetAggsForMyData is %d\n",i, bufferAmountsToSendThisRound[i], sendBufferOffsetsThisRound[i],targetAggsForMyData[targetAggIndexesForMyDataThisRound[i]]); +#endif + MPI_Isend(&((char*)buf)[sendBufferOffsetsThisRound[i]],bufferAmountsToSendThisRound[i],MPI_BYTE, + targetAggsForMyData[targetAggIndexesForMyDataThisRound[i]],0,fd->comm,&mpiSendDataToTargetAggRequest[i]); + } + numDataSendToWaitFor++; } #ifdef ROMIO_GPFS @@ -316,8 +370,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, /* clean up the MPI_Request object for the MPI_Isend which told the * source procs how much data to send */ - for (i=0;i<numSourceProcs;i++) { - MPI_Waitany(numSourceProcs,mpiSendDataSizeRequest, + for (i=0;i<numSourceProcsSentData;i++) { + MPI_Waitany(numSourceProcsSentData,mpiSendDataSizeRequest, &isend,&mpiIsendStatusForSize); } @@ -376,7 +430,7 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, if (iAmUsedAgg) currentRoundFDStart += coll_bufsize; for (i = 0; i < numDataSendToWaitFor; i++) { - MPI_Wait(&mpiSendDataToTargetAggRequest[mpiSendRequestMapPerProc[i]], + MPI_Wait(&mpiSendDataToTargetAggRequest[i], &mpiIsendStatusForData); } @@ -405,8 +459,11 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, } ADIOI_Free(targetAggsForMyData); - ADIOI_Free(dataSizeToSendPerTargetAgg); - ADIOI_Free(bufferOffsetToSendPerTargetAgg); + ADIOI_Free(targetAggsForMyDataFDStart); + ADIOI_Free(targetAggsForMyDataFDEnd); + ADIOI_Free(targetAggIndexesForMyDataThisRound); + ADIOI_Free(sendBufferOffsetsThisRound); + ADIOI_Free(bufferAmountsToSendThisRound); ADIOI_Free(amountOfDataReqestedByTargetAgg); ADIOI_Free(mpiSizeToSendRequest); ADIOI_Free(mpiRecvDataRequest); @@ -414,7 +471,6 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd, ADIOI_Free(mpiSendDataToTargetAggRequest); ADIOI_Free(dataSizeGottenThisRoundPerProc); ADIOI_Free(mpiRequestMapPerProc); - ADIOI_Free(mpiSendRequestMapPerProc); /* TODO: still need a barrier here? */ MPI_Barrier(fd->comm); @@ -449,6 +505,8 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, MPI_Comm_size(fd->comm, &nprocs); MPI_Comm_rank(fd->comm, &myrank); + ADIO_Offset myOffsetStart = st_offsets[myrank], myOffsetEnd = end_offsets[myrank]; + int myAggRank = -1; // if I am an aggregor this is my index into fd->hints->ranklist int iAmUsedAgg = 0; @@ -470,27 +528,20 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, } } - // for my offset range determine how much data and from whom I need to get (also record the offset in the buffer for procs that span file domains) + /* for my offset range determine how much data and from whom I need to get + * it. For source ag targets, also determine the source file domain + * offsets locally to reduce communication overhead */ int *sourceAggsForMyData = (int *)ADIOI_Malloc(naggs * sizeof(int)); - int *dataSizeToGetPerSourceAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); - int *bufferOffsetToGetPerSourceAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); + ADIO_Offset *sourceAggsForMyDataFDStart = (ADIO_Offset *)ADIOI_Malloc(naggs * sizeof(ADIO_Offset)); + ADIO_Offset *sourceAggsForMyDataFDEnd = (ADIO_Offset *)ADIOI_Malloc(naggs * sizeof(ADIO_Offset)); int numSourceAggs = 0; int i; for (i=0;i<naggs;i++) { - if ( ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) || ((end_offsets[myrank] >= fd_start[i]) && (end_offsets[myrank] <= fd_end[i]))) { + if ( ((myOffsetStart >= fd_start[i]) && (myOffsetStart <= fd_end[i])) || + ((myOffsetEnd >= fd_start[i]) && (myOffsetEnd <= fd_end[i]))) { sourceAggsForMyData[numSourceAggs] = fd->hints->ranklist[i]; - if ( ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) && ((end_offsets[myrank] >= fd_start[i]) && (end_offsets[myrank] <= fd_end[i]))) { - dataSizeToGetPerSourceAgg[numSourceAggs] = (end_offsets[myrank] - st_offsets[myrank])+1; - bufferOffsetToGetPerSourceAgg[numSourceAggs] = 0; - } - else if ((st_offsets[myrank] >= fd_start[i]) && (st_offsets[myrank] <= fd_end[i])) { // starts in this fd and goes past it - dataSizeToGetPerSourceAgg[numSourceAggs] = (fd_end[i] - st_offsets[myrank]) +1; - bufferOffsetToGetPerSourceAgg[numSourceAggs] = 0; - } - else { // starts in fd before this and ends in it - dataSizeToGetPerSourceAgg[numSourceAggs] = (end_offsets[myrank] - fd_start[i]) +1; - bufferOffsetToGetPerSourceAgg[numSourceAggs] = fd_start[i]- st_offsets[myrank]; - } + sourceAggsForMyDataFDStart[numSourceAggs] = fd_start[i]; + sourceAggsForMyDataFDEnd[numSourceAggs] = fd_end[i]; numSourceAggs++; } } @@ -504,7 +555,6 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, ADIO_Offset *remainingDataOffsetToSendPerProc=NULL; int numTargetProcs = 0; - int totalDataSizeToSend = 0; if (iAmUsedAgg) { /* for the used aggregators figure out how much data I need from what procs */ @@ -524,8 +574,6 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, remainingDataOffsetToSendPerProc = (ADIO_Offset *)ADIOI_Malloc(numTargetProcs * sizeof(ADIO_Offset)); - /* TODO: some balancecontig logic might need to go here */ - /* everybody has the st_offsets and end_offsets for all ranks so if I am a * used aggregator go thru them and figure out which ranks have data that * falls into my file domain assigned to me */ @@ -545,25 +593,15 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, remainingDataAmountToSendPerProc[numTargetProcs] = (end_offsets[i] - fd_start[myAggRank]) +1; remainingDataOffsetToSendPerProc[numTargetProcs] = fd_start[myAggRank]; } - totalDataSizeToSend += remainingDataAmountToSendPerProc[numTargetProcs]; numTargetProcs++; } } } - int *amountOfDataReqestedFromSourceAgg = (int *)ADIOI_Malloc(naggs * sizeof(int)); - for (i=0;i<numSourceAggs;i++) { - amountOfDataReqestedFromSourceAgg[i] = 0; - } - - int totalAmountDataSent = 0; - MPI_Request *mpiSizeToSendRequest = (MPI_Request *) ADIOI_Malloc(numSourceAggs * sizeof(MPI_Request)); MPI_Request *mpiRecvDataFromSourceAggsRequest = (MPI_Request *) ADIOI_Malloc(numSourceAggs * sizeof(MPI_Request)); - MPI_Request *mpiSendDataSizeRequest = (MPI_Request *) ADIOI_Malloc(numTargetProcs * sizeof(MPI_Request)); - MPI_Request *mpiSendDataToTargetProcRequest = (MPI_Request *) ADIOI_Malloc(numTargetProcs * sizeof(MPI_Request)); - MPI_Status mpiWaitAnyStatusFromTargetAggs,mpiWaitAnyStatusFromSourceProcs,mpiIsendStatusForSize,mpiIsendStatusForData; + MPI_Status mpiWaitAnyStatusFromSourceProcs,mpiIsendStatusForData; /* use the two-phase buffer allocated in the file_open - no app should ever * be both reading and writing at the same time */ @@ -575,10 +613,6 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, // compute number of rounds ADIO_Offset numberOfRounds = (ADIO_Offset)((((ADIO_Offset)(end_offsets[nprocs-1]-st_offsets[0]))/((ADIO_Offset)((ADIO_Offset)coll_bufsize*(ADIO_Offset)naggs)))) + 1; -#ifdef p2pcontigtrace - printf("need to send %d bytes - coll_bufsize is %d\n",totalDataSizeToSend,coll_bufsize); -#endif - ADIO_Offset currentRoundFDStart = 0, nextRoundFDStart = 0; ADIO_Offset currentRoundFDEnd = 0, nextRoundFDEnd = 0; @@ -588,6 +622,9 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, } int *dataSizeSentThisRoundPerProc = (int *)ADIOI_Malloc(numTargetProcs * sizeof(int)); + int *sourceAggIndexesForMyDataThisRound = (int *)ADIOI_Malloc(numSourceAggs * sizeof(int)); + int *recvBufferOffsetsThisRound = (int *)ADIOI_Malloc(numSourceAggs * sizeof(int)); + int *bufferAmountsToGetThisRound = (int *)ADIOI_Malloc(numSourceAggs * sizeof(int)); *error_code = MPI_SUCCESS; int currentReadBuf = 0; @@ -705,14 +742,68 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, } // useIOBuffer } // IAmUsedAgg - /* the source procs receive the amount of data the aggs will be sending them */ + /* determine what source aggs I need to get data from this round and + * recv only from them */ + int numSourceAggsThisRound = 0; for (i=0;i<numSourceAggs;i++) { - MPI_Irecv(&amountOfDataReqestedFromSourceAgg[i],1, - MPI_INT,sourceAggsForMyData[i],0, - fd->comm,&mpiSizeToSendRequest[i]); + if ( ((myOffsetStart >= sourceAggsForMyDataFDStart[i]) && (myOffsetStart <= sourceAggsForMyDataFDEnd[i])) + || ((myOffsetEnd >= sourceAggsForMyDataFDStart[i]) && (myOffsetEnd <= sourceAggsForMyDataFDEnd[i])) ) { + /* we know that we need to get data from this source agg at + * some point, now need to figure out how much this round */ + + /* here are the offsets currently being sent by the aggregator + * during this round */ + ADIO_Offset currentRoundFDStartForMySourceAgg = + (ADIO_Offset)((ADIO_Offset)sourceAggsForMyDataFDStart[i] + + (ADIO_Offset)((ADIO_Offset)roundIter*(ADIO_Offset)coll_bufsize)); + ADIO_Offset currentRoundFDEndForMySourceAgg = + (ADIO_Offset)((ADIO_Offset)sourceAggsForMyDataFDStart[i] + + (ADIO_Offset)((ADIO_Offset)(roundIter+1)*(ADIO_Offset)coll_bufsize) - (ADIO_Offset)1); + if (currentRoundFDEndForMySourceAgg > sourceAggsForMyDataFDEnd[i]) + currentRoundFDEndForMySourceAgg = sourceAggsForMyDataFDEnd[i]; + +#ifdef p2pcontigtrace + printf("roundIter %d source iter %d sourceAggsForMyData is %d myOffsetStart is %ld myOffsetEnd is %ld sourceAggsForMyDataFDStart is %ld sourceAggsForMyDataFDEnd is %ld currentRoundFDStartForMySourceAgg is %ld currentRoundFDEndForMySourceAgg is %ld\n",roundIter,i,sourceAggsForMyData[i],myOffsetStart,myOffsetEnd,sourceAggsForMyDataFDStart[i],sourceAggsForMyDataFDEnd[i],currentRoundFDStartForMySourceAgg,currentRoundFDEndForMySourceAgg); +#endif + + // get the portion of my data that is within currentRoundFDStartForMySourceAgg to currentRoundFDEndForMySourceAgg + // find the offset into the recv buffer and the amount of data to get + int recvBufferOffset = 0; + int bufferAmountToGet = 0; + + if ((myOffsetStart >= currentRoundFDStartForMySourceAgg) && (myOffsetStart <= currentRoundFDEndForMySourceAgg)) { + if (myOffsetEnd > currentRoundFDEndForMySourceAgg) + bufferAmountToGet = (currentRoundFDEndForMySourceAgg - myOffsetStart) +1; + else + bufferAmountToGet = (myOffsetEnd - myOffsetStart) +1; + } + else if ((myOffsetEnd >= currentRoundFDStartForMySourceAgg) && (myOffsetEnd <= currentRoundFDEndForMySourceAgg)) { + recvBufferOffset = (int) (currentRoundFDStartForMySourceAgg - myOffsetStart); + if (myOffsetEnd > currentRoundFDEndForMySourceAgg) + bufferAmountToGet = (currentRoundFDEndForMySourceAgg - currentRoundFDStartForMySourceAgg) +1; + else + bufferAmountToGet = (myOffsetEnd - currentRoundFDStartForMySourceAgg) +1; + } + else if ((myOffsetStart <= currentRoundFDStartForMySourceAgg) && (myOffsetEnd >= currentRoundFDEndForMySourceAgg)) { + recvBufferOffset = (int) (currentRoundFDStartForMySourceAgg - myOffsetStart); + bufferAmountToGet = (currentRoundFDEndForMySourceAgg - currentRoundFDStartForMySourceAgg) +1; + } + + + if (bufferAmountToGet > 0) { // we have data to get this round + sourceAggIndexesForMyDataThisRound[numSourceAggsThisRound] = i; + recvBufferOffsetsThisRound[numSourceAggsThisRound] = recvBufferOffset; + bufferAmountsToGetThisRound[numSourceAggsThisRound] = bufferAmountToGet; +#ifdef p2pcontigtrace + printf("bufferAmountToGet is %d recvBufferOffset is %d\n",bufferAmountToGet,recvBufferOffset); +#endif + numSourceAggsThisRound++; + } + } } - // the aggs send the amount of data they will be sending to their source procs + /* the aggs determine the amount of data they will be sending to their + * source procs */ for (i=0;i<numTargetProcs;i++) { if ((remainingDataOffsetToSendPerProc[i] >= currentRoundFDStart) && (remainingDataOffsetToSendPerProc[i] <= currentRoundFDEnd)) { @@ -737,31 +828,18 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, else dataSizeSentThisRoundPerProc[i] = 0; - MPI_Isend(&dataSizeSentThisRoundPerProc[i],1,MPI_INT, - targetProcsForMyData[i],0,fd->comm,&mpiSendDataSizeRequest[i]); - } - /* the source procs get the requested data amount from the aggs and then - * receive that amount of data - only recv if requested more than 0 bytes */ - int numDataRecvToWaitFor = 0; - for (i = 0; i < numSourceAggs; i++) { - MPI_Waitany(numSourceAggs,mpiSizeToSendRequest, - &irecv,&mpiWaitAnyStatusFromTargetAggs); - if (amountOfDataReqestedFromSourceAgg[irecv] > 0) { - - MPI_Irecv(&((char*)buf)[bufferOffsetToGetPerSourceAgg[irecv]], - amountOfDataReqestedFromSourceAgg[irecv],MPI_BYTE, - sourceAggsForMyData[irecv],0,fd->comm, - &mpiRecvDataFromSourceAggsRequest[numDataRecvToWaitFor]); - totalAmountDataSent += amountOfDataReqestedFromSourceAgg[irecv]; - bufferOffsetToGetPerSourceAgg[irecv] += amountOfDataReqestedFromSourceAgg[irecv]; - - numDataRecvToWaitFor++; - } + /* the target procs get the data from the source aggs */ + for (i = 0; i < numSourceAggsThisRound; i++) { + MPI_Irecv(&((char*)buf)[recvBufferOffsetsThisRound[i]], + bufferAmountsToGetThisRound[i],MPI_BYTE, + sourceAggsForMyData[sourceAggIndexesForMyDataThisRound[i]],0,fd->comm, + &mpiRecvDataFromSourceAggsRequest[i]); } - // the aggs send the data to the source procs + // the source aggs send the data to the target procs + int numTargetProcsSentThisRound = 0; for (i=0;i<numTargetProcs;i++) { int currentWBOffset = 0; @@ -773,28 +851,25 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, MPI_Isend(&((char*)read_buf)[currentWBOffset], dataSizeSentThisRoundPerProc[i], MPI_BYTE,targetProcsForMyData[i],0, - fd->comm,&mpiSendDataToTargetProcRequest[i]); + fd->comm,&mpiSendDataToTargetProcRequest[numTargetProcsSentThisRound]); + numTargetProcsSentThisRound++; remainingDataAmountToSendPerProc[i] -= dataSizeSentThisRoundPerProc[i]; remainingDataOffsetToSendPerProc[i] += dataSizeSentThisRoundPerProc[i]; } } // wait for the target procs to get their data - for (i = 0; i < numDataRecvToWaitFor; i++) { - MPI_Waitany(numDataRecvToWaitFor,mpiRecvDataFromSourceAggsRequest, + for (i = 0; i < numSourceAggsThisRound; i++) { + MPI_Waitany(numSourceAggsThisRound,mpiRecvDataFromSourceAggsRequest, &irecv,&mpiWaitAnyStatusFromSourceProcs); } nextRoundFDStart = currentRoundFDStart + coll_bufsize; - // clean up the MPI_Isend MPI_Requests - for (i=0;i<numTargetProcs;i++) { - MPI_Waitany(numTargetProcs,mpiSendDataSizeRequest, - &isend,&mpiIsendStatusForSize); - if (dataSizeSentThisRoundPerProc[isend] > 0) { - MPI_Wait(&mpiSendDataToTargetProcRequest[isend],&mpiIsendStatusForData); - } + for (i=0;i<numTargetProcsSentThisRound;i++) { + MPI_Waitany(numTargetProcsSentThisRound,mpiSendDataToTargetProcRequest, + &isend,&mpiIsendStatusForData); } MPI_Barrier(fd->comm); // need to sync up the source aggs which did the isend with the target procs which did the irecvs to give the target procs time to get the data before overwriting with next round readcontig @@ -816,14 +891,15 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd, } ADIOI_Free(sourceAggsForMyData); - ADIOI_Free(dataSizeToGetPerSourceAgg); - ADIOI_Free(bufferOffsetToGetPerSourceAgg); - ADIOI_Free(amountOfDataReqestedFromSourceAgg); - ADIOI_Free(mpiSizeToSendRequest); + ADIOI_Free(sourceAggsForMyDataFDStart); + ADIOI_Free(sourceAggsForMyDataFDEnd); + ADIOI_Free(mpiRecvDataFromSourceAggsRequest); - ADIOI_Free(mpiSendDataSizeRequest); ADIOI_Free(mpiSendDataToTargetProcRequest); ADIOI_Free(dataSizeSentThisRoundPerProc); + ADIOI_Free(sourceAggIndexesForMyDataThisRound); + ADIOI_Free(recvBufferOffsetsThisRound); + ADIOI_Free(bufferAmountsToGetThisRound); /* TODO: is Barrier here needed? */ MPI_Barrier(fd->comm); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/p2p_aggregation.c | 356 ++++++++++++++++----------- 1 files changed, 216 insertions(+), 140 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-72-g1290951
by noreply＠mpich.org 07 Aug '14

07 Aug '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 12909511b352b3b6d069b8d1f933b383f8447704 (commit) from fadf8be59edef34dc78d90c96afabc7a8b428e59 (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/12909511b352b3b6d069b8d1f933b383f… commit 12909511b352b3b6d069b8d1f933b383f8447704 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Aug 5 15:32:08 2014 -0500 Bug-fix: correct the calculation of SHM base addrs. The calculation of SHM base addrs is not correct when there are processes allocating zero byte SHM window. Suppose rank 0 and rank 2 has non-zero bytes SHM window whereas rank 1 has zero byte SHM window. The original and wrong calculation is: win_base(rank 2) = win_base(rank 0) + win_size(rank 1). The correct calculation should be: win_base(rank 2) = win_base(rank 0) + win_size(rank 0). Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 82c5aec..8049289 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -303,17 +303,24 @@ static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * } char *cur_base = (*win_ptr)->shm_base_addr; + int cur_rank = 0; node_shm_base_addrs[0] = (*win_ptr)->shm_base_addr; for (i = 1; i < node_size; ++i) { if (node_sizes[i]) { + /* For the base addresses, we track the previous + * process that has allocated non-zero bytes of shared + * memory. We can not simply use "i-1" for the + * previous process because rank "i-1" might not have + * allocated any memory. */ if (noncontig) { - node_shm_base_addrs[i] = cur_base + MPIDI_CH3_ROUND_UP_PAGESIZE(node_sizes[i-1]); + node_shm_base_addrs[i] = cur_base + MPIDI_CH3_ROUND_UP_PAGESIZE(node_sizes[cur_rank]); } else { - node_shm_base_addrs[i] = cur_base + node_sizes[i-1]; + node_shm_base_addrs[i] = cur_base + node_sizes[cur_rank]; } cur_base = node_shm_base_addrs[i]; + cur_rank = i; } else { - node_shm_base_addrs[i] = NULL; /* FIXME: Is this right? */ + node_shm_base_addrs[i] = NULL; } } ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-71-gfadf8be
by noreply＠mpich.org 06 Aug '14

06 Aug '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 fadf8be59edef34dc78d90c96afabc7a8b428e59 (commit) from c835e3f874912660f206139dc8046c4ede0501f7 (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/fadf8be59edef34dc78d90c96afabc7a8… commit fadf8be59edef34dc78d90c96afabc7a8b428e59 Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Mon Mar 24 09:20:02 2014 -0500 Add test for multiple sends to alive processes This tests to make sure that MPICH can handle multiple process failures and still send messages correctly. It also provides a way to make sure that the PMI failure notification is correct when looking through the logs. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/test/mpi/ft/Makefile.am b/test/mpi/ft/Makefile.am index 8981bae..11d9136 100644 --- a/test/mpi/ft/Makefile.am +++ b/test/mpi/ft/Makefile.am @@ -10,4 +10,4 @@ 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 +noinst_PROGRAMS = die abort sendalive isendalive senddead recvdead isenddead irecvdead barrier gather reduce bcast scatter failure_ack anysource revoke_nofail shrink agree multi_isendalive diff --git a/test/mpi/ft/multi_isendalive.c b/test/mpi/ft/multi_isendalive.c new file mode 100644 index 0000000..d049a77 --- /dev/null +++ b/test/mpi/ft/multi_isendalive.c @@ -0,0 +1,80 @@ +/* -*- 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> + +/* + * This test attempts communication between 2 running processes + * after another process has failed. The communication should complete + * successfully. + */ +int main(int argc, char **argv) +{ + int rank, size, err; + char buf[10]; + MPI_Request request; + + 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" ); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + if (rank == 1) { + exit(EXIT_FAILURE); + } + + if (rank == 0) { + err = MPI_Issend("No Errors", 10, MPI_CHAR, 3, 0, MPI_COMM_WORLD, &request); + err += MPI_Wait(&request, MPI_STATUS_IGNORE); + if (err) { + fprintf(stderr, "An error occurred during the send operation\n"); + } + } + + if (rank == 3) { + err = MPI_Irecv(buf, 10, MPI_CHAR, 0, 0, MPI_COMM_WORLD, &request); + err += MPI_Wait(&request, MPI_STATUS_IGNORE); + if (err) { + fprintf(stderr, "An error occurred during the recv operation\n"); + } + } + + if (rank == 3) { + exit(EXIT_FAILURE); + } + + if (rank == 0) { + err = MPI_Issend("No Errors", 10, MPI_CHAR, 2, 0, MPI_COMM_WORLD, &request); + err += MPI_Wait(&request, MPI_STATUS_IGNORE); + if (err) { + fprintf(stderr, "An error occurred during the send operation\n"); + } + } + + if (rank == 2) { + err = MPI_Irecv(buf, 10, MPI_CHAR, 0, 0, MPI_COMM_WORLD, &request); + err += MPI_Wait(&request, MPI_STATUS_IGNORE); + if (err) { + fprintf(stderr, "An error occurred during the recv operation\n"); + } else { + printf(" %s\n", buf); + fflush(stdout); + } + } + + if (rank == 2) { + exit(EXIT_FAILURE); + } + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/ft/testlist b/test/mpi/ft/testlist index cdc0168..eda8f96 100644 --- a/test/mpi/ft/testlist +++ b/test/mpi/ft/testlist @@ -2,6 +2,7 @@ die 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=Test abort 2 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false xfail=ticket1537 sendalive 4 mpiexecarg=-disable-auto-cleanup timeLimit=10 strict=false resultTest=TestStatusNoErrors xfail=ticket1945 isendalive 3 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false xfail=ticket1945 +multi_isendalive 4 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false senddead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 recvdead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 isenddead 2 mpiexecarg=-disable-auto-cleanup resultTest=TestStatusNoErrors strict=false timeLimit=10 xfail=ticket1945 ----------------------------------------------------------------------- Summary of changes: test/mpi/ft/Makefile.am | 2 +- test/mpi/ft/{isendalive.c => multi_isendalive.c} | 32 +++++++++++++++++++--- test/mpi/ft/testlist | 1 + 3 files changed, 30 insertions(+), 5 deletions(-) copy test/mpi/ft/{isendalive.c => multi_isendalive.c} (58%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-70-gc835e3f
by noreply＠mpich.org 05 Aug '14

05 Aug '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 c835e3f874912660f206139dc8046c4ede0501f7 (commit) from 805167c81bb53423bde2d6d95047c94669e29e47 (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/c835e3f874912660f206139dc8046c4ed… commit c835e3f874912660f206139dc8046c4ede0501f7 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Tue Aug 5 13:04:46 2014 -0500 Avoid accessing null pointer in MPID_Comm_valid_ptr Fixes #2147 Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 882e366..64043e4 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -499,7 +499,7 @@ int MPIU_Handle_free( void *((*)[]), int ); if ((ptr) && MPIU_Object_get_ref(ptr) <= 0) { \ MPIU_ERR_SET(err,MPI_ERR_COMM,"**comm"); \ ptr = 0; \ - } else if (ptr->revoked && !ignore_rev) { \ + } else if ((ptr) && (ptr)->revoked && !(ignore_rev)) { \ MPIU_ERR_SET(err,MPIX_ERR_REVOKED,"**comm"); \ } \ } ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-69-g805167c
by noreply＠mpich.org 05 Aug '14

05 Aug '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 805167c81bb53423bde2d6d95047c94669e29e47 (commit) from b95c5fa2fd3aff6c235ab9e5ae9afba3b142198a (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/805167c81bb53423bde2d6d95047c9466… commit 805167c81bb53423bde2d6d95047c94669e29e47 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Tue Aug 5 13:02:13 2014 -0500 missing header file for time() routine Signed-off-by: Huiwei Lu <huiweilu(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index e788d30..3761cf8 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -14,6 +14,9 @@ #include <sys/types.h> #endif +#ifdef HAVE_TIME_H +#include <time.h> +#endif /* The following function selects the name of the file to be used to store the shared file pointer. The shared-file-pointer file is a hidden file in the same directory as the real file being accessed. diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 6da8836..1fe952d 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -437,7 +437,7 @@ AC_TYPE_OFF_T # Header files # Find the CPP before the header check AC_PROG_CPP -AC_CHECK_HEADERS([unistd.h fcntl.h malloc.h stddef.h sys/types.h limits.h]) +AC_CHECK_HEADERS([unistd.h fcntl.h malloc.h stddef.h sys/types.h limits.h time.h]) AC_CHECK_HEADERS(mpix.h,,,[#include <mpi.h>]) # ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/shfp_fname.c | 3 +++ src/mpi/romio/configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-68-gb95c5fa
by noreply＠mpich.org 05 Aug '14

05 Aug '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 b95c5fa2fd3aff6c235ab9e5ae9afba3b142198a (commit) from d19d9044c7bcaf958385f00944ef3a9d596885c0 (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/b95c5fa2fd3aff6c235ab9e5ae9afba3b… commit b95c5fa2fd3aff6c235ab9e5ae9afba3b142198a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Thu Jul 31 15:10:49 2014 -0500 add test for canceling anysource recv Canceling an anysource can be tricky if the netmod does matching. There are additional functions that must be working in order for the cancel to be correctly reported. This test will exercise that functionality. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/pt2pt/Makefile.am b/test/mpi/pt2pt/Makefile.am index 752a451..0135272 100644 --- a/test/mpi/pt2pt/Makefile.am +++ b/test/mpi/pt2pt/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = \ bsend5 \ bsendalign \ cancelrecv \ + cancelanysrc \ isendself \ issendselfcancel \ sendself \ diff --git a/test/mpi/pt2pt/cancelanysrc.c b/test/mpi/pt2pt/cancelanysrc.c new file mode 100644 index 0000000..09cd64f --- /dev/null +++ b/test/mpi/pt2pt/cancelanysrc.c @@ -0,0 +1,48 @@ +/* -*- 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 <stdlib.h> +#include <assert.h> +#include "mpi.h" + +int main(int argc, char **argv) { + int size, rank, msg, cancelled; + MPI_Request request; + MPI_Status status; + + MPI_Init(&argc, &argv); + MPI_Comm_size(MPI_COMM_WORLD, &size); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if (size != 2) { + fprintf(stderr,"ERROR: must be run with 2 processes"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + if (rank == 0) { + msg = -1; + /* Post, then cancel MPI_ANY_SOURCE recv */ + MPI_Irecv(&msg, 1, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &request); + MPI_Cancel(&request); + MPI_Wait(&request, &status); + MPI_Test_cancelled(&status, &cancelled); + assert(cancelled); + + MPI_Barrier(MPI_COMM_WORLD); + MPI_Irecv(&msg, 1, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &request); + MPI_Wait(&request, &status); + assert(msg == 42); + } else { + MPI_Barrier(MPI_COMM_WORLD); + msg = 42; + MPI_Send(&msg, 1, MPI_INT, 0, 0, MPI_COMM_WORLD); + } + + if (rank == 0) + printf(" No Errors\n"); + + MPI_Finalize(); +} diff --git a/test/mpi/pt2pt/testlist b/test/mpi/pt2pt/testlist index d3a7da9..a21618b 100644 --- a/test/mpi/pt2pt/testlist +++ b/test/mpi/pt2pt/testlist @@ -30,6 +30,7 @@ scancel2 2 pscancel 2 xfail=ticket287 rcancel 2 cancelrecv 2 xfail=ticket287 +cancelanysrc 2 isendselfprobe 1 inactivereq 1 waittestnull 1 ----------------------------------------------------------------------- Summary of changes: test/mpi/pt2pt/Makefile.am | 1 + test/mpi/pt2pt/cancelanysrc.c | 48 +++++++++++++++++++++++++++++++++++++++++ test/mpi/pt2pt/testlist | 1 + 3 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 test/mpi/pt2pt/cancelanysrc.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-67-gd19d904
by noreply＠mpich.org 05 Aug '14

05 Aug '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 d19d9044c7bcaf958385f00944ef3a9d596885c0 (commit) from 658ff0d92533793bf453fc079e2b96cf576ac1f4 (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/d19d9044c7bcaf958385f00944ef3a9d5… commit d19d9044c7bcaf958385f00944ef3a9d596885c0 Author: Huiwei Lu <huiweilu(a)mcs.anl.gov> Date: Tue Aug 5 09:19:14 2014 -0500 Improves random number generation in shfp_fname.c The original code uses MPI_Wtime to generate a mostly random double number, and convert it to int. The integer is then used as a part of a shared file name. Replaced with rand(). It fixes the warning messages of 'Warning: ieee_inexact is signaling' signaled by PG Fortran compiler. Fixes #2071 Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index c88fe18..e788d30 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -25,7 +25,6 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) { - double tm; int i; int len; char *slash, *ptr, tmp[128]; @@ -34,12 +33,8 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) fd->shared_fp_fname = (char *) ADIOI_Malloc(256); if (!rank) { - tm = MPI_Wtime(); - while (tm > 1000000000.0) tm -= 1000000000.0; - i = (int) tm; - tm = tm - (double) i; - tm *= 1000000.0; - i = (int) tm; + srand(time(NULL)); + i = rand(); pid = (int)getpid(); ADIOI_Strncpy(fd->shared_fp_fname, fd->filename, 256); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/shfp_fname.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-66-g658ff0d
by noreply＠mpich.org 04 Aug '14

04 Aug '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 658ff0d92533793bf453fc079e2b96cf576ac1f4 (commit) via 6b7f60e76177def5f603f04ffe79c17b495f144d (commit) via 2caecaceac3bbe87720e9c1eb4a65bfea64ace32 (commit) via 11314276d9c0cc0aadd199745b99bf063b1e38ed (commit) via 3ac6a32ea03936403111d43956168361ab9ffcdc (commit) from 122dbd96b2df6e517fe1589fac0133d1bc381db6 (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/658ff0d92533793bf453fc079e2b96cf5… commit 658ff0d92533793bf453fc079e2b96cf576ac1f4 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Fri Aug 1 13:09:59 2014 -0500 pamid: fix MPI_MODE_NOPRECEDE assertion The user assertion 'MPI_MODE_NOPRECEDE' for MPI_Win_fence() does not require the mpi implementation to abort if the current epoch is not MPID_EPOTYPE_NONE. From the MPI 3.0 standard, page 441: "A fence call usually entails a barrier synchronization: a process completes a call to MPI_WIN_FENCE only after all other processes in the group entered their matching call. However, a call to MPI_WIN_FENCE that is known not to end any epoch (in particular, a call with assert equal to MPI_MODE_NOPRECEDE) does not necessarily act as a barrier." page 452: "MPI_MODE_NOPRECEDE — the fence does not complete any sequence of locally issued RMA calls. If this assertion is given by any process in the window group, then it must be given by all processes in the group" Signed-off-by: Su Huang <suhuang(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_fence.c b/src/mpid/pamid/src/onesided/mpid_win_fence.c index a2245ab..17bb022 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_fence.c +++ b/src/mpid/pamid/src/onesided/mpid_win_fence.c @@ -34,14 +34,6 @@ MPID_Win_fence(int assert, return mpi_errno, "**rmasync"); } - if ((assert & MPI_MODE_NOPRECEDE) && - win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_NONE) { - /* --BEGIN ERROR HANDLING-- */ - MPIU_ERR_SETANDSTMT(mpi_errno, MPI_ERR_RMA_SYNC, - return mpi_errno, "**rmasync"); - /* --END ERROR HANDLING-- */ - } - if (!(assert & MPI_MODE_NOPRECEDE) && win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_FENCE && win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_REFENCE && @@ -69,6 +61,10 @@ MPID_Win_fence(int assert, win->mpid.sync.target_epoch_type = MPID_EPOTYPE_REFENCE; } - mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &mpi_errno); + if (!(assert & MPI_MODE_NOPRECEDE)) + { + mpi_errno = MPIR_Barrier_impl(win->comm_ptr, &mpi_errno); + } + return mpi_errno; } http://git.mpich.org/mpich.git/commitdiff/6b7f60e76177def5f603f04ffe79c17b4… commit 6b7f60e76177def5f603f04ffe79c17b495f144d Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Fri Aug 1 12:26:40 2014 -0500 pamid: do not create memregions for shared memory windows Signed-off-by: Su Huang <suhuang(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c index 20ce66a..15f5e60 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create.c @@ -104,41 +104,43 @@ MPIDI_Win_init( MPI_Aint length, int MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr ) { - int mpi_errno = MPI_SUCCESS; - MPID_Win *win; - int rank; - MPID_Comm *comm_ptr; - size_t length_out = 0; - pami_result_t rc; - MPIDI_Win_info *winfo; - static char FCNAME[] = "MPIDI_Win_allgather"; + int mpi_errno = MPI_SUCCESS; + MPID_Win *win; + int rank; + MPID_Comm *comm_ptr; + size_t length_out = 0; + pami_result_t rc; + MPIDI_Win_info *winfo; + static char FCNAME[] = "MPIDI_Win_allgather"; win = *win_ptr; comm_ptr = win->comm_ptr; rank = comm_ptr->rank; winfo = &win->mpid.info[rank]; - /* --------------------------------------- */ - /* Setup the PAMI sections of the window */ - /* --------------------------------------- */ -#ifdef USE_PAMI_RDMA - if (size != 0) - { - rc = PAMI_Memregion_create(MPIDI_Context[0], win->mpid.info[rank].base_addr, win->mpid.info[rank].base_size, &length_out, &winfo->memregion); - MPIU_ERR_CHKANDJUMP((rc != PAMI_SUCCESS), mpi_errno, MPI_ERR_OTHER, "**nomem"); - MPIU_ERR_CHKANDJUMP((win->size < length_out), mpi_errno, MPI_ERR_OTHER, "**nomem"); - } -#else - if ( (!MPIDI_Process.mp_s_use_pami_get) && (size != 0) ) + if (size != 0 && win->create_flavor != MPI_WIN_FLAVOR_SHARED) { - rc = PAMI_Memregion_create(MPIDI_Context[0], win->mpid.info[rank].base_addr, win->mpid.info[rank].base_size, &length_out, &winfo->memregion); - if(rc == PAMI_SUCCESS) +#ifndef USE_PAMI_RDMA + if (!MPIDI_Process.mp_s_use_pami_get) { - winfo->memregion_used = 1; - MPID_assert(win->size == length_out); +#endif + /* --------------------------------------- */ + /* Setup the PAMI sections of the window */ + /* --------------------------------------- */ + rc = PAMI_Memregion_create(MPIDI_Context[0], win->mpid.info[rank].base_addr, win->mpid.info[rank].base_size, &length_out, &winfo->memregion); +#ifdef USE_PAMI_RDMA + MPIU_ERR_CHKANDJUMP((rc != PAMI_SUCCESS), mpi_errno, MPI_ERR_OTHER, "**nomem"); + MPIU_ERR_CHKANDJUMP((win->size < length_out), mpi_errno, MPI_ERR_OTHER, "**nomem"); +#else + if (rc == PAMI_SUCCESS) + { + winfo->memregion_used = 1; + MPID_assert(win->size == length_out); + } } - } #endif + } + mpi_errno = MPIR_Allgather_impl(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, http://git.mpich.org/mpich.git/commitdiff/2caecaceac3bbe87720e9c1eb4a65bfea… commit 2caecaceac3bbe87720e9c1eb4a65bfea64ace32 Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Jul 23 12:55:03 2014 -0400 pamid: MPI_Get coredump in __memcpy_power7 when >1 tasks per node (LE) Set the correct base address assignment during the window creation. (ibm) D198762 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index cfd08a7..d521a26 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -412,17 +412,11 @@ MPID_getSharedSegment(MPI_Aint size, #endif if (mpi_errno) MPIU_ERR_POP(mpi_errno); + /* assign base address here */ /* compute the base addresses of each process within the shared memory segment */ + /* will be done after MPI_Allgather in MID_Win_allocate_shared */ win->base = (void *) ((long) win->mpid.shm->base_addr + (long ) MPIDI_ROUND_UP_PAGESIZE((sizeof(MPIDI_Win_shm_ctrl_t) + ((comm_size+1) * sizeof(void *))),pageSize)); - for (i = 0; i < comm_size; ++i) { - win->mpid.info[i].base_addr = - (void *) ((uintptr_t)win->mpid.info[i].base_addr + (uintptr_t)win->base); - } - - for (i = 0; i < comm_size; ++i) { - if (size_array[i] == 0) win->mpid.info[i].base_addr = NULL; - } MPIU_Free(size_array); @@ -492,7 +486,7 @@ MPID_Win_allocate_shared(MPI_Aint size, int mpi_errno = MPI_SUCCESS; int onNode = 0; MPID_Win *win = NULL; - int rank; + int rank, prev_size; MPIDI_Win_info *winfo; int comm_size,i; @@ -526,6 +520,29 @@ MPID_Win_allocate_shared(MPI_Aint size, if (mpi_errno != MPI_SUCCESS) return mpi_errno; + win->mpid.info[0].base_addr = win->base; + char *cur_base = win->base; + prev_size=win->mpid.info[0].base_size; + for (i = 1; i < comm_size; ++i) { + if (win->mpid.info[i].base_size) { + if (prev_size) { + if (noncontig) { + /* Round up to next page size */ + win->mpid.info[i].base_addr = + (void *) ((MPI_Aint) cur_base + (MPI_Aint) MPIDI_ROUND_UP_PAGESIZE(prev_size,pageSize)); + } else { + win->mpid.info[i].base_addr = (void *) ((MPI_Aint) cur_base + (MPI_Aint) prev_size); + } + } else + win->mpid.info[i].base_addr = (void *) ((MPI_Aint) cur_base); + prev_size=win->mpid.info[i].base_size; + cur_base = win->mpid.info[i].base_addr; + } else { + win->mpid.info[i].base_addr = NULL; + } + } + + *(void**) base_ptr = (void *) win->mpid.info[rank].base_addr; mpi_errno = MPIR_Barrier_impl(comm_ptr, &mpi_errno); http://git.mpich.org/mpich.git/commitdiff/11314276d9c0cc0aadd199745b99bf063… commit 11314276d9c0cc0aadd199745b99bf063b1e38ed Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Jul 23 12:55:03 2014 -0400 pamid: shared memory optimization for put operation A shared window put operation can be completed by the rank that initiates the operation. (ibm) D198762 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index d395792..9cbcc05 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -264,14 +264,18 @@ MPID_Put(const void *origin_addr, } - if (target_rank == win->comm_ptr->rank) + if ((target_rank == win->comm_ptr->rank) || (win->create_flavor == MPI_WIN_FLAVOR_SHARED)) { size_t offset = req->offset; + if (target_rank == win->comm_ptr->rank) + target_addr = win->base + req->offset; + else + target_addr = win->mpid.info[target_rank].base_addr + req->offset; mpi_errno = MPIR_Localcopy(origin_addr, origin_count, origin_datatype, - win->base + offset, + target_addr, target_count, target_datatype); diff --git a/src/mpid/pamid/src/onesided/mpid_win_shared_query.c b/src/mpid/pamid/src/onesided/mpid_win_shared_query.c index 55ca3a0..bfcea9f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_shared_query.c +++ b/src/mpid/pamid/src/onesided/mpid_win_shared_query.c @@ -52,11 +52,13 @@ MPID_Win_shared_query(MPID_Win *win, int rank, MPI_Aint *size, break; } } + *((void **) base_ptr) = win->base; /* return the begin. address of shared segment */ } else { + *((void **) base_ptr) = win->mpid.info[rank].base_addr; /* return the begin. address of the rank */ *size = win->mpid.info[rank].base_size; *disp_unit = win->mpid.info[rank].disp_unit; } - *((void **) base_ptr) = win->base; /* should return the begin. address of shared segment */ + return mpi_errno; } http://git.mpich.org/mpich.git/commitdiff/3ac6a32ea03936403111d43956168361a… commit 3ac6a32ea03936403111d43956168361ab9ffcdc Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Jul 23 12:55:03 2014 -0400 pamid: shared mutex macro updates (ibm) D198762 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index 0a2e201..0b324cc 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -37,24 +37,24 @@ pami_rmw_t zero_rmw_parms; #define MPIDI_QUICKSLEEP usleep(1); #define MAX_NUM_CTRLSEND 1024 /* no more than 1024 outstanding control sends */ -#define MPIDI_SHM_MUTEX_LOCK(win) \ +#define MPIDI_SHM_MUTEX_LOCK(win) { \ int mpi_errno=0; \ do { \ pthread_mutex_t *shm_mutex = (pthread_mutex_t *) &win->mpid.shm->ctrl->mutex_lock; \ int rval = pthread_mutex_lock(shm_mutex); \ MPIU_ERR_CHKANDJUMP1(rval, mpi_errno, MPI_ERR_OTHER, "**pthread_lock", \ "**pthread_lock %s", strerror(rval)); \ - } while (0); + } while (0); } -#define MPIDI_SHM_MUTEX_UNLOCK(win) \ +#define MPIDI_SHM_MUTEX_UNLOCK(win) { \ int mpi_errno=0; \ do { \ pthread_mutex_t *shm_mutex = (pthread_mutex_t *) &win->mpid.shm->ctrl->mutex_lock; \ int rval = pthread_mutex_unlock(shm_mutex); \ MPIU_ERR_CHKANDJUMP1(rval, mpi_errno, MPI_ERR_OTHER, "**pthread_unlock", \ "**pthread_unlock %s", strerror(rval)); \ - } while (0); + } while (0); } #define MPIDI_SHM_MUTEX_INIT(win) \ @@ -78,14 +78,14 @@ pami_rmw_t zero_rmw_parms; "**pthread_mutex %s", strerror(rval)); \ } while (0); -#define MPIDI_SHM_MUTEX_DESTROY(win) \ +#define MPIDI_SHM_MUTEX_DESTROY(win) { \ int mpi_errno=0; \ do { \ pthread_mutex_t *shm_mutex = (pthread_mutex_t *) &(win)->mpid.shm->ctrl->mutex_lock;\ int rval = pthread_mutex_destroy(shm_mutex); \ MPIU_ERR_CHKANDJUMP1(rval, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex", \ "**pthread_mutex %s", strerror(rval)); \ - } while (0); + } while (0); } #define MPIDI_ACQUIRE_SHARED_LOCK(win) { \ MPIDI_SHM_MUTEX_LOCK(win); \ ----------------------------------------------------------------------- Summary of changes: .../pamid/src/onesided/mpid_win_allocate_shared.c | 35 ++++++++++--- src/mpid/pamid/src/onesided/mpid_win_create.c | 52 ++++++++++--------- src/mpid/pamid/src/onesided/mpid_win_fence.c | 14 ++--- src/mpid/pamid/src/onesided/mpid_win_put.c | 8 ++- .../pamid/src/onesided/mpid_win_shared_query.c | 4 +- src/mpid/pamid/src/onesided/mpidi_onesided.h | 12 ++-- 6 files changed, 73 insertions(+), 52 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.2-61-g122dbd9
by noreply＠mpich.org 01 Aug '14

01 Aug '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 122dbd96b2df6e517fe1589fac0133d1bc381db6 (commit) from 1d8ab1069329201acbcf532f78e46319b27119fe (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/122dbd96b2df6e517fe1589fac0133d1b… commit 122dbd96b2df6e517fe1589fac0133d1bc381db6 Author: Sangmin Seo <sseo(a)anl.gov> Date: Thu Jul 31 13:34:12 2014 -0500 Add a multi-threaded MPI_Get test. Multiple threads with multiple processes do MPI_Get on the same target and do MPI_Win_flush_all. The original code for this test was reported in ticket #2143. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/threads/rma/Makefile.am b/test/mpi/threads/rma/Makefile.am index b34cbcc..2a40e00 100644 --- a/test/mpi/threads/rma/Makefile.am +++ b/test/mpi/threads/rma/Makefile.am @@ -9,4 +9,4 @@ include $(top_srcdir)/threads/Makefile_threads.mtest EXTRA_DIST = testlist -noinst_PROGRAMS = multirma +noinst_PROGRAMS = multirma multiget diff --git a/test/mpi/threads/rma/multiget.c b/test/mpi/threads/rma/multiget.c new file mode 100644 index 0000000..fd5e763 --- /dev/null +++ b/test/mpi/threads/rma/multiget.c @@ -0,0 +1,78 @@ +/* -*- 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" +#include "mpithreadtest.h" + +#define NUM_THREADS 4 +#define COUNT 16 +#define LOOPS 10000 + +MPI_Win win; + +MTEST_THREAD_RETURN_TYPE run_test(void *arg) +{ + int i; + double *local_b; + + MPI_Alloc_mem(COUNT * sizeof(double), MPI_INFO_NULL, &local_b); + + for (i = 0; i < LOOPS; i++) { + MPI_Get(local_b, COUNT, MPI_DOUBLE, 0, 0, COUNT, MPI_DOUBLE, win); + MPI_Win_flush_all(win); + } + + MPI_Free_mem(local_b); + + return (MTEST_THREAD_RETURN_TYPE) NULL; +} + +int main(int argc, char *argv[]) +{ + int errs = 0; + int rank, nprocs, i, pmode; + double *win_mem; + + MTest_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &pmode); + if (pmode != MPI_THREAD_MULTIPLE) { + fprintf(stderr, "MPI_THREAD_MULTIPLE is not supported\n"); + MPI_Abort(MPI_COMM_WORLD, -1); + } + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + + if (nprocs < 2) { + printf("Run this program with 2 or more processes\n"); + MPI_Abort(MPI_COMM_WORLD, 1); + } + + if (rank == 0) { + errs += MPI_Win_allocate(COUNT * sizeof(double), sizeof(double), + MPI_INFO_NULL, MPI_COMM_WORLD, &win_mem, &win); + } else { + errs += MPI_Win_allocate(0, sizeof(double), MPI_INFO_NULL, + MPI_COMM_WORLD, &win_mem, &win); + } + + errs += MPI_Win_lock_all(0, win); + + for (i = 0; i < NUM_THREADS; i++) + errs += MTest_Start_thread(run_test, NULL); + errs += MTest_Join_threads(); + + errs += MPI_Win_unlock_all(win); + + errs += MPI_Win_free(&win); + + MTest_Finalize(errs); + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/threads/rma/testlist b/test/mpi/threads/rma/testlist index d476236..b9f0a46 100644 --- a/test/mpi/threads/rma/testlist +++ b/test/mpi/threads/rma/testlist @@ -1 +1,2 @@ -multirma 2 mpiversion=3.0 \ No newline at end of file +multirma 2 mpiversion=3.0 +multiget 2 mpiversion=3.0 xfail=ticket2143 ----------------------------------------------------------------------- Summary of changes: test/mpi/threads/rma/Makefile.am | 2 +- test/mpi/threads/rma/{multirma.c => multiget.c} | 35 +++++++++++++++-------- test/mpi/threads/rma/testlist | 3 +- 3 files changed, 26 insertions(+), 14 deletions(-) copy test/mpi/threads/rma/{multirma.c => multiget.c} (57%) hooks/post-receive -- MPICH primary repository

1 0