X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ac7c4d317fa69ef76eb0b4ded7fedd21c2ff9d5..b954df99c86d6573276700063c663f676c7cda6e:/teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c diff --git a/teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c b/teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c index 60bf0a4ebe..ff76581de6 100644 --- a/teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c +++ b/teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c @@ -7,7 +7,6 @@ #include "mpi.h" #include "mpitest.h" -#include "smpi_cocci.h" #include #include #ifdef HAVE_SYS_TIME_H @@ -68,10 +67,14 @@ int main(int argc, char ** argv) SMPI_VARGET_GLOBAL(displs) = (void *) malloc(comm_size * sizeof(int)); if (!SMPI_VARGET_GLOBAL(recvcounts) || !SMPI_VARGET_GLOBAL(displs) || !SMPI_VARGET_GLOBAL(sbuf) || !SMPI_VARGET_GLOBAL(rbuf)) { fprintf(stderr, "Unable to allocate memory:\n"); - if (!SMPI_VARGET_GLOBAL(sbuf)) fprintf(stderr,"\tsbuf of %d bytes\n", MAX_BUF ); - if (!SMPI_VARGET_GLOBAL(rbuf)) fprintf(stderr,"\trbuf of %d bytes\n", MAX_BUF ); - if (!SMPI_VARGET_GLOBAL(recvcounts)) fprintf(stderr,"\trecvcounts of %zd bytes\n", comm_size * sizeof(int) ); - if (!SMPI_VARGET_GLOBAL(displs)) fprintf(stderr,"\tdispls of %zd bytes\n", comm_size * sizeof(int) ); + if (!SMPI_VARGET_GLOBAL(sbuf)) + fprintf(stderr,"\tsbuf of %d bytes\n", MAX_BUF ); + if (!SMPI_VARGET_GLOBAL(rbuf)) + fprintf(stderr,"\trbuf of %d bytes\n", MAX_BUF ); + if (!SMPI_VARGET_GLOBAL(recvcounts)) + fprintf(stderr,"\trecvcounts of %zu bytes\n", comm_size * sizeof(int)); + if (!SMPI_VARGET_GLOBAL(displs)) + fprintf(stderr,"\tdispls of %zu bytes\n", comm_size * sizeof(int)); fflush(stderr); MPI_Abort(MPI_COMM_WORLD, -1); exit(-1); @@ -178,7 +181,7 @@ void comm_tests(MPI_Comm comm) } } -double run_test(long long msg_size, MPI_Comm comm, test_t test_type, +double run_test(long long msg_size, MPI_Comm comm, test_t test_type, double * max_time) { int i, j; @@ -231,7 +234,7 @@ double run_test(long long msg_size, MPI_Comm comm, test_t test_type, /* Test that: 1: sbuf is large enough 2: rbuf is large enough - 3: There were no failures (e.g., tmp nowhere > rbuf size + 3: There were no failures (e.g., tmp nowhere > rbuf size */ MPI_Barrier(comm); start = MPI_Wtime();