Commit b5fc8210 authored by Millian Poquet's avatar Millian Poquet
Browse files

[test] use batsched in most tests

parent 1d02d9e8
......@@ -17,14 +17,14 @@ implicit_instances:
workload :
- {"name":"tiny", "filename":"${batsim_dir}/workload_profiles/test_workload_profile.json"}
- {"name":"medium", "filename":"${batsim_dir}/workload_profiles/batsim_paper_workload_example.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -E -e ${output_directory}/out --mmax-workload --redis-prefix ${instance_id}
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]}
commands_before_instances:
- ${batsim_dir}/test/is_batsim_dir.py ${base_working_directory}
......
......@@ -16,14 +16,14 @@ implicit_instances:
- {"name":"homo128", "filename":"${batsim_dir}/platforms/energy_platform_homogeneous_no_net_128.xml"}
workload :
- {"name":"long_workload", "filename":"${batsim_dir}/workload_profiles/long_workload.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --redis-prefix ${instance_id} --mmax-workload
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]}
commands_before_instances:
- ${batsim_dir}/test/is_batsim_dir.py ${base_working_directory}
......
......@@ -17,16 +17,16 @@ implicit_instances:
workload :
- {"name":"tiny", "filename":"${batsim_dir}/workload_profiles/test_workload_profile.json"}
- {"name":"medium", "filename":"${batsim_dir}/workload_profiles/batsim_paper_workload_example.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
variables:
socket_port: "$((${instance_number} + 28000))"
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --mmax-workload --redis-prefix ${instance_id} --socket-endpoint="tcp://localhost:${socket_port}"
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id} --socket-endpoint="tcp://*:${socket_port}"
sched_command: batsched -v ${algo[algo_name]} --socket-endpoint="tcp://*:${socket_port}"
commands_before_instances:
- ${batsim_dir}/test/is_batsim_dir.py ${base_working_directory}
......
......@@ -16,14 +16,14 @@ implicit_instances:
- {"name":"small", "filename":"${batsim_dir}/platforms/small_platform.xml"}
workload :
- {"name":"same_submit_time", "filename":"${batsim_dir}/workload_profiles/same_submit_time.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${instance_id}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --redis-prefix ${instance_id} --mmax-workload -vnetwork-only
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]} --redis-prefix ${instance_id}
commands_after_execution:
- cat ${output_directory}/batsim.stderr | grep -o ":S:.*|\|:S:.*'" > ${output_directory}/messages.txt
......
......@@ -19,14 +19,14 @@ implicit_instances:
- {"name":"compute2", "filename":"${batsim_dir}/workload_profiles/test_smpi_compute_only_2_jobs.json"}
- {"name":"compute4", "filename":"${batsim_dir}/workload_profiles/test_smpi_compute_only_multijobs.json"}
- {"name":"mixed", "filename":"${batsim_dir}/workload_profiles/test_smpi_mixed_comp_comm.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --redis-prefix ${instance_id} --mmax-workload
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]}
commands_before_instances:
- ${batsim_dir}/test/is_batsim_dir.py ${base_working_directory}
......
......@@ -18,12 +18,10 @@ implicit_instances:
- {"name":"compute", "filename":"${batsim_dir}/workload_profiles/test_smpi_compute_only.json"}
- {"name":"compute2", "filename":"${batsim_dir}/workload_profiles/test_smpi_compute_only_2_jobs.json"}
- {"name":"mixed", "filename":"${batsim_dir}/workload_profiles/test_smpi_mixed_comp_comm.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --mmax-workload --batexec
sched_command: echo 'I do not exist'
......
......@@ -16,14 +16,14 @@ implicit_instances:
- {"name":"small", "filename":"${batsim_dir}/platforms/small_platform.xml"}
workload :
- {"name":"mapping", "filename":"${batsim_dir}/workload_profiles/test_smpi_mapping.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --redis-prefix ${instance_id} --mmax-workload
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]}
commands_after_execution:
# Let's check that the jobs have consistent execution times
......
......@@ -16,14 +16,14 @@ implicit_instances:
- {"name":"homo128", "filename":"${batsim_dir}/platforms/energy_platform_homogeneous_no_net_128.xml"}
workload :
- {"name":"walltime", "filename":"${batsim_dir}/workload_profiles/walltime_test.json"}
pybatsim_algo:
- {"name":"filler", "algo_name":"fillerSched"}
algo:
- {"name":"filler", "algo_name":"filler"}
generic_instance:
timeout: 10
working_directory: ${base_working_directory}
output_directory: ${base_output_directory}/results/${pybatsim_algo[name]}_${workload[name]}_${platform[name]}
output_directory: ${base_output_directory}/results/${algo[name]}_${workload[name]}_${platform[name]}
batsim_command: batsim -p ${platform[filename]} -w ${workload[filename]} -e ${output_directory}/out --redis-prefix ${instance_id} --mmax-workload
sched_command: ${batsim_dir}/schedulers/pybatsim/launcher.py ${pybatsim_algo[algo_name]} --redis-prefix ${instance_id}
sched_command: batsched -v ${algo[algo_name]}
commands_after_execution:
- |
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment