X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..b382315f0693083344eb9a25a8fc37b7091bddc7:/teshsuite/smpi/mpich3-test/coll/icreduce.c?ds=sidebyside

diff --git a/teshsuite/smpi/mpich3-test/coll/icreduce.c b/teshsuite/smpi/mpich3-test/coll/icreduce.c
index 49bd537f71..a71ac6f412 100644
--- a/teshsuite/smpi/mpich3-test/coll/icreduce.c
+++ b/teshsuite/smpi/mpich3-test/coll/icreduce.c
@@ -8,89 +8,89 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mpitest.h"
+#include "mpicolltest.h"
 
 /*
 static char MTEST_Descrip[] = "Simple intercomm reduce test";
 */
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0, err;
-    int *sendbuf = 0, *recvbuf=0;
+    int *sendbuf = 0, *recvbuf = 0;
     int leftGroup, i, count, rank, rsize;
     MPI_Comm comm;
     MPI_Datatype datatype;
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
 
     datatype = MPI_INT;
     /* Get an intercommunicator */
-    while (MTestGetIntercomm( &comm, &leftGroup, 4 )) {
+    while (MTestGetIntercomm(&comm, &leftGroup, 4)) {
         if (comm == MPI_COMM_NULL)
             continue;
 
-	MPI_Comm_rank( comm, &rank );
-	MPI_Comm_remote_size( comm, &rsize );
+        MPI_Comm_rank(comm, &rank);
+        MPI_Comm_remote_size(comm, &rsize);
 
-	/* To improve reporting of problems about operations, we
-	   change the error handler to errors return */
-	MPI_Comm_set_errhandler( comm, MPI_ERRORS_RETURN );
+        /* To improve reporting of problems about operations, we
+         * change the error handler to errors return */
+        MPI_Comm_set_errhandler(comm, MPI_ERRORS_RETURN);
 
-	for (count = 1; count < 65000; count = 2 * count) {
-	    sendbuf = (int *)malloc( count * sizeof(int) );
-	    recvbuf = (int *)malloc( count * sizeof(int) );
-	    for (i=0; i<count; i++) {
-		sendbuf[i] = -1;
-		recvbuf[i] = -1;
-	    }
-	    if (leftGroup) {
-		err = MPI_Reduce( sendbuf, recvbuf, count, datatype, MPI_SUM,
-				 (rank == 0) ? MPI_ROOT : MPI_PROC_NULL,
-				 comm );
-		if (err) {
-		    errs++;
-		    MTestPrintError( err );
-		}
-		/* Test that no other process in this group received the 
-		   broadcast, and that we got the right answers */
-		if (rank == 0) {
-		    for (i=0; i<count; i++) {
-			if (recvbuf[i] != i * rsize) {
-			    errs++;
-			}
-		    }
-		}
-		else {
-		    for (i=0; i<count; i++) {
-			if (recvbuf[i] != -1) {
-			    errs++;
-			}
-		    }
-		}
-	    }
-	    else {
-		/* In the right group */
-		for (i=0; i<count; i++) sendbuf[i] = i;
-		err = MPI_Reduce( sendbuf, recvbuf, count, datatype, MPI_SUM, 
-				  0, comm );
-		if (err) {
-		    errs++;
-		    MTestPrintError( err );
-		}
-		/* Check that we have received no data */
-		for (i=0; i<count; i++) {
-		    if (recvbuf[i] != -1) {
-			errs++;
-		    }
-		}
-	    }
-	free( sendbuf ); 
-	free( recvbuf );
-	}
-	MTestFreeComm( &comm );
+        for (count = 1; count < 65000; count = 2 * count) {
+            sendbuf = (int *) malloc(count * sizeof(int));
+            recvbuf = (int *) malloc(count * sizeof(int));
+            for (i = 0; i < count; i++) {
+                sendbuf[i] = -1;
+                recvbuf[i] = -1;
+            }
+            if (leftGroup) {
+                err = MTest_Reduce(sendbuf, recvbuf, count, datatype, MPI_SUM,
+                                   (rank == 0) ? MPI_ROOT : MPI_PROC_NULL, comm);
+                if (err) {
+                    errs++;
+                    MTestPrintError(err);
+                }
+                /* Test that no other process in this group received the
+                 * broadcast, and that we got the right answers */
+                if (rank == 0) {
+                    for (i = 0; i < count; i++) {
+                        if (recvbuf[i] != i * rsize) {
+                            errs++;
+                        }
+                    }
+                }
+                else {
+                    for (i = 0; i < count; i++) {
+                        if (recvbuf[i] != -1) {
+                            errs++;
+                        }
+                    }
+                }
+            }
+            else {
+                /* In the right group */
+                for (i = 0; i < count; i++)
+                    sendbuf[i] = i;
+                err = MTest_Reduce(sendbuf, recvbuf, count, datatype, MPI_SUM, 0, comm);
+                if (err) {
+                    errs++;
+                    MTestPrintError(err);
+                }
+                /* Check that we have received no data */
+                for (i = 0; i < count; i++) {
+                    if (recvbuf[i] != -1) {
+                        errs++;
+                    }
+                }
+            }
+            free(sendbuf);
+            free(recvbuf);
+        }
+        MTestFreeComm(&comm);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }