a bit more merging

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52169ca..31f0405 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -751,8 +751,6 @@ configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_depl
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive2 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive2 COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_simple ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_simple COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2 COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources COPYONLY)
 

diff --git a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
index 5d5ad8c..61c42a1 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
+++ b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
@@ -10,9 +10,6 @@ if(enable_smpi)
   list(APPEND tesh_filename_list replay_multiple_manual_empty2)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed1)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_sr_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st_sr)
@@ -43,8 +40,6 @@ set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/compute_only.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive2
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_simple
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_resources
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time_and_resources PARENT_SCOPE)
 set(tesh_files  ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob.tesh
@@ -52,9 +47,6 @@ set(tesh_files  ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manu
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_noise.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_sr.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_sr_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_sr.tesh

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 f3ee394..a60551a 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2.tesh
@@ -1,8 +1,12 @@
-# comment
 p Workload with two mixed jobs (not at the same time, not on the same resources)
+< Two jobs not at the same time nor on the same resources
+< job0 mixed.txt 2 0 0,1
+< job1 mixed.txt 2 1000 2,3
+$ mkfile ${srcdir:=.}/workload_mixed2
+
 ! timeout 120
 ! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/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: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'
 > [   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'
@@ -24,3 +28,91 @@ $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_rout
 > [1806.923160] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
 > [1806.923160] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
 > [1806.923160] (maestro@) Simulation finished! Final time: 1806.92
+
+p Workload with two mixed jobs (not at the same time, not on the same resources)
+! timeout 120
+! output sort 19
+$ ./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
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   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] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
+> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [1000.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [1806.923160] (1_0@Ginette) Simulation time 806.923160
+> [1806.923160] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [1806.923160] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [1806.923160] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
+> [1806.923160] (maestro@) Simulation finished! Final time: 1806.92
+
+$ rm -f ${srcdir:=.}/workload_mixed2
+
+p Workload with two mixed jobs (not at the same time, but on the same resources)
+
+< Two jobs not at the same time but using the same resources
+< job0 mixed.txt 2 0 0,1
+< job1 mixed.txt 2 1000 0,1
+$ mkfile ${srcdir:=.}/workload_mixed2_same_resources
+
+! timeout 120
+! output sort 19
+$ ./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
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   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] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
+> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [1737.001374] (1_0@Bourassa) Simulation time 737.001374
+> [1737.001374] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [1737.001374] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [1737.001374] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1737.001374] (maestro@) Simulation finished! Final time: 1737
+
+p Workload with two mixed jobs (not at the same time, but on the same resources, with noise)
+! timeout 120
+! output sort 19
+$ ./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
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   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] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
+> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [ 737.001374] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [1737.001374] (1_0@Bourassa) Simulation time 737.001374
+> [1737.001374] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [1737.001374] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [1737.001374] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1737.001374] (maestro@) Simulation finished! Final time: 1737
+
+$ rm -f ${srcdir:=.}/workload_mixed2_sr

diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_noise.tesh
deleted file mode 100644 (file)
index 6552d9d..0000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed2_noise.tesh
+++ /dev/null
@@ -1,26 +0,0 @@
-# comment
-p Workload with two mixed jobs (not at the same time, not on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/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
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   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] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
-> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [ 737.001374] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [1000.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [1806.923160] (1_0@Ginette) Simulation time 806.923160
-> [1806.923160] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1806.923160] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [1806.923160] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
-> [1806.923160] (maestro@) Simulation finished! Final time: 1806.92

diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_mixed2 b/examples/smpi/replay_multiple_manual_deploy/workload_mixed2
deleted file mode 100644 (file)
index db1eced..0000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_mixed2
+++ /dev/null
@@ -1,4 +0,0 @@
-Two jobs not at the same time nor on the same resources
-job0 mixed.txt 2 0 0,1
-job1 mixed.txt 2 1000 2,3
-

diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources b/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources
index 45f2da8..f36085a 100644 (file)
--- a/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources
+++ b/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources
@@ -1,4 +1,3 @@
 Two jobs not at the same time but using the same resources
 job0 mixed.txt 2 0 0,1
 job1 mixed.txt 2 1000 0,1
-