[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-170-g29c8529

mysql vizuser noreply at mpich.org
Sat Jan 18 20:12:20 CST 2014


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  29c8529fb32a710f3707eec9397db3f4e166282f (commit)
       via  57dc140192156e5d4fbdc632b6a48236d33adf0c (commit)
      from  eb42f62412655c0944e89a93dcd27f5a5feda0f3 (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/29c8529fb32a710f3707eec9397db3f4e166282f

commit 29c8529fb32a710f3707eec9397db3f4e166282f
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Fri Jan 17 23:12:00 2014 -0600

    Time iterations and break out if we are too slow.
    
    On some machines the iterations take unusually long.  If they are
    getting to be larger than a predefined amount, break out of that loop.
    
    Fixes #1669.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/test/mpi/rma/manyrma2.c b/test/mpi/rma/manyrma2.c
index 244fba5..571d29e 100644
--- a/test/mpi/rma/manyrma2.c
+++ b/test/mpi/rma/manyrma2.c
@@ -18,6 +18,7 @@
 #define MAX_COUNT 65536*4/16
 #define MAX_RMA_SIZE 2  /* 16 in manyrma performance test */
 #define MAX_RUNS 10
+#define MAX_ITER_TIME  5.0      /* seconds */
 
 typedef enum { SYNC_NONE = 0,
     SYNC_ALL = -1, SYNC_FENCE = 1, SYNC_LOCK = 2, SYNC_PSCW = 4
@@ -48,6 +49,7 @@ int main(int argc, char *argv[])
     MPI_Win win;
     MPI_Group wgroup, accessGroup, exposureGroup;
     int maxSz = MAX_RMA_SIZE;
+    double start, end;
 
     MPI_Init(&argc, &argv);
 
@@ -128,10 +130,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Accumulate with fence, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunAccFence(win, destRank, cnt, sz);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }
@@ -140,10 +144,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Accumulate with lock, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunAccLock(win, destRank, cnt, sz);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }
@@ -152,10 +158,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Put with fence, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunPutFence(win, destRank, cnt, sz);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }
@@ -164,10 +172,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Put with lock, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunPutLock(win, destRank, cnt, sz);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }
@@ -176,10 +186,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Put with pscw, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunPutPSCW(win, destRank, cnt, sz, exposureGroup, accessGroup);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }
@@ -188,10 +200,12 @@ int main(int argc, char *argv[])
         for (sz = 1; sz <= maxSz; sz = sz + sz) {
             if (wrank == 0 && verbose)
                 printf("Accumulate with pscw, %d elements\n", sz);
-            cnt = 1;
-            while (cnt <= maxCount) {
+            for (cnt = 1; cnt <= maxCount; cnt *= 2) {
+                start = MPI_Wtime();
                 RunAccPSCW(win, destRank, cnt, sz, exposureGroup, accessGroup);
-                cnt = 2 * cnt;
+                end = MPI_Wtime();
+                if (end - start > MAX_ITER_TIME)
+                    break;
             }
         }
     }

http://git.mpich.org/mpich.git/commitdiff/57dc140192156e5d4fbdc632b6a48236d33adf0c

commit 57dc140192156e5d4fbdc632b6a48236d33adf0c
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Fri Jan 17 23:10:18 2014 -0600

    White space cleanup.
    
    The code was unparseable to make any changes.

diff --git a/test/mpi/rma/manyrma2.c b/test/mpi/rma/manyrma2.c
index 91d9518..244fba5 100644
--- a/test/mpi/rma/manyrma2.c
+++ b/test/mpi/rma/manyrma2.c
@@ -7,7 +7,7 @@
 /* This test is a simplification of the one in perf/manyrma.c that tests
    for correct handling of the case where many RMA operations occur between
    synchronization events.
-   This is one of the ways that RMA may be used, and is used in the 
+   This is one of the ways that RMA may be used, and is used in the
    reference implementation of the graph500 benchmark.
 */
 #include "mpi.h"
@@ -16,12 +16,13 @@
 #include <string.h>
 
 #define MAX_COUNT 65536*4/16
-#define MAX_RMA_SIZE 2 /* 16 in manyrma performance test */
+#define MAX_RMA_SIZE 2  /* 16 in manyrma performance test */
 #define MAX_RUNS 10
 
