From: Frederic Suter Date: Fri, 26 Feb 2016 11:41:31 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_13~647^2~15 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fea2606dff029fec63088d8e3d9f42925a67efea?hp=28f07de780131679dffc1443e213ae7a549bd601 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt index 29a83d08a3..e6a2fca780 100644 --- a/examples/msg/actions/CMakeLists.txt +++ b/examples/msg/actions/CMakeLists.txt @@ -20,13 +20,8 @@ set(examples_src PARENT_SCOPE) set(txt_files ${txt_files} - ${CMAKE_CURRENT_SOURCE_DIR}/actions_io.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_allReduce.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_barrier.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_bcast.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_reduce.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_split_p0.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_split_p1.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions.txt - ${CMAKE_CURRENT_SOURCE_DIR}/actions_with_isend.txt + ${CMAKE_CURRENT_SOURCE_DIR}/mpi_actions_shared.txt + ${CMAKE_CURRENT_SOURCE_DIR}/mpi_actions_split_p0.txt + ${CMAKE_CURRENT_SOURCE_DIR}/mpi_actions_split_p1.txt + ${CMAKE_CURRENT_SOURCE_DIR}/storage_actions.txt PARENT_SCOPE) diff --git a/examples/msg/actions/actions.tesh b/examples/msg/actions/actions.tesh index 0873dae249..bce14deee9 100644 --- a/examples/msg/actions/actions.tesh +++ b/examples/msg/actions/actions.tesh @@ -11,81 +11,32 @@ $ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/ > [ 32.703314] (0:maestro@) Simulation time 32.7033 ! output sort 19 -$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_allReduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> WARNING: THIS BINARY IS KINDA DEPRECATED -> This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead. -> [ 0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000 -> [ 7.171139] (2:p1@Ruby) p1 allReduce 5e8 5e8 7.171139 -> [ 7.171139] (3:p2@Perl) p2 allReduce 5e8 5e8 7.171139 -> [ 7.171139] (1:p0@Tremblay) p0 allReduce 5e8 5e8 7.171139 -> [ 12.268239] (2:p1@Ruby) p1 compute 5e8 5.097100 -> [ 12.268239] (1:p0@Tremblay) p0 compute 5e8 5.097100 -> [ 12.268239] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 12.268239] (0:maestro@) Simulation time 12.2682 - -! output sort 19 -$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_barrier.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> WARNING: THIS BINARY IS KINDA DEPRECATED -> This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead. -> [ 0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000 -> [ 0.000000] (2:p1@Ruby) p1 comm_size 3 0.000000 -> [ 0.000000] (3:p2@Perl) p2 comm_size 3 0.000000 -> [ 0.022653] (2:p1@Ruby) p1 recv p0 0.022653 -> [ 0.022653] (1:p0@Tremblay) p0 send p1 1E7 0.022653 -> [ 0.063430] (3:p2@Perl) p2 compute 4E6 0.040777 -> [ 0.063430] (2:p1@Ruby) p1 compute 4E6 0.040777 -> [ 0.068527] (1:p0@Tremblay) p0 compute 4.5E6 0.045874 -> [ 0.068527] (0:maestro@) Simulation time 0.0685268 - -! output sort 19 -$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_bcast.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml mpi_actions_shared.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > WARNING: THIS BINARY IS KINDA DEPRECATED > This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead. > [ 0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000 +> [ 1.037020] (1:p0@Tremblay) p0 bcast 5e8 1.037020 > [ 1.037020] (2:p1@Ruby) p1 bcast 5e8 1.037020 > [ 1.037020] (3:p2@Perl) p2 bcast 5e8 1.037020 -> [ 1.037020] (1:p0@Tremblay) p0 bcast 5e8 1.037020 -> [ 3.075860] (2:p1@Ruby) p1 compute 2e8 2.038840 -> [ 6.134119] (1:p0@Tremblay) p0 compute 5e8 5.097100 -> [ 6.134119] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 7.171139] (2:p1@Ruby) p1 bcast 5e8 4.095279 -> [ 7.171139] (3:p2@Perl) p2 bcast 5e8 1.037020 -> [ 7.171139] (1:p0@Tremblay) p0 bcast 5e8 1.037020 -> [ 9.209979] (2:p1@Ruby) p1 compute 2e8 2.038840 -> [ 12.268239] (1:p0@Tremblay) p0 compute 5e8 5.097100 -> [ 12.268239] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 13.305258] (2:p1@Ruby) p1 reduce 5e8 5e8 4.095279 -> [ 13.305258] (3:p2@Perl) p2 reduce 5e8 5e8 1.037020 -> [ 18.402358] (1:p0@Tremblay) p0 reduce 5e8 5e8 6.134119 -> [ 18.402358] (0:maestro@) Simulation time 18.4024 - -! output sort 19 -$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_reduce.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> WARNING: THIS BINARY IS KINDA DEPRECATED -> This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead. -> [ 0.000000] (1:p0@Tremblay) p0 comm_size 3 0.000000 -> [ 1.037020] (2:p1@Ruby) p1 reduce 5e8 5e8 1.037020 -> [ 1.037020] (3:p2@Perl) p2 reduce 5e8 5e8 1.037020 -> [ 6.134119] (2:p1@Ruby) p1 compute 5e8 5.097100 -> [ 6.134119] (1:p0@Tremblay) p0 reduce 5e8 5e8 6.134119 -> [ 6.134119] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 11.231219] (1:p0@Tremblay) p0 compute 5e8 5.097100 -> [ 11.231219] (0:maestro@) Simulation time 11.2312 - -! output sort 19 -$ ${bindir:=.}/actions --log=actions.thres=verbose ${srcdir:=.}/../../platforms/small_platform_fatpipe.xml deployment.xml actions_with_isend.txt "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> WARNING: THIS BINARY IS KINDA DEPRECATED -> This example is still relevant if you want to learn about MSG-based trace replay, but if you want to simulate MPI-like traces, you should use the newer version that is in the examples/smpi/replay directory instead. -> [ 0.000000] (2:p1@Ruby) p1 Irecv p0 0.000000 -> [ 0.000000] (3:p2@Perl) p2 Irecv p1 0.000000 -> [ 2.072088] (1:p0@Tremblay) p0 send p1 1e9 2.072088 -> [ 5.097100] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 10.194200] (2:p1@Ruby) p1 compute 1e9 10.194200 -> [ 10.194200] (2:p1@Ruby) p1 wait 0.000000 -> [ 12.266287] (1:p0@Tremblay) p0 compute 1e9 10.194200 -> [ 12.266287] (3:p2@Perl) p2 wait 7.169187 -> [ 12.266287] (2:p1@Ruby) p1 send p2 1e9 2.072088 -> [ 12.266287] (3:p2@Perl) p2 Isend p0 1e9 0.000000 -> [ 14.338375] (1:p0@Tremblay) p0 recv p2 2.072088 -> [ 17.363387] (3:p2@Perl) p2 compute 5e8 5.097100 -> [ 17.363387] (0:maestro@) Simulation time 17.3634 +> [ 1.082894] (1:p0@Tremblay) p0 compute 4.5E6 0.045874 +> [ 1.123670] (1:p0@Tremblay) p0 compute 4E6 0.040777 +> [ 1.149156] (1:p0@Tremblay) p0 compute 2.5E6 0.025485 +> [ 1.149156] (2:p1@Ruby) p1 Irecv p0 0.000000 +> [ 1.149156] (3:p2@Perl) p2 Irecv p1 0.000000 +> [ 3.221244] (1:p0@Tremblay) p0 send p1 1e9 2.072088 +> [ 6.246256] (3:p2@Perl) p2 compute 5e8 5.097100 +> [ 11.343355] (2:p1@Ruby) p1 compute 1e9 10.194200 +> [ 11.343355] (2:p1@Ruby) p1 wait 0.000000 +> [ 11.343355] (2:p1@Ruby) p1 Isend p2 1e9 0.000000 +> [ 13.415443] (1:p0@Tremblay) p0 compute 1e9 10.194200 +> [ 13.415443] (3:p2@Perl) p2 wait 7.169187 +> [ 14.452463] (2:p1@Ruby) p1 reduce 5e8 5e8 1.037020 +> [ 14.452463] (3:p2@Perl) p2 reduce 5e8 5e8 1.037020 +> [ 19.549562] (1:p0@Tremblay) p0 reduce 5e8 5e8 6.134119 +> [ 19.549562] (2:p1@Ruby) p1 compute 5e8 5.097100 +> [ 19.549562] (3:p2@Perl) p2 compute 5e8 5.097100 +> [ 24.646662] (1:p0@Tremblay) p0 compute 5e8 5.097100 +> [ 31.817801] (0:maestro@) Simulation time 31.8178 +> [ 31.817801] (1:p0@Tremblay) p0 allReduce 5e8 5e8 7.171139 +> [ 31.817801] (2:p1@Ruby) p1 allReduce 5e8 5e8 7.171139 +> [ 31.817801] (3:p2@Perl) p2 allReduce 5e8 5e8 7.171139 diff --git a/examples/msg/actions/actions.txt b/examples/msg/actions/actions.txt deleted file mode 100644 index 402a0e58d8..0000000000 --- a/examples/msg/actions/actions.txt +++ /dev/null @@ -1,5 +0,0 @@ -# sample action file -tutu send toto 1e10 -toto recv tutu -tutu sleep 12 -toto compute 12 diff --git a/examples/msg/actions/actions_allReduce.txt b/examples/msg/actions/actions_allReduce.txt deleted file mode 100644 index 7dbc0b77d1..0000000000 --- a/examples/msg/actions/actions_allReduce.txt +++ /dev/null @@ -1,16 +0,0 @@ -p0 init -p1 init -p2 init - -p0 comm_size 3 -p0 allReduce 5e8 5e8 -p1 allReduce 5e8 5e8 -p2 allReduce 5e8 5e8 - -p0 compute 5e8 -p1 compute 5e8 -p2 compute 5e8 - -p0 finalize -p1 finalize -p2 finalize diff --git a/examples/msg/actions/actions_barrier.txt b/examples/msg/actions/actions_barrier.txt deleted file mode 100644 index f13e229dea..0000000000 --- a/examples/msg/actions/actions_barrier.txt +++ /dev/null @@ -1,21 +0,0 @@ -p0 init -p1 init -p2 init - -p0 comm_size 3 -p0 send p1 1E7 -p0 barrier -p0 compute 4.5E6 - -p1 comm_size 3 -p1 recv p0 -p1 barrier -p1 compute 4E6 - -p2 comm_size 3 -p2 barrier -p2 compute 4E6 - -p0 finalize -p1 finalize -p2 finalize diff --git a/examples/msg/actions/actions_bcast.txt b/examples/msg/actions/actions_bcast.txt deleted file mode 100644 index efcf6f6ef0..0000000000 --- a/examples/msg/actions/actions_bcast.txt +++ /dev/null @@ -1,28 +0,0 @@ -p0 init -p1 init -p2 init - -p0 comm_size 3 -p0 bcast 5e8 -p1 bcast 5e8 -p2 bcast 5e8 - -p0 compute 5e8 -p1 compute 2e8 -p2 compute 5e8 - -p0 bcast 5e8 -p1 bcast 5e8 -p2 bcast 5e8 - -p0 compute 5e8 -p1 compute 2e8 -p2 compute 5e8 - -p0 reduce 5e8 5e8 -p1 reduce 5e8 5e8 -p2 reduce 5e8 5e8 - -p0 finalize -p1 finalize -p2 finalize diff --git a/examples/msg/actions/actions_reduce.txt b/examples/msg/actions/actions_reduce.txt deleted file mode 100644 index c2ac680df5..0000000000 --- a/examples/msg/actions/actions_reduce.txt +++ /dev/null @@ -1,16 +0,0 @@ -p0 init -p1 init -p2 init - -p0 comm_size 3 -p0 reduce 5e8 5e8 -p1 reduce 5e8 5e8 -p2 reduce 5e8 5e8 - -p0 compute 5e8 -p1 compute 5e8 -p2 compute 5e8 - -p0 finalize -p1 finalize -p2 finalize diff --git a/examples/msg/actions/actions_with_isend.txt b/examples/msg/actions/actions_with_isend.txt deleted file mode 100644 index f486fcb5a3..0000000000 --- a/examples/msg/actions/actions_with_isend.txt +++ /dev/null @@ -1,24 +0,0 @@ -# sample action file -p0 init -p1 init -p2 init - -p0 send p1 1e9 -p0 compute 1e9 -p0 recv p2 - -p1 Irecv p0 -p1 compute 1e9 -p1 wait -p1 send p2 1e9 - -p2 Irecv p1 -p2 compute 5e8 -p2 wait -p2 Isend p0 1e9 -p2 compute 5e8 - -p0 finalize -p1 finalize -p2 finalize - diff --git a/examples/msg/actions/deployment_split.xml b/examples/msg/actions/deployment_split.xml index f0285956af..c73bd33d20 100644 --- a/examples/msg/actions/deployment_split.xml +++ b/examples/msg/actions/deployment_split.xml @@ -6,9 +6,9 @@ ./actions homogeneous_3_hosts.xml deployment_split.xml --> - + - + diff --git a/examples/msg/actions/mpi_actions_shared.txt b/examples/msg/actions/mpi_actions_shared.txt new file mode 100644 index 0000000000..088c23b21a --- /dev/null +++ b/examples/msg/actions/mpi_actions_shared.txt @@ -0,0 +1,54 @@ +# sample action file +p0 init +p1 init +p2 init + +p0 comm_size 3 +p0 bcast 5e8 +p1 bcast 5e8 +p2 bcast 5e8 + +p0 compute 4.5E6 +p0 compute 4E6 +p0 compute 2.5E6 + +p0 barrier +p1 barrier +p2 barrier + +p0 send p1 1e9 +p0 compute 1e9 + +p1 Irecv p0 +p1 compute 1e9 +p1 wait +p1 Isend p2 1e9 + +p2 Irecv p1 +p2 compute 5e8 +p2 wait + +p0 barrier +p1 barrier +p2 barrier + +p0 reduce 5e8 5e8 +p1 reduce 5e8 5e8 +p2 reduce 5e8 5e8 + +p0 compute 5e8 +p1 compute 5e8 +p2 compute 5e8 + +p0 barrier +p1 barrier +p2 barrier + +p0 allReduce 5e8 5e8 +p1 allReduce 5e8 5e8 +p2 allReduce 5e8 5e8 + +p0 finalize +p1 finalize +p2 finalize + diff --git a/examples/msg/actions/actions_split_p0.txt b/examples/msg/actions/mpi_actions_split_p0.txt similarity index 100% rename from examples/msg/actions/actions_split_p0.txt rename to examples/msg/actions/mpi_actions_split_p0.txt diff --git a/examples/msg/actions/actions_split_p1.txt b/examples/msg/actions/mpi_actions_split_p1.txt similarity index 100% rename from examples/msg/actions/actions_split_p1.txt rename to examples/msg/actions/mpi_actions_split_p1.txt diff --git a/examples/msg/actions/actions_io.txt b/examples/msg/actions/storage_actions.txt similarity index 100% rename from examples/msg/actions/actions_io.txt rename to examples/msg/actions/storage_actions.txt diff --git a/examples/msg/chord/CMakeLists.txt b/examples/msg/chord/CMakeLists.txt index c0a4dd85d1..a931a21709 100644 --- a/examples/msg/chord/CMakeLists.txt +++ b/examples/msg/chord/CMakeLists.txt @@ -18,5 +18,4 @@ set(examples_src set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/generate.py - ${CMAKE_CURRENT_SOURCE_DIR}/run_chord PARENT_SCOPE) diff --git a/examples/msg/chord/run_chord b/examples/msg/chord/run_chord deleted file mode 100755 index 8c3049b2e6..0000000000 --- a/examples/msg/chord/run_chord +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# This script runs Chord with the specified number of nodes. -# Usage: ./run_chord nb_nodes -# The platform file is chosen as the smallest platform of the files -# examples/platforms/cluster_with_*_hosts.xml that contains enough nodes. - -# check arguments number -if [ $# != 1 ]; then - echo "Usage: ./run_chord nb_nodes" - exit 1 -fi - -# pick an appropriate platform file -if [ $1 -le 100 ]; then - platform=100 -else - if [ $1 -le 1000 ]; then - platform=1000 - else - if [ $1 -le 10000 ]; then - platform=10000 - else - if [ $1 -le 100000 ]; then - platform=100000 - else - if [ $1 -le 300000 ]; then - platform=300000 - else - echo "Cannot find a platform file large enough." - exit 2 - fi - fi - fi - fi -fi - -# set up the deployment file -nb_lines=$[ $1 + 3] -head -n $nb_lines chord300000.xml > tmp_depl.xml -echo "" >> tmp_depl.xml - -# run Chord -./chord -nb_bits=24 -timeout=50 "../../platforms/cluster_with_${platform}_hosts.xml" tmp_depl.xml - -# cleanup -# rm tmp_depl.xml -