Ignore the display of the used collective algorithm

This is because the same tesh file is used to test all collective
variants: we do want them to give the exact same output (functional
testing).

diff --git a/teshsuite/smpi/allgather/allgather_coll.tesh b/teshsuite/smpi/allgather/allgather_coll.tesh
index bbfce75..dc2d218 100644 (file)
--- a/teshsuite/smpi/allgather/allgather_coll.tesh
+++ b/teshsuite/smpi/allgather/allgather_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test all to all
 ! output sort
 
 p Test all to all

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgather_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgather_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/allgatherv/allgatherv_coll.tesh b/teshsuite/smpi/allgatherv/allgatherv_coll.tesh
index 843b330..6c36aa6 100644 (file)
--- a/teshsuite/smpi/allgatherv/allgatherv_coll.tesh
+++ b/teshsuite/smpi/allgatherv/allgatherv_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test allgatherv
 ! output sort
 
 p Test allgatherv

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgatherv_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allgatherv_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/allreduce/allreduce_coll.tesh b/teshsuite/smpi/allreduce/allreduce_coll.tesh
index 5d9832f..cecba0c 100644 (file)
--- a/teshsuite/smpi/allreduce/allreduce_coll.tesh
+++ b/teshsuite/smpi/allreduce/allreduce_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test allreduce
 ! output sort
 
 p Test allreduce

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/allreduce/allreduce_coll_large.tesh b/teshsuite/smpi/allreduce/allreduce_coll_large.tesh
index deacf27..8f7eaa7 100644 (file)
--- a/teshsuite/smpi/allreduce/allreduce_coll_large.tesh
+++ b/teshsuite/smpi/allreduce/allreduce_coll_large.tesh
@@ -4,7 +4,7 @@
 
 ! timeout 20
 p Test allreduce
 
 ! timeout 20
 p Test allreduce

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll 30000 --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll 30000 --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/alltoall/alltoall_coll.tesh b/teshsuite/smpi/alltoall/alltoall_coll.tesh
index 3bc5d07..c2bd4d5 100644 (file)
--- a/teshsuite/smpi/alltoall/alltoall_coll.tesh
+++ b/teshsuite/smpi/alltoall/alltoall_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test all to all
 ! output sort
 
 p Test all to all

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoall_coll -q --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoall_coll -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/alltoallv/alltoallv_coll.tesh b/teshsuite/smpi/alltoallv/alltoallv_coll.tesh
index 2d1dc1e..e47b26a 100644 (file)
--- a/teshsuite/smpi/alltoallv/alltoallv_coll.tesh
+++ b/teshsuite/smpi/alltoallv/alltoallv_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test all to all
 ! output sort
 
 p Test all to all

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoallv_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/alltoallv_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/barrier/barrier_coll.tesh b/teshsuite/smpi/barrier/barrier_coll.tesh
index 73cfd31..8f53e26 100644 (file)
--- a/teshsuite/smpi/barrier/barrier_coll.tesh
+++ b/teshsuite/smpi/barrier/barrier_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test barrier
 ! output sort
 
 p Test barrier

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/barrier_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/barrier_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > ... Barrier ....
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [rank 0] -> Tremblay
 > ... Barrier ....
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [rank 0] -> Tremblay

diff --git a/teshsuite/smpi/bcast/bcast_coll.tesh b/teshsuite/smpi/bcast/bcast_coll.tesh
index 5827590..d92f374 100644 (file)
--- a/teshsuite/smpi/bcast/bcast_coll.tesh
+++ b/teshsuite/smpi/bcast/bcast_coll.tesh
@@ -2,7 +2,7 @@ p Test Broadcast with more processes than hosts
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
 
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
 

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/bcast_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/bcast_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/gather/gather_coll.tesh b/teshsuite/smpi/gather/gather_coll.tesh
index 63483f0..c6af534 100644 (file)
--- a/teshsuite/smpi/gather/gather_coll.tesh
+++ b/teshsuite/smpi/gather/gather_coll.tesh
@@ -4,7 +4,7 @@
 ! timeout 30
 
 p Test all to all
 ! timeout 30
 
 p Test all to all

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/gather_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/gather_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay
 > [rank 0] -> Tremblay
 > [rank 1] -> Tremblay
 > [rank 2] -> Tremblay

diff --git a/teshsuite/smpi/reduce/reduce_coll.tesh b/teshsuite/smpi/reduce/reduce_coll.tesh
index 1587445..917bfe5 100644 (file)
--- a/teshsuite/smpi/reduce/reduce_coll.tesh
+++ b/teshsuite/smpi/reduce/reduce_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test allreduce
 ! output sort
 
 p Test allreduce

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [0] second sndbuf=[0 ]
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [0] second sndbuf=[0 ]

diff --git a/teshsuite/smpi/reduce/reduce_scatter_coll.tesh b/teshsuite/smpi/reduce/reduce_scatter_coll.tesh
index 1c5155e..dcbcda7 100644 (file)
--- a/teshsuite/smpi/reduce/reduce_scatter_coll.tesh
+++ b/teshsuite/smpi/reduce/reduce_scatter_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test reduce_scatter
 ! output sort
 
 p Test reduce_scatter

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_scatter_coll --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/reduce_scatter_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 >  No Errors
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [rank 0] -> Tremblay
 >  No Errors
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [rank 0] -> Tremblay

diff --git a/teshsuite/smpi/scatter/scatter_coll.tesh b/teshsuite/smpi/scatter/scatter_coll.tesh
index 5dafeb3..08cc4ba 100644 (file)
--- a/teshsuite/smpi/scatter/scatter_coll.tesh
+++ b/teshsuite/smpi/scatter/scatter_coll.tesh
@@ -3,7 +3,7 @@
 ! output sort
 
 p Test scatter
 ! output sort
 
 p Test scatter

-$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/scatter --log=smpi_kernel.thres:warning
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/scatter --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error

 >      [0] ok.
 >      [0] ok.
 >      [10] ok.
 >      [0] ok.
 >      [0] ok.
 >      [10] ok.