-typedef enum { SYNC_NONE=0, 
-	       SYNC_ALL=-1, SYNC_FENCE=1, SYNC_LOCK=2, SYNC_PSCW=4 } sync_t;
-typedef enum { RMA_NONE=0, RMA_ALL=-1, RMA_PUT=1, RMA_ACC=2, RMA_GET=4 } rma_t;
+typedef enum { SYNC_NONE = 0,
+    SYNC_ALL = -1, SYNC_FENCE = 1, SYNC_LOCK = 2, SYNC_PSCW = 4
+} sync_t;
+typedef enum { RMA_NONE = 0, RMA_ALL = -1, RMA_PUT = 1, RMA_ACC = 2, RMA_GET = 4 } rma_t;
 /* Note GET not yet implemented */
 /* By default, run only a subset of the available tests, to keep the
    total runtime reasonably short.  Command line arguments may be used
@@ -31,278 +32,282 @@ rma_t rmaChoice = RMA_ACC;
 
 static int verbose = 0;
 
-void RunAccFence( MPI_Win win, int destRank, int cnt, int sz );
-void RunAccLock( MPI_Win win, int destRank, int cnt, int sz );
-void RunPutFence( MPI_Win win, int destRank, int cnt, int sz );
-void RunPutLock( MPI_Win win, int destRank, int cnt, int sz );
-void RunAccPSCW( MPI_Win win, int destRank, int cnt, int sz, 
-		 MPI_Group exposureGroup, MPI_Group accessGroup );
-void RunPutPSCW( MPI_Win win, int destRank, int cnt, int sz, 
-		 MPI_Group exposureGroup, MPI_Group accessGroup );
+void RunAccFence(MPI_Win win, int destRank, int cnt, int sz);
+void RunAccLock(MPI_Win win, int destRank, int cnt, int sz);
+void RunPutFence(MPI_Win win, int destRank, int cnt, int sz);
+void RunPutLock(MPI_Win win, int destRank, int cnt, int sz);
+void RunAccPSCW(MPI_Win win, int destRank, int cnt, int sz,
+                MPI_Group exposureGroup, MPI_Group accessGroup);
+void RunPutPSCW(MPI_Win win, int destRank, int cnt, int sz,
+                MPI_Group exposureGroup, MPI_Group accessGroup);
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
-    int arraysize, i, cnt, sz, maxCount=MAX_COUNT, *arraybuffer;
+    int arraysize, i, cnt, sz, maxCount = MAX_COUNT, *arraybuffer;
     int wrank, wsize, destRank, srcRank;
     MPI_Win win;
     MPI_Group wgroup, accessGroup, exposureGroup;
-    int    maxSz = MAX_RMA_SIZE;
-
-    MPI_Init( &argc, &argv );
-
-    for (i=1; i<argc; i++) {
-	if (strcmp( argv[i], "-put" ) == 0) {
-	    if (rmaChoice == RMA_ALL) rmaChoice = RMA_NONE;
-	    rmaChoice  |= RMA_PUT;
-	}
-	else if (strcmp( argv[i], "-acc" ) == 0) {
-	    if (rmaChoice == RMA_ALL) rmaChoice = RMA_NONE;
-	    rmaChoice  |= RMA_ACC;
-	}
-	else if (strcmp( argv[i], "-fence" ) == 0) {
-	    if (syncChoice == SYNC_ALL) syncChoice = SYNC_NONE;
-	    syncChoice |= SYNC_FENCE;
-	}
-	else if (strcmp( argv[i], "-lock" ) == 0) {
-	    if (syncChoice == SYNC_ALL) syncChoice = SYNC_NONE;
-	    syncChoice |= SYNC_LOCK;
-	}
-	else if (strcmp( argv[i], "-pscw" ) == 0) {
-	    if (syncChoice == SYNC_ALL) syncChoice = SYNC_NONE;
-	    syncChoice |= SYNC_PSCW;
-	}
-	else if (strcmp( argv[i], "-maxsz" ) == 0) {
-	    i++;
-	    maxSz = atoi( argv[i] );
-	}
-	else if (strcmp( argv[i], "-maxcount" ) == 0) {
-	    i++;
-	    maxCount = atoi( argv[i] );
-	}
-	else {
-	    fprintf( stderr, "Unrecognized argument %s\n", argv[i] );
-	    fprintf( stderr, "%s [ -put ] [ -acc ] [ -lock ] [ -fence ] [ -pscw ] [ -maxsz msgsize ]\n", argv[0] );
-	    MPI_Abort( MPI_COMM_WORLD, 1 );
-	}
+    int maxSz = MAX_RMA_SIZE;
+
+    MPI_Init(&argc, &argv);
+
+    for (i = 1; i < argc; i++) {
+        if (strcmp(argv[i], "-put") == 0) {
+            if (rmaChoice == RMA_ALL)
+                rmaChoice = RMA_NONE;
+            rmaChoice |= RMA_PUT;
+        }
+        else if (strcmp(argv[i], "-acc") == 0) {
+            if (rmaChoice == RMA_ALL)
+                rmaChoice = RMA_NONE;
+            rmaChoice |= RMA_ACC;
+        }
+        else if (strcmp(argv[i], "-fence") == 0) {
+            if (syncChoice == SYNC_ALL)
+                syncChoice = SYNC_NONE;
+            syncChoice |= SYNC_FENCE;
+        }
+        else if (strcmp(argv[i], "-lock") == 0) {
+            if (syncChoice == SYNC_ALL)
+                syncChoice = SYNC_NONE;
+            syncChoice |= SYNC_LOCK;
+        }
+        else if (strcmp(argv[i], "-pscw") == 0) {
+            if (syncChoice == SYNC_ALL)
+                syncChoice = SYNC_NONE;
+            syncChoice |= SYNC_PSCW;
+        }
+        else if (strcmp(argv[i], "-maxsz") == 0) {
+            i++;
+            maxSz = atoi(argv[i]);
+        }
+        else if (strcmp(argv[i], "-maxcount") == 0) {
+            i++;
+            maxCount = atoi(argv[i]);
+        }
+        else {
+            fprintf(stderr, "Unrecognized argument %s\n", argv[i]);
+            fprintf(stderr,
+                    "%s [ -put ] [ -acc ] [ -lock ] [ -fence ] [ -pscw ] [ -maxsz msgsize ]\n",
+                    argv[0]);
+            MPI_Abort(MPI_COMM_WORLD, 1);
+        }
     }
-    
-    MPI_Comm_rank( MPI_COMM_WORLD, &wrank );
-    MPI_Comm_size( MPI_COMM_WORLD, &wsize );
+
+    MPI_Comm_rank(MPI_COMM_WORLD, &wrank);
+    MPI_Comm_size(MPI_COMM_WORLD, &wsize);
     destRank = wrank + 1;
-    while (destRank >= wsize) destRank = destRank - wsize;
+    while (destRank >= wsize)
+        destRank = destRank - wsize;
     srcRank = wrank - 1;
-    if (srcRank < 0) srcRank += wsize;
+    if (srcRank < 0)
+        srcRank += wsize;
 
     /* Create groups for PSCW */
