From: suter Date: Tue, 7 Dec 2010 19:38:12 +0000 (+0000) Subject: revalidating the tesh outputs for ctest X-Git-Tag: v3.6_beta2~840 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/049ea72f660d22b10ee993b30e37c2cd9897bba7 revalidating the tesh outputs for ctest git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9083 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index 632a2bf0ba..0d3c3f510e 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -12,13 +12,13 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment_split ! output sort $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_allReduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 -> [100.015912] (2:p1@host1) p1 allReduce 5e8 5e8 100.015912 -> [100.021112] (1:p0@host0) p0 allReduce 5e8 5e8 100.021112 -> [100.021112] (3:p2@host2) p2 allReduce 5e8 5e8 100.021112 -> [150.015912] (2:p1@host1) p1 compute 5e8 50.000000 -> [150.021112] (0:@) Simulation time 150.021 -> [150.021112] (1:p0@host0) p0 compute 5e8 50.000000 -> [150.021112] (3:p2@host2) p2 compute 5e8 50.000000 +> [100.010400] (1:p0@host0) p0 allReduce 5e8 5e8 100.010400 +> [100.010400] (2:p1@host1) p1 allReduce 5e8 5e8 100.010400 +> [100.010400] (3:p2@host2) p2 allReduce 5e8 5e8 100.010400 +> [150.010400] (0:@) Simulation time 150.01 +> [150.010400] (1:p0@host0) p0 compute 5e8 50.000000 +> [150.010400] (2:p1@host1) p1 compute 5e8 50.000000 +> [150.010400] (3:p2@host2) p2 compute 5e8 50.000000 ! output sort $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_barrier.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n @@ -35,33 +35,33 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a ! output sort $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_bcast.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 -> [ 25.010400] (2:p1@host1) p1 bcast 5e8 25.010400 -> [ 25.015600] (1:p0@host0) p0 bcast 5e8 25.015600 -> [ 25.015600] (3:p2@host2) p2 bcast 5e8 25.015600 -> [ 45.010400] (2:p1@host1) p1 compute 2e8 20.000000 -> [ 75.015600] (1:p0@host0) p0 compute 5e8 50.000000 -> [ 75.015600] (3:p2@host2) p2 compute 5e8 50.000000 -> [100.026000] (2:p1@host1) p1 bcast 5e8 55.015600 -> [100.031200] (1:p0@host0) p0 bcast 5e8 25.015600 -> [100.031200] (3:p2@host2) p2 bcast 5e8 25.015600 -> [120.026000] (2:p1@host1) p1 compute 2e8 20.000000 -> [150.031200] (1:p0@host0) p0 compute 5e8 50.000000 -> [150.031200] (3:p2@host2) p2 compute 5e8 50.000000 -> [175.036400] (2:p1@host1) p1 reduce 5e8 5e8 55.010400 -> [175.036400] (3:p2@host2) p2 reduce 5e8 5e8 25.005200 -> [225.036712] (0:@) Simulation time 225.037 -> [225.036712] (1:p0@host0) p0 reduce 5e8 5e8 75.005512 +> [ 25.005200] (1:p0@host0) p0 bcast 5e8 25.005200 +> [ 25.005200] (2:p1@host1) p1 bcast 5e8 25.005200 +> [ 25.005200] (3:p2@host2) p2 bcast 5e8 25.005200 +> [ 45.005200] (2:p1@host1) p1 compute 2e8 20.000000 +> [ 75.005200] (1:p0@host0) p0 compute 5e8 50.000000 +> [ 75.005200] (3:p2@host2) p2 compute 5e8 50.000000 +> [100.010400] (1:p0@host0) p0 bcast 5e8 25.005200 +> [100.010400] (2:p1@host1) p1 bcast 5e8 55.005200 +> [100.010400] (3:p2@host2) p2 bcast 5e8 25.005200 +> [120.010400] (2:p1@host1) p1 compute 2e8 20.000000 +> [150.010400] (1:p0@host0) p0 compute 5e8 50.000000 +> [150.010400] (3:p2@host2) p2 compute 5e8 50.000000 +> [175.015600] (2:p1@host1) p1 reduce 5e8 5e8 55.005200 +> [175.015600] (3:p2@host2) p2 reduce 5e8 5e8 25.005200 +> [225.015600] (0:@) Simulation time 225.016 +> [225.015600] (1:p0@host0) p0 reduce 5e8 5e8 75.005200 ! output sort $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_reduce.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n > [ 0.000000] (1:p0@host0) p0 comm_size 3 0.000000 > [ 25.005200] (2:p1@host1) p1 reduce 5e8 5e8 25.005200 > [ 25.005200] (3:p2@host2) p2 reduce 5e8 5e8 25.005200 +> [ 75.005200] (1:p0@host0) p0 reduce 5e8 5e8 75.005200 > [ 75.005200] (2:p1@host1) p1 compute 5e8 50.000000 > [ 75.005200] (3:p2@host2) p2 compute 5e8 50.000000 -> [ 75.005512] (1:p0@host0) p0 reduce 5e8 5e8 75.005512 -> [125.005512] (0:@) Simulation time 125.006 -> [125.005512] (1:p0@host0) p0 compute 5e8 50.000000 +> [125.005200] (0:@) Simulation time 125.005 +> [125.005200] (1:p0@host0) p0 compute 5e8 50.000000 ! output sort $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n @@ -70,12 +70,12 @@ $ ./actions --log=actions.thres=verbose homogeneous_3_hosts.xml deployment.xml a > [ 50.000000] (3:p2@host2) p2 compute 5e8 50.000000 > [ 50.005200] (1:p0@host0) p0 send p1 1e9 50.005200 > [100.000000] (2:p1@host1) p1 compute 1e9 100.000000 -> [100.000156] (2:p1@host1) p1 wait 0.000156 +> [100.000000] (2:p1@host1) p1 wait 0.000000 > [150.005200] (1:p0@host0) p0 compute 1e9 100.000000 -> [150.005356] (2:p1@host1) p1 send p2 1e9 50.005200 -> [150.005512] (3:p2@host2) p2 wait 100.005512 -> [150.005512] (3:p2@host2) p2 Isend p0 1e9 0.000000 -> [200.005512] (3:p2@host2) p2 compute 5e8 50.000000 -> [200.010712] (0:@) Simulation time 200.011 -> [200.010712] (1:p0@host0) p0 recv p2 50.005512 +> [150.005200] (2:p1@host1) p1 send p2 1e9 50.005200 +> [150.005200] (3:p2@host2) p2 wait 100.005200 +> [150.005200] (3:p2@host2) p2 Isend p0 1e9 0.000000 +> [200.005200] (3:p2@host2) p2 compute 5e8 50.000000 +> [200.010400] (0:@) Simulation time 200.01 +> [200.010400] (1:p0@host0) p0 recv p2 50.005200 diff --git a/examples/msg/actions/actions_split_p0.txt b/examples/msg/actions/actions_split_p0.txt index 42c8f9d057..35ab7a0835 100644 --- a/examples/msg/actions/actions_split_p0.txt +++ b/examples/msg/actions/actions_split_p0.txt @@ -1,4 +1,7 @@ # sample action file (with only the actions for p1, # to be launched by deployment file) +p0 init p0 recv p1 p0 compute 12 +p0 finalize + diff --git a/examples/msg/actions/actions_split_p1.txt b/examples/msg/actions/actions_split_p1.txt index 7f9d5cb170..2c38b293c6 100644 --- a/examples/msg/actions/actions_split_p1.txt +++ b/examples/msg/actions/actions_split_p1.txt @@ -1,4 +1,6 @@ # sample action file (with only the actions for p1, # to be launched by deployment file) +p1 init p1 send p0 1e10 p1 sleep 12 +p1 finalize diff --git a/examples/msg/actions/actions_with_isend.txt b/examples/msg/actions/actions_with_isend.txt index 90c3f24715..f486fcb5a3 100644 --- a/examples/msg/actions/actions_with_isend.txt +++ b/examples/msg/actions/actions_with_isend.txt @@ -1,4 +1,8 @@ # sample action file +p0 init +p1 init +p2 init + p0 send p1 1e9 p0 compute 1e9 p0 recv p2 @@ -13,3 +17,8 @@ p2 compute 5e8 p2 wait p2 Isend p0 1e9 p2 compute 5e8 + +p0 finalize +p1 finalize +p2 finalize +