Upgrade coll mpich testlist to new mpich

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

diff --git a/teshsuite/smpi/mpich3-test/coll/icgather.c b/teshsuite/smpi/mpich3-test/coll/icgather.c
index 4865cd0..b4ec3f3 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/icgather.c
+++ b/teshsuite/smpi/mpich3-test/coll/icgather.c
@@ -8,12 +8,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mpitest.h"
+#include "mpicolltest.h"
 
 /*
 static char MTEST_Descrip[] = "Simple intercomm gather test";
 */
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
     int errs = 0, err;
     int *buf = 0;
@@ -21,66 +22,67 @@ int main( int argc, char *argv[] )
     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 )) {
-       if (comm == MPI_COMM_NULL) continue;
-       MPI_Comm_rank( comm, &rank );
-       MPI_Comm_remote_size( comm, &rsize );
-       MPI_Comm_size( comm, &size );
-       /* 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) {
-           if (leftGroup) {
-               buf = (int *)malloc( count * rsize * sizeof(int) );
-               for (i=0; i<count*rsize; i++) buf[i] = -1;
+    while (MTestGetIntercomm(&comm, &leftGroup, 4)) {
+        if (comm == MPI_COMM_NULL)
+            continue;
+        MPI_Comm_rank(comm, &rank);
+        MPI_Comm_remote_size(comm, &rsize);
+        MPI_Comm_size(comm, &size);
+        /* 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) {
+            if (leftGroup) {
+                buf = (int *) malloc(count * rsize * sizeof(int));
+                for (i = 0; i < count * rsize; i++)
+                    buf[i] = -1;
 
-               err = MPI_Gather( NULL, 0, datatype,
-                                 buf, count, datatype, 
-                                (rank == 0) ? MPI_ROOT : MPI_PROC_NULL,
-                                comm );
-               if (err) {
-                   errs++;
-                   MTestPrintError( err );
-               }
-               /* Test that no other process in this group received the 
-                  broadcast */
-               if (rank != 0) {
-                   for (i=0; i<count; i++) {
-                       if (buf[i] != -1) {
-                           errs++;
-                       }
-                   }
-               }
-               else {
-                   /* Check for the correct data */
-                   for (i=0; i<count*rsize; i++) {
-                       if (buf[i] != i) {
-                           errs++;
-                       }
-                   }
-               }
-           }
-           else {
-               /* In the right group */
-               buf = (int *)malloc( count * sizeof(int) );
-               for (i=0; i<count; i++) buf[i] = rank * count + i;
-               err = MPI_Gather( buf, count, datatype, 
-                                 NULL, 0, datatype, 0, comm );
-               if (err) {
-                   errs++;
-                   MTestPrintError( err );
-               }
-           }
-       free( buf );
-       }
-       MTestFreeComm( &comm );
+                err = MTest_Gather(NULL, 0, datatype,
+                                   buf, count, datatype,
+                                   (rank == 0) ? MPI_ROOT : MPI_PROC_NULL, comm);
+                if (err) {
+                    errs++;
+                    MTestPrintError(err);
+                }
+                /* Test that no other process in this group received the
+                 * broadcast */
+                if (rank != 0) {
+                    for (i = 0; i < count; i++) {
+                        if (buf[i] != -1) {
+                            errs++;
+                        }
+                    }
+                }
+                else {
+                    /* Check for the correct data */
+                    for (i = 0; i < count * rsize; i++) {
+                        if (buf[i] != i) {
+                            errs++;
+                        }
+                    }
+                }
+            }
+            else {
+                /* In the right group */
+                buf = (int *) malloc(count * sizeof(int));
+                for (i = 0; i < count; i++)
+                    buf[i] = rank * count + i;
+                err = MTest_Gather(buf, count, datatype, NULL, 0, datatype, 0, comm);
+                if (err) {
+                    errs++;
+                    MTestPrintError(err);
+                }
+            }
+            free(buf);
+        }
+        MTestFreeComm(&comm);
     }
 
-    MTest_Finalize( errs );
+    MTest_Finalize(errs);
     MPI_Finalize();
     return 0;
 }