-    MPI_Comm_group( MPI_COMM_WORLD, &wgroup );
-    MPI_Group_incl( wgroup, 1, &destRank, &accessGroup );
-    MPI_Group_incl( wgroup, 1, &srcRank, &exposureGroup );
-    MPI_Group_free( &wgroup );
+    MPI_Comm_group(MPI_COMM_WORLD, &wgroup);
+    MPI_Group_incl(wgroup, 1, &destRank, &accessGroup);
+    MPI_Group_incl(wgroup, 1, &srcRank, &exposureGroup);
+    MPI_Group_free(&wgroup);
 
     arraysize = maxSz * MAX_COUNT;
-    arraybuffer = (int*)malloc( arraysize * sizeof(int) );
+    arraybuffer = (int *) malloc(arraysize * sizeof(int));
     if (!arraybuffer) {
-	fprintf( stderr, "Unable to allocate %d words\n", arraysize );
-	MPI_Abort( MPI_COMM_WORLD, 1 );
+        fprintf(stderr, "Unable to allocate %d words\n", arraysize);
+        MPI_Abort(MPI_COMM_WORLD, 1);
     }
 
-    MPI_Win_create( arraybuffer, arraysize*sizeof(int), (int)sizeof(int),
-		    MPI_INFO_NULL, MPI_COMM_WORLD, &win );
+    MPI_Win_create(arraybuffer, arraysize * sizeof(int), (int) sizeof(int),
+                   MPI_INFO_NULL, MPI_COMM_WORLD, &win);
 
     if (maxCount > MAX_COUNT) {
-	fprintf( stderr, "MaxCount must not exceed %d\n", MAX_COUNT );
-	MPI_Abort( MPI_COMM_WORLD, 1 );
+        fprintf(stderr, "MaxCount must not exceed %d\n", MAX_COUNT);
+        MPI_Abort(MPI_COMM_WORLD, 1);
     }
 
     if ((syncChoice & SYNC_FENCE) && (rmaChoice & RMA_ACC)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Accumulate with fence, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunAccFence( win, destRank, cnt, sz );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Accumulate with fence, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunAccFence(win, destRank, cnt, sz);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
     if ((syncChoice & SYNC_LOCK) && (rmaChoice & RMA_ACC)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Accumulate with lock, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunAccLock( win, destRank, cnt, sz );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Accumulate with lock, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunAccLock(win, destRank, cnt, sz);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
     if ((syncChoice & SYNC_FENCE) && (rmaChoice & RMA_PUT)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Put with fence, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunPutFence( win, destRank, cnt, sz );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Put with fence, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunPutFence(win, destRank, cnt, sz);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
     if ((syncChoice & SYNC_LOCK) && (rmaChoice & RMA_PUT)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Put with lock, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunPutLock( win, destRank, cnt, sz );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Put with lock, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunPutLock(win, destRank, cnt, sz);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
     if ((syncChoice & SYNC_PSCW) && (rmaChoice & RMA_PUT)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Put with pscw, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunPutPSCW( win, destRank, cnt, sz, 
-			    exposureGroup, accessGroup );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Put with pscw, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunPutPSCW(win, destRank, cnt, sz, exposureGroup, accessGroup);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
     if ((syncChoice & SYNC_PSCW) && (rmaChoice & RMA_ACC)) {
-	for (sz=1; sz<=maxSz; sz = sz + sz) {
-	    if (wrank == 0 && verbose) 
-		printf( "Accumulate with pscw, %d elements\n", sz );
-	    cnt = 1;
-	    while (cnt <= maxCount) {
-		RunAccPSCW( win, destRank, cnt, sz, 
-			    exposureGroup, accessGroup );
-		cnt = 2 * cnt;
-	    }
-	}
+        for (sz = 1; sz <= maxSz; sz = sz + sz) {
+            if (wrank == 0 && verbose)
+                printf("Accumulate with pscw, %d elements\n", sz);
+            cnt = 1;
+            while (cnt <= maxCount) {
+                RunAccPSCW(win, destRank, cnt, sz, exposureGroup, accessGroup);
+                cnt = 2 * cnt;
+            }
+        }
     }
 
-    MPI_Win_free( &win );
+    MPI_Win_free(&win);
 
-    MPI_Group_free( &accessGroup );
-    MPI_Group_free( &exposureGroup );
+    MPI_Group_free(&accessGroup);
+    MPI_Group_free(&exposureGroup);
 
     /* If we get here without timing out or failing, we succeeded */
-    if (wrank == 0) printf( " No Errors\n" );
-    
+    if (wrank == 0)
+        printf(" No Errors\n");
+
     MPI_Finalize();
     return 0;
 }
 
 
-void RunAccFence( MPI_Win win, int destRank, int cnt, int sz )
+void RunAccFence(MPI_Win win, int destRank, int cnt, int sz)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_fence( 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Accumulate( &one, sz, MPI_INT, destRank, 
-			    j, sz, MPI_INT, MPI_SUM, win );
-	    j += sz;
-	}
-	MPI_Win_fence( 0, win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_fence(0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Accumulate(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, MPI_SUM, win);
+            j += sz;
+        }
+        MPI_Win_fence(0, win);
     }
 }
 
-void RunAccLock( MPI_Win win, int destRank, int cnt, int sz )
+void RunAccLock(MPI_Win win, int destRank, int cnt, int sz)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_lock( MPI_LOCK_SHARED, destRank, 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Accumulate( &one, sz, MPI_INT, destRank, 
-			    j, sz, MPI_INT, MPI_SUM, win );
-	    j += sz;
-	}
-	MPI_Win_unlock( destRank, win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_lock(MPI_LOCK_SHARED, destRank, 0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Accumulate(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, MPI_SUM, win);
+            j += sz;
+        }
+        MPI_Win_unlock(destRank, win);
     }
 }
 
-void RunPutFence( MPI_Win win, int destRank, int cnt, int sz )
+void RunPutFence(MPI_Win win, int destRank, int cnt, int sz)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_fence( 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Put( &one, sz, MPI_INT, destRank, 
-			    j, sz, MPI_INT, win );
-	    j += sz;
-	}
-	MPI_Win_fence( 0, win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_fence(0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Put(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, win);
+            j += sz;
+        }
+        MPI_Win_fence(0, win);
     }
 }
 
-void RunPutLock( MPI_Win win, int destRank, int cnt, int sz )
+void RunPutLock(MPI_Win win, int destRank, int cnt, int sz)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_lock( MPI_LOCK_SHARED, destRank, 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Put( &one, sz, MPI_INT, destRank, j, sz, MPI_INT, win );
-	    j += sz;
-	}
-	MPI_Win_unlock( destRank, win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_lock(MPI_LOCK_SHARED, destRank, 0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Put(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, win);
+            j += sz;
+        }
+        MPI_Win_unlock(destRank, win);
     }
 }
 
