From: Martin Quinson Date: Thu, 11 Jun 2020 00:13:29 +0000 (+0200) Subject: Finish converting the way we use cfg=smpi/host-speed ourselves -- Bummer X-Git-Tag: v3.26~540 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9aa0de13999eee59e3be415e0aca14fe1d18b98e Finish converting the way we use cfg=smpi/host-speed ourselves -- Bummer --- diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh index b702255a26..904088ba1d 100644 --- a/examples/smpi/mc/non_deterministic.tesh +++ b/examples/smpi/mc/non_deterministic.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! timeout 60 -$ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_non_deterministic +$ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1Gf ./smpi_non_deterministic > [0.000000] [mc_global/INFO] Check communication determinism > [0.000000] [mc_comm_determinism/INFO] The communications pattern of the process 1 is different! (Different communication : 1) > [0.000000] [mc_comm_determinism/INFO] **************************************************** diff --git a/examples/smpi/mc/only_send_deterministic.tesh b/examples/smpi/mc/only_send_deterministic.tesh index 22ff676dde..43a7018471 100644 --- a/examples/smpi/mc/only_send_deterministic.tesh +++ b/examples/smpi/mc/only_send_deterministic.tesh @@ -1,7 +1,7 @@ #!/usr/bin/env tesh ! timeout 60 -$ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ${srcdir:=.}/hostfile_only_send_deterministic -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --cfg=model-check/communications-determinism:1 --cfg=smpi/buffering:zero --cfg=smpi/host-speed:1e9 ./smpi_only_send_deterministic +$ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ${srcdir:=.}/hostfile_only_send_deterministic -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --cfg=model-check/communications-determinism:1 --cfg=smpi/buffering:zero --cfg=smpi/host-speed:1Gf ./smpi_only_send_deterministic > [0.000000] [mc_comm_determinism/INFO] Check communication determinism > [0.000000] [mc_comm_determinism/INFO] ******************************************************* > [0.000000] [mc_comm_determinism/INFO] **** Only-send-deterministic communication pattern **** diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh index b648673f76..81c99ffa0f 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_coll2_st_sr_noise.tesh @@ -7,8 +7,8 @@ $ mkfile ${srcdir:=.}/workload_coll2_same_time_and_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_coll2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_coll2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='coll.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='coll.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh index 452cacd3cf..deb4038700 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1.tesh @@ -6,8 +6,8 @@ $ mkfile ${srcdir:=.}/workload_empty1 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'alone') @@ -23,8 +23,8 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with one empty job (with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'alone') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh index b53caaa052..171cbee54f 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh @@ -8,7 +8,7 @@ $ mkfile ${srcdir:=.}/workload_empty2 ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -36,7 +36,7 @@ p Workload with two empty jobs (not at the same time, not on the same resources, ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -72,7 +72,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_resources ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -100,7 +100,7 @@ p Workload with two empty jobs (not at the same time, but on the same resources, ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -136,7 +136,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_time ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -163,7 +163,7 @@ p Workload with two empty jobs (at the same time but not on the same resources, ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -199,7 +199,7 @@ $ mkfile ${srcdir:=.}/workload_empty2_same_time_and_resources ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') @@ -227,7 +227,7 @@ p Workload with two empty jobs (at the same time and on the same resources, with ! timeout 120 ! output sort 25 $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh index ff4169334a..b27648cd9c 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh @@ -6,8 +6,8 @@ $ mkfile ${srcdir:=.}/workload_mixed1 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'alone') @@ -22,8 +22,8 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir p Workload with one mixed job (with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'alone') > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'alone') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh index 3ad735de8f..5c3b546290 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh @@ -6,9 +6,9 @@ $ mkfile ${srcdir:=.}/workload_mixed2 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=1000, alloc='2,3' > [ 0.000000] (rank_0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0') @@ -32,9 +32,9 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two mixed jobs (not at the same time, not on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2 --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=1000, alloc='2,3' > [ 0.000000] (rank_0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0') @@ -66,9 +66,9 @@ $ mkfile ${srcdir:=.}/workload_mixed2_same_resources ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=1000, alloc='0,1' > [ 0.000000] (rank_0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0') @@ -92,9 +92,9 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir: p Workload with two mixed jobs (not at the same time, but on the same resources, with noise) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 > [ 0.000000] (job_0000@Bourassa) Executing job 0 (smpi_app 'job0') -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=1000, alloc='0,1' > [ 0.000000] (rank_0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh index 196afde075..379b6eaf2c 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st.tesh @@ -1,8 +1,8 @@ p Workload with two mixed jobs (at the same time but not on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh index e0f89cc5ff..9b32acdbd0 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_noise.tesh @@ -1,8 +1,8 @@ p Workload with two mixed jobs (at the same time but not on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='2,3' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh index 2f242fc1ef..9efc0099d4 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr.tesh @@ -1,8 +1,8 @@ p Workload with two mixed jobs (at the same time and on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh index 1f3c5b5c25..4d9b15c778 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_st_sr_noise.tesh @@ -1,8 +1,8 @@ p Workload with two mixed jobs (at the same time and on the same resources) ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_mixed2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Job read: app='job0', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (maestro@) Job read: app='job1', file='mixed.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload@Bourassa) Launching the job executor of job 0 (app 'job0') diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh index 255620844f..62827fd4ec 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh @@ -5,14 +5,14 @@ $ mkfile ${srcdir:=.}/workload_nojob ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 0.000000] (maestro@) Simulation finished! Final time: 0 ! timeout 120 ! output sort 25 -$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 -> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100' +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100f "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13 +> [ 0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100f' > [ 7.000000] (maestro@) Simulation finished! Final time: 7 $ rm -f ${srcdir:=.}/workload_nojob diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt index 2619992daa..e99fdf882e 100644 --- a/teshsuite/smpi/isp/umpire/CMakeLists.txt +++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt @@ -217,7 +217,7 @@ if(enable_smpi AND enable_model-checking AND enable_smpi_ISP_testsuite) foreach (test ${umpire_tests_passing}) write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! timeout 30") write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "! output display" APPEND) - write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "\$ \${bindir:=.}/../../../../smpi_script/bin/smpirun -wrapper \"\${bindir:=.}/../../../../bin/simgrid-mc\" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=smpi/host-speed:1e9 --cfg=smpi/coll-selector:ompi \${bindir:=.}/${test} --log=smpi_coll.thresh:error" APPEND) + write_file(${CMAKE_CURRENT_BINARY_DIR}/${test}.tesh "\$ \${bindir:=.}/../../../../smpi_script/bin/smpirun -wrapper \"\${bindir:=.}/../../../../bin/simgrid-mc\" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=smpi/host-speed:1Gf --cfg=smpi/coll-selector:ompi \${bindir:=.}/${test} --log=smpi_coll.thresh:error" APPEND) endforeach() foreach (test ${umpire_tests_deadlock} ${umpire_tests_problematic} )