From 076194816ead5f5e2a4afff5999e728c5b5396a3 Mon Sep 17 00:00:00 2001 From: pini Date: Thu, 29 Apr 2010 09:41:12 +0000 Subject: [PATCH] Remove unnecessary output that makes these tests fail every time SMPI changes. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7656 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/smpi/bcast.c | 5 +++-- examples/smpi/bcast.tesh | 42 --------------------------------------- examples/smpi/reduce.c | 2 +- examples/smpi/reduce.tesh | 21 -------------------- 4 files changed, 4 insertions(+), 66 deletions(-) diff --git a/examples/smpi/bcast.c b/examples/smpi/bcast.c index 4b594e3a22..ba172dd73d 100644 --- a/examples/smpi/bcast.c +++ b/examples/smpi/bcast.c @@ -26,9 +26,10 @@ int main(int argc, char **argv) if (0 == rank) { value = 17; } - printf("node %d has value %d before broadcast\n", rank, value); MPI_Bcast(&value, 1, MPI_INT, 0, MPI_COMM_WORLD); - printf("node %d has value %d after broadcast\n", rank, value); + if (value != 17) { + printf("node %d has value %d after broadcast\n", rank, value); + } MPI_Barrier(MPI_COMM_WORLD); if (0 == rank && !quiet) diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh index 7356cee56a..6ae5429c5d 100644 --- a/examples/smpi/bcast.tesh +++ b/examples/smpi/bcast.tesh @@ -8,12 +8,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard -> node 1 has value 3 before broadcast -> node 2 has value 3 before broadcast -> node 0 has value 17 before broadcast -> node 1 has value 17 after broadcast -> node 2 has value 17 after broadcast -> node 0 has value 17 after broadcast @@ -27,18 +21,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 3] -> Ginette > [rank 4] -> Bourassa > [rank 5] -> Tremblay -> node 1 has value 3 before broadcast -> node 2 has value 3 before broadcast -> node 3 has value 3 before broadcast -> node 4 has value 3 before broadcast -> node 5 has value 3 before broadcast -> node 0 has value 17 before broadcast -> node 3 has value 17 after broadcast -> node 4 has value 17 after broadcast -> node 2 has value 17 after broadcast -> node 0 has value 17 after broadcast -> node 5 has value 17 after broadcast -> node 1 has value 17 after broadcast # Another test @@ -57,27 +39,3 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 9] -> Bourassa > [rank 10] -> Tremblay > [rank 11] -> Jupiter -> node 1 has value 3 before broadcast -> node 2 has value 3 before broadcast -> node 3 has value 3 before broadcast -> node 4 has value 3 before broadcast -> node 5 has value 3 before broadcast -> node 6 has value 3 before broadcast -> node 7 has value 3 before broadcast -> node 8 has value 3 before broadcast -> node 9 has value 3 before broadcast -> node 10 has value 3 before broadcast -> node 11 has value 3 before broadcast -> node 0 has value 17 before broadcast -> node 3 has value 17 after broadcast -> node 6 has value 17 after broadcast -> node 4 has value 17 after broadcast -> node 0 has value 17 after broadcast -> node 9 has value 17 after broadcast -> node 5 has value 17 after broadcast -> node 10 has value 17 after broadcast -> node 8 has value 17 after broadcast -> node 7 has value 17 after broadcast -> node 1 has value 17 after broadcast -> node 11 has value 17 after broadcast -> node 2 has value 17 after broadcast diff --git a/examples/smpi/reduce.c b/examples/smpi/reduce.c index 85bfa1ee4b..bd4e151f24 100644 --- a/examples/smpi/reduce.c +++ b/examples/smpi/reduce.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) value = rank + 1; /* easy to verify that sum= (size*(size+1))/2; */ - printf("[%d] has value %d\n", rank, value); + //printf("[%d] has value %d\n", rank, value); MPI_Reduce(&value, &sum, 1, MPI_INT, MPI_SUM, root, MPI_COMM_WORLD); MPI_Reduce(&value, &sum_mirror, 1, MPI_INT, MPI_SUM, root, MPI_COMM_WORLD); diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh index 5d3aa69133..a194bcbd19 100644 --- a/examples/smpi/reduce.tesh +++ b/examples/smpi/reduce.tesh @@ -8,9 +8,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 0] -> Tremblay > [rank 1] -> Jupiter > [rank 2] -> Fafard -> [1] has value 2 -> [2] has value 3 -> [0] has value 1 > ** Scalar Int Test Result: > [0] sum=6 ... validation ok. > [0] min=1 ... validation ok. @@ -30,12 +27,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 3] -> Ginette > [rank 4] -> Bourassa > [rank 5] -> Tremblay -> [1] has value 2 -> [2] has value 3 -> [3] has value 4 -> [4] has value 5 -> [5] has value 6 -> [0] has value 1 > ** Scalar Int Test Result: > [0] sum=21 ... validation ok. > [0] min=1 ... validation ok. @@ -65,18 +56,6 @@ $ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir > [rank 9] -> Bourassa > [rank 10] -> Tremblay > [rank 11] -> Jupiter -> [1] has value 2 -> [2] has value 3 -> [3] has value 4 -> [4] has value 5 -> [5] has value 6 -> [6] has value 7 -> [7] has value 8 -> [8] has value 9 -> [9] has value 10 -> [10] has value 11 -> [11] has value 12 -> [0] has value 1 > ** Scalar Int Test Result: > [0] sum=78 ... validation ok. > [0] min=1 ... validation ok. -- 2.20.1