-void RunPutPSCW( MPI_Win win, int destRank, int cnt, int sz, 
-		 MPI_Group exposureGroup, MPI_Group accessGroup )
+void RunPutPSCW(MPI_Win win, int destRank, int cnt, int sz,
+                MPI_Group exposureGroup, MPI_Group accessGroup)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_post( exposureGroup, 0, win );
-	MPI_Win_start( accessGroup, 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Put( &one, sz, MPI_INT, destRank, j, sz, MPI_INT, win );
-	    j += sz;
-	}
-	MPI_Win_complete( win );
-	MPI_Win_wait( win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_post(exposureGroup, 0, win);
+        MPI_Win_start(accessGroup, 0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Put(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, win);
+            j += sz;
+        }
+        MPI_Win_complete(win);
+        MPI_Win_wait(win);
     }
 }
 
-void RunAccPSCW( MPI_Win win, int destRank, int cnt, int sz, 
-		 MPI_Group exposureGroup, MPI_Group accessGroup )
+void RunAccPSCW(MPI_Win win, int destRank, int cnt, int sz,
+                MPI_Group exposureGroup, MPI_Group accessGroup)
 {
     int k, i, j, one = 1;
 
-    for (k=0; k<MAX_RUNS; k++) {
-	MPI_Barrier( MPI_COMM_WORLD );
-	MPI_Win_post( exposureGroup, 0, win );
-	MPI_Win_start( accessGroup, 0, win );
-	j = 0;
-	for (i=0; i<cnt; i++) {
-	    MPI_Accumulate( &one, sz, MPI_INT, destRank, 
-			    j, sz, MPI_INT, MPI_SUM, win );
-	    j += sz;
-	}
-	MPI_Win_complete( win );
-	MPI_Win_wait( win );
+    for (k = 0; k < MAX_RUNS; k++) {
+        MPI_Barrier(MPI_COMM_WORLD);
+        MPI_Win_post(exposureGroup, 0, win);
+        MPI_Win_start(accessGroup, 0, win);
+        j = 0;
+        for (i = 0; i < cnt; i++) {
+            MPI_Accumulate(&one, sz, MPI_INT, destRank, j, sz, MPI_INT, MPI_SUM, win);
+            j += sz;
+        }
+        MPI_Win_complete(win);
+        MPI_Win_wait(win);
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 test/mpi/rma/manyrma2.c |  419 ++++++++++++++++++++++++----------------------
 1 files changed, 219 insertions(+), 200 deletions(-)


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list