X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6..90f50bba185f1c86225aa498dcc3a01c9080b52b:/teshsuite/smpi/mpich3-test/coll/reduce.c

diff --git a/teshsuite/smpi/mpich3-test/coll/reduce.c b/teshsuite/smpi/mpich3-test/coll/reduce.c
index ad09c9bf8f..d86503e28a 100644
--- a/teshsuite/smpi/mpich3-test/coll/reduce.c
+++ b/teshsuite/smpi/mpich3-test/coll/reduce.c
@@ -13,54 +13,47 @@
 static char MTEST_Descrip[] = "A simple test of Reduce with all choices of root process";
 */
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0;
     int rank, size, root;
     int *sendbuf, *recvbuf, i;
-    int minsize = 2, count; 
-    MPI_Comm      comm;
+    int minsize = 2, count;
+    MPI_Comm comm;
 
-    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 (count = 1; count < 130000; count = count * 2) {
-	    sendbuf = (int *)malloc( count * sizeof(int) );
-	    recvbuf = (int *)malloc( count * sizeof(int) );
-	    for (root = 0; root < size; root ++) {
-		for (i=0; i<count; i++) sendbuf[i] = i;
-		for (i=0; i<count; i++) recvbuf[i] = -1;
-		MPI_Reduce( sendbuf, recvbuf, count, MPI_INT, MPI_SUM, 
-			    root, comm );
-		if (rank == root) {
-		    for (i=0; i<count; i++) {
-			if (recvbuf[i] != i * size) {
-			    errs++;
-			}
-		    }
-		}
-	    }
-	    free( sendbuf );
-	    free( recvbuf );
-	}
+    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);
 
-#if MTEST_HAVE_MIN_MPI_VERSION(2,2)
-        if (0 == rank) {
-            MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-            if (MPI_SUCCESS == MPI_Reduce(&rank, &rank, 1, MPI_INT, MPI_SUM, 0, comm))
-                errs++;
+        for (count = 1; count < 130000; count = count * 2) {
+            sendbuf = (int *) malloc(count * sizeof(int));
+            recvbuf = (int *) malloc(count * sizeof(int));
+            for (root = 0; root < size; root++) {
+                for (i = 0; i < count; i++)
+                    sendbuf[i] = i;
+                for (i = 0; i < count; i++)
+                    recvbuf[i] = -1;
+                MPI_Reduce(sendbuf, recvbuf, count, MPI_INT, MPI_SUM, root, comm);
+                if (rank == root) {
+                    for (i = 0; i < count; i++) {
+                        if (recvbuf[i] != i * size) {
+                            errs++;
+                        }
+                    }
+                }
+            }
+            free(sendbuf);
+            free(recvbuf);
         }
-#endif
-
-	MTestFreeComm( &comm );
+        MTestFreeComm(&comm);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }