Upgrade coll mpich testlist to new mpich

[simgrid.git] / teshsuite / smpi / mpich3-test / coll / redscat3.c

diff --git a/teshsuite/smpi/mpich3-test/coll/redscat3.c b/teshsuite/smpi/mpich3-test/coll/redscat3.c
index 3ebf0be..42474d3 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/redscat3.c
+++ b/teshsuite/smpi/mpich3-test/coll/redscat3.c
@@ -3,11 +3,11 @@
  *  (C) 2010 by Argonne National Laboratory.
  *      See COPYRIGHT in top-level directory.
  */
-/* 
+/*
  * Test of reduce scatter with large data (needed in MPICH to trigger the
  * long-data algorithm)
  *
- * Each processor contributes its rank + the index to the reduction, 
+ * Each processor contributes its rank + the index to the reduction,
  * then receives the ith sum
  *
  * Can be called with any number of processors.
@@ -17,101 +17,90 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mpitest.h"
+#include "mpicolltest.h"
 
 /* Limit the number of error reports */
 #define MAX_ERRORS 10
 
-int main( int argc, char **argv )
+int main(int argc, char **argv)
 {
-    int      err = 0;
-    int      *sendbuf, *recvbuf, *recvcounts;
-    int      size, rank, i, j, idx, mycount, sumval;
+    int err = 0;
+    int *sendbuf, *recvbuf, *recvcounts;
+    int size, rank, i, j, idx, mycount, sumval;
     MPI_Comm comm;
 
 
-    MTest_Init( &argc, &argv );
+    MTest_Init(&argc, &argv);
     comm = MPI_COMM_WORLD;
 
-    MPI_Comm_size( comm, &size );
-    MPI_Comm_rank( comm, &rank );
-    recvcounts = (int *)malloc( size * sizeof(int) );
+    MPI_Comm_size(comm, &size);
+    MPI_Comm_rank(comm, &rank);
+    recvcounts = (int *) malloc(size * sizeof(int));
     if (!recvcounts) {
-       fprintf( stderr, "Could not allocate %d ints for recvcounts\n", 
-                size );
-       MPI_Abort( MPI_COMM_WORLD, 1 );
-        exit(1);
+        fprintf(stderr, "Could not allocate %d ints for recvcounts\n", size);
+        MPI_Abort(MPI_COMM_WORLD, 1);
     }
     mycount = (1024 * 1024) / size;
-    for (i=0; i<size; i++) 
-       recvcounts[i] = mycount;
-    sendbuf = (int *) malloc( mycount * size * sizeof(int) );
+    for (i = 0; i < size; i++)
+        recvcounts[i] = mycount;
+    sendbuf = (int *) malloc(mycount * size * sizeof(int));
     if (!sendbuf) {
-       fprintf( stderr, "Could not allocate %d ints for sendbuf\n", 
-                mycount * size );
-       MPI_Abort( MPI_COMM_WORLD, 1 );
-        exit(1);
+        fprintf(stderr, "Could not allocate %d ints for sendbuf\n", mycount * size);
+        MPI_Abort(MPI_COMM_WORLD, 1);
     }
     idx = 0;
-    for (i=0; i<size; i++) {
-       for (j=0; j<mycount; j++) {
-           sendbuf[idx++] = rank + i;
-       }
+    for (i = 0; i < size; i++) {
+        for (j = 0; j < mycount; j++) {
+            sendbuf[idx++] = rank + i;
+        }
     }
-    recvbuf = (int *)malloc( mycount * sizeof(int) );
+    recvbuf = (int *) malloc(mycount * sizeof(int));
     if (!recvbuf) {
-       fprintf( stderr, "Could not allocate %d ints for recvbuf\n", 
-                mycount );
-       MPI_Abort( MPI_COMM_WORLD, 1 );
-        exit(1);
+        fprintf(stderr, "Could not allocate %d ints for recvbuf\n", mycount);
+        MPI_Abort(MPI_COMM_WORLD, 1);
     }
-    for (i=0; i<mycount; i++) {
-       recvbuf[i] = -1;
+    for (i = 0; i < mycount; i++) {
+        recvbuf[i] = -1;
     }
 
-    MPI_Reduce_scatter( sendbuf, recvbuf, recvcounts, MPI_INT, MPI_SUM, comm );
+    MTest_Reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_INT, MPI_SUM, comm);
 
-    sumval = size * rank + ((size - 1) * size)/2;
+    sumval = size * rank + ((size - 1) * size) / 2;
     /* recvbuf should be size * (rank + i) */
-    for (i=0; i<mycount; i++) {
-       if (recvbuf[i] != sumval) {
-           err++;
-           if (err < MAX_ERRORS) {
-               fprintf( stdout, "Did not get expected value for reduce scatter\n" );
-               fprintf( stdout, "[%d] Got recvbuf[%d] = %d expected %d\n",
-                        rank, i, recvbuf[i], sumval );
-           }
-       }
+    for (i = 0; i < mycount; i++) {
+        if (recvbuf[i] != sumval) {
+            err++;
+            if (err < MAX_ERRORS) {
+                fprintf(stdout, "Did not get expected value for reduce scatter\n");
+                fprintf(stdout, "[%d] Got recvbuf[%d] = %d expected %d\n",
+                        rank, i, recvbuf[i], sumval);
+            }
+        }
     }
 
 #if MTEST_HAVE_MIN_MPI_VERSION(2,2)
-    MPI_Reduce_scatter( MPI_IN_PLACE, sendbuf, recvcounts, MPI_INT, MPI_SUM, 
-                       comm );
+    MTest_Reduce_scatter(MPI_IN_PLACE, sendbuf, recvcounts, MPI_INT, MPI_SUM, comm);
 
-    sumval = size * rank + ((size - 1) * size)/2;
+    sumval = size * rank + ((size - 1) * size) / 2;
     /* recv'ed values for my process should be size * (rank + i) */
-    for (i=0; i<mycount; i++) {
+    for (i = 0; i < mycount; i++) {
         if (sendbuf[i] != sumval) {
             err++;
             if (err < MAX_ERRORS) {
-                fprintf( stdout, "Did not get expected value for reduce scatter (in place)\n" );
-                fprintf( stdout, "[%d] Got buf[%d] = %d expected %d\n",
-                    rank, i, sendbuf[i], sumval );
+                fprintf(stdout, "Did not get expected value for reduce scatter (in place)\n");
+                fprintf(stdout, "[%d] Got buf[%d] = %d expected %d\n", rank, i, sendbuf[i], sumval);
             }
         }
     }
-
-    MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-    if (MPI_SUCCESS == MPI_Reduce_scatter(sendbuf, sendbuf, recvcounts, MPI_INT, MPI_SUM, comm))
-        err++;
 #endif
 
     free(sendbuf);
     free(recvbuf);
     free(recvcounts);
-       
-    MTest_Finalize( err );
 
-    MPI_Finalize( );
+    MTest_Finalize(err);
+
+    MPI_Finalize();
 
     return 0;
 }