X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9c9e08948a8387e9e8ecb0fe67ab6b94ec2a66f..d0f67417a4047c5f844bb417daf8f4f1fa285f05:/teshsuite/smpi/mpich3-test/coll/gather.c

diff --git a/teshsuite/smpi/mpich3-test/coll/gather.c b/teshsuite/smpi/mpich3-test/coll/gather.c
index e14503f3b1..b7152c16ba 100644
--- a/teshsuite/smpi/mpich3-test/coll/gather.c
+++ b/teshsuite/smpi/mpich3-test/coll/gather.c
@@ -12,73 +12,63 @@
 
 /* Gather data from a vector to contiguous */
 
-int main( int argc, char **argv )
+int main(int argc, char **argv)
 {
     MPI_Datatype vec;
-    MPI_Comm     comm;
+    MPI_Comm comm;
     double *vecin, *vecout;
-    int    minsize = 2, count;
-    int    root, i, n, stride, errs = 0;
-    int    rank, size;
+    int minsize = 2, count;
+    int root, i, n, stride, errs = 0;
+    int rank, size;
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
 
-    while (MTestGetIntracommGeneral( &comm, minsize, 1 )) {
-	if (comm == MPI_COMM_NULL) continue;
-	/* Determine the sender and receiver */
-	MPI_Comm_rank( comm, &rank );
-	MPI_Comm_size( comm, &size );
-	
-	for (root=0; root<size; root++) {
-	    for (count = 1; count < 65000; count = count * 2) {
-		n = 12;
-		stride = 10;
-		vecin = (double *)malloc( n * stride * size * sizeof(double) );
-		vecout = (double *)malloc( size * n * sizeof(double) );
-		
-		MPI_Type_vector( n, 1, stride, MPI_DOUBLE, &vec );
-		MPI_Type_commit( &vec );
-		
-		for (i=0; i<n*stride; i++) vecin[i] =-2;
-		for (i=0; i<n; i++) vecin[i*stride] = rank * n + i;
-		
-		MPI_Gather( vecin, 1, vec, vecout, n, MPI_DOUBLE, root, comm );
-		
-		if (rank == root) {
-		    for (i=0; i<n*size; i++) {
-			if (vecout[i] != i) {
-			    errs++;
-			    if (errs < 10) {
-				fprintf( stderr, "vecout[%d]=%d\n",
-					 i, (int)vecout[i] );
-			    }
-			}
-		    }
-		}
-		MPI_Type_free( &vec );
-		free( vecin );
-		free( vecout );
-	    }
-	}
-	MTestFreeComm( &comm );
+    while (MTestGetIntracommGeneral(&comm, minsize, 1)) {
+        if (comm == MPI_COMM_NULL)
+            continue;
+        /* Determine the sender and receiver */
+        MPI_Comm_rank(comm, &rank);
+        MPI_Comm_size(comm, &size);
+
+        for (root = 0; root < size; root++) {
+            for (count = 1; count < 65000; count = count * 2) {
+                n = 12;
+                stride = 10;
+                vecin = (double *) malloc(n * stride * size * sizeof(double));
+                vecout = (double *) malloc(size * n * sizeof(double));
+
+                MPI_Type_vector(n, 1, stride, MPI_DOUBLE, &vec);
+                MPI_Type_commit(&vec);
+
+                for (i = 0; i < n * stride; i++)
+                    vecin[i] = -2;
+                for (i = 0; i < n; i++)
+                    vecin[i * stride] = rank * n + i;
+
+                MPI_Gather(vecin, 1, vec, vecout, n, MPI_DOUBLE, root, comm);
+
+                if (rank == root) {
+                    for (i = 0; i < n * size; i++) {
+                        if (vecout[i] != i) {
+                            errs++;
+                            if (errs < 10) {
+                                fprintf(stderr, "vecout[%d]=%d\n", i, (int) vecout[i]);
+                            }
+                        }
+                    }
+                }
+                MPI_Type_free(&vec);
+                free(vecin);
+                free(vecout);
+            }
+        }
+        MTestFreeComm(&comm);
     }
 
     /* do a zero length gather */
-    MPI_Gather( NULL, 0, MPI_BYTE, NULL, 0, MPI_BYTE, 0, MPI_COMM_WORLD );
-
-#if MTEST_HAVE_MIN_MPI_VERSION(2,2)
-    /* Check to make sure that aliasing is disallowed correctly */
-    MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    if (0 == rank)
-        if (MPI_SUCCESS == MPI_Gather(&rank, 1, MPI_INT,
-                                      &rank, 1, MPI_INT, 0, MPI_COMM_WORLD))
-            errs++;
-#endif
+    MPI_Gather(NULL, 0, MPI_BYTE, NULL, 0, MPI_BYTE, 0, MPI_COMM_WORLD);
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }
-
-