From 4a8df276d2a50ac510aa112d3402f47cfb642d52 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Sat, 14 Jul 2018 11:44:57 +0200 Subject: [PATCH] start to reduce the number of files - use platfdir - generate/delete files with tesh - group test together just two for now, but let's see if makedist is happy on CI before going further --- CMakeLists.txt | 2 - .../CMakeLists.txt | 7 +--- .../replay_multiple_manual_empty1.tesh | 26 ++++++++++++- .../replay_multiple_manual_empty1_noise.tesh | 16 -------- .../replay_multiple_manual_empty2.tesh | 39 ++++++++++++++++++- .../replay_multiple_manual_empty2_noise.tesh | 28 ------------- .../workload_empty1 | 2 - .../workload_empty2 | 4 -- 8 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1_noise.tesh delete mode 100644 examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_noise.tesh delete mode 100644 examples/smpi/replay_multiple_manual_deploy/workload_empty1 delete mode 100644 examples/smpi/replay_multiple_manual_deploy/workload_empty2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dfcff8076..e69bb6b7f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -763,8 +763,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_empty1 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty1 COPYONLY) -configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2 COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_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 1f260ab3a9..e1a0e5f566 100644 --- a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt +++ b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt @@ -8,9 +8,7 @@ if(enable_smpi) list(APPEND tesh_filename_list replay_multiple_manual_nojob) list(APPEND tesh_filename_list replay_multiple_manual_nojob_noise) list(APPEND tesh_filename_list replay_multiple_manual_empty1) - list(APPEND tesh_filename_list replay_multiple_manual_empty1_noise) list(APPEND tesh_filename_list replay_multiple_manual_empty2) - list(APPEND tesh_filename_list replay_multiple_manual_empty2_noise) list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr) list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr_noise) list(APPEND tesh_filename_list replay_multiple_manual_empty2_st) @@ -33,6 +31,7 @@ if(enable_smpi) string(REPLACE "_" "-" dash_separated ${rm_tesh_file}) ADD_TESH("smpi-${dash_separated}" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy ${CMAKE_CURRENT_SOURCE_DIR}/${rm_tesh_file}.tesh) endforeach() @@ -52,8 +51,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_empty1 - ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2 ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_resources ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time_and_resources @@ -66,9 +63,7 @@ set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/compute_only.txt set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob_noise.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1_noise.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_noise.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr_noise.tesh ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st.tesh 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 fe0c1e2869..7b7583912a 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 @@ -1,7 +1,11 @@ p Workload with one empty job + +< One app alone +< alone empty.txt 2 0 0,1 +$ mkfile ${srcdir:=.}/workload_empty1 + ! timeout 120 -! output sort 19 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/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 +$ ./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' > [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' > [ 0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone') @@ -14,3 +18,21 @@ $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_rout > [ 0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'alone') > [ 0.000000] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone') > [ 0.000000] (maestro@) Simulation finished! Final time: 0 + +p Workload with one empty job (with noise) +! timeout 120 +$ ./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' +> [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' +> [ 0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone') +> [ 0.000000] (job_alone@Bourassa) Executing job 0 (smpi_app 'alone') +> [ 0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'alone') +> [ 0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'alone') +> [ 0.000000] (0_0@Bourassa) Simulation time 0.000000 +> [ 0.000000] (0_1@Fafard) Simulation time 0.000000 +> [ 0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'alone') +> [ 0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'alone') +> [ 0.000000] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone') +> [ 13.000000] (maestro@) Simulation finished! Final time: 13 + +$ rm -f ${srcdir:=.}/workload_empty1 \ No newline at end of file diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1_noise.tesh deleted file mode 100644 index f7da2b863f..0000000000 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty1_noise.tesh +++ /dev/null @@ -1,16 +0,0 @@ -p Workload with one empty job -! timeout 120 -! output sort 19 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/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' -> [ 0.000000] (maestro@) Job read: app='alone', file='empty.txt', size=2, start=0, alloc='0,1' -> [ 0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone') -> [ 0.000000] (job_alone@Bourassa) Executing job 0 (smpi_app 'alone') -> [ 0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'alone') -> [ 0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'alone') -> [ 0.000000] (0_0@Bourassa) Simulation time 0.000000 -> [ 0.000000] (0_1@Fafard) Simulation time 0.000000 -> [ 0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'alone') -> [ 0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'alone') -> [ 0.000000] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone') -> [ 13.000000] (maestro@) Simulation finished! Final time: 13 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 895b0ccf84..1c4f65cccf 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 @@ -1,8 +1,13 @@ -# comment p Workload with two empty jobs (not at the same time, not on the same resources) + +< Two jobs not at the same time nor on the same resources +< job0 empty.txt 2 0 0,1 +< job1 empty.txt 2 1000 2,3 +$ mkfile ${srcdir:=.}/workload_empty2 + ! timeout 120 ! output sort 19 -$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --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_empty2 --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='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' @@ -26,3 +31,33 @@ $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_rout > [1000.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1') > [1000.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1') > [1000.000000] (maestro@) Simulation finished! Final time: 1000 + +p Workload with two empty jobs (not at the same time, not on the same resources, with noise) +! timeout 120 +! output sort 19 +$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2 --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='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_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') +> [ 0.000000] (0_0@Bourassa) Simulation time 0.000000 +> [ 0.000000] (0_1@Fafard) Simulation time 0.000000 +> [ 0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0') +> [ 0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0') +> [ 0.000000] (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') +> [1000.000000] (1_0@Ginette) Simulation time 0.000000 +> [1000.000000] (1_1@Jupiter) Simulation time 0.000000 +> [1000.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1') +> [1000.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1') +> [1000.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1') +> [1013.000000] (maestro@) Simulation finished! Final time: 1013 + +$ rm -f ${srcdir:=.}/workload_empty2 diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_noise.tesh deleted file mode 100644 index 40a3b417de..0000000000 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_noise.tesh +++ /dev/null @@ -1,28 +0,0 @@ -# comment -p Workload with two empty 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_empty2 --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='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_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') -> [ 0.000000] (0_0@Bourassa) Simulation time 0.000000 -> [ 0.000000] (0_1@Fafard) Simulation time 0.000000 -> [ 0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0') -> [ 0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0') -> [ 0.000000] (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') -> [1000.000000] (1_0@Ginette) Simulation time 0.000000 -> [1000.000000] (1_1@Jupiter) Simulation time 0.000000 -> [1000.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1') -> [1000.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1') -> [1000.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1') -> [1013.000000] (maestro@) Simulation finished! Final time: 1013 diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_empty1 b/examples/smpi/replay_multiple_manual_deploy/workload_empty1 deleted file mode 100644 index 1c31678636..0000000000 --- a/examples/smpi/replay_multiple_manual_deploy/workload_empty1 +++ /dev/null @@ -1,2 +0,0 @@ -One app alone -alone empty.txt 2 0 0,1 diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_empty2 b/examples/smpi/replay_multiple_manual_deploy/workload_empty2 deleted file mode 100644 index b621212b77..0000000000 --- a/examples/smpi/replay_multiple_manual_deploy/workload_empty2 +++ /dev/null @@ -1,4 +0,0 @@ -Two jobs not at the same time nor on the same resources -job0 empty.txt 2 0 0,1 -job1 empty.txt 2 1000 2,3 - -- 2.20.1