Skip to content
Snippets Groups Projects
Commit 56da7229 authored by Maël Madon's avatar Maël Madon
Browse files

clean: change project name in tests, #3

parent d04789c6
Branches
Tags
1 merge request!4Clean repo
...@@ -7,7 +7,7 @@ def test_multicore_filler(platform_multiC, workload_multiC): ...@@ -7,7 +7,7 @@ def test_multicore_filler(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v multicore_filler", schedcmd=f"batmen -v multicore_filler",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
...@@ -26,7 +26,7 @@ def test_bin_packing(platform_multiC, workload_multiC): ...@@ -26,7 +26,7 @@ def test_bin_packing(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing --queue_order=desc_size", schedcmd=f"batmen -v bin_packing --queue_order=desc_size",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
...@@ -45,7 +45,7 @@ def test_bin_packing_energy(platform_multiC, workload_multiC): ...@@ -45,7 +45,7 @@ def test_bin_packing_energy(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing_energy --queue_order=desc_size", schedcmd=f"batmen -v bin_packing_energy --queue_order=desc_size",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
......
...@@ -7,7 +7,7 @@ def test_broker_filler(platform_multiC, workload_multiC): ...@@ -7,7 +7,7 @@ def test_broker_filler(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v multicore_filler --variant_options_filepath test/schedconf/user_description_file.json", schedcmd=f"batmen -v multicore_filler --variant_options_filepath test/schedconf/user_description_file.json",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
...@@ -23,7 +23,7 @@ def test_broker_binpacking(platform_multiC, workload_multiC): ...@@ -23,7 +23,7 @@ def test_broker_binpacking(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json", schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
...@@ -39,7 +39,7 @@ def test_broker_binpackingNRJ(platform_multiC, workload_multiC): ...@@ -39,7 +39,7 @@ def test_broker_binpackingNRJ(platform_multiC, workload_multiC):
batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") batcmd = gen_batsim_cmd(platform_multiC.filename, workload_multiC.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing_energy --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json", schedcmd=f"batmen -v bin_packing_energy --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
...@@ -55,7 +55,7 @@ def test_routineSimple_binpackingNRJ(): ...@@ -55,7 +55,7 @@ def test_routineSimple_binpackingNRJ():
batcmd = gen_batsim_cmd('test/platforms/multicore/toy_pform_taurus_like.xml', 'test/workloads/multicore/empty_workload.json', output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") batcmd = gen_batsim_cmd('test/platforms/multicore/toy_pform_taurus_like.xml', 'test/workloads/multicore/empty_workload.json', output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing_energy --queue_order=desc_size --variant_options_filepath test/schedconf/routine_greedy_simple.json", schedcmd=f"batmen -v bin_packing_energy --queue_order=desc_size --variant_options_filepath test/schedconf/routine_greedy_simple.json",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
......
...@@ -13,7 +13,7 @@ def test_basic_algo_no_param(platform_monoC, workload_monoC, basic_algo_no_param ...@@ -13,7 +13,7 @@ def test_basic_algo_no_param(platform_monoC, workload_monoC, basic_algo_no_param
batcmd = gen_batsim_cmd(platform_monoC.filename, workload_monoC.filename, output_dir, "") batcmd = gen_batsim_cmd(platform_monoC.filename, workload_monoC.filename, output_dir, "")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v '{basic_algo_no_param}'", schedcmd=f"batmen -v '{basic_algo_no_param}'",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
......
...@@ -53,7 +53,7 @@ def run_user(user_name, platform_multiC, workload_multiC, test_name=None, schedc ...@@ -53,7 +53,7 @@ def run_user(user_name, platform_multiC, workload_multiC, test_name=None, schedc
"--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse")
instance = RobinInstance(output_dir=output_dir, instance = RobinInstance(output_dir=output_dir,
batcmd=batcmd, batcmd=batcmd,
schedcmd=f"batsched -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}", schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}",
simulation_timeout=30, ready_timeout=5, simulation_timeout=30, ready_timeout=5,
success_timeout=10, failure_timeout=0 success_timeout=10, failure_timeout=0
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment