diff --git a/src/scheds/bin_packing_energy.cpp b/src/scheds/bin_packing_energy.cpp index e98405c279a8e936b558865be5a0c1eefe436f89..978a333dcbf837eca0dddde785357e7b54ac2f71 100644 --- a/src/scheds/bin_packing_energy.cpp +++ b/src/scheds/bin_packing_energy.cpp @@ -113,7 +113,6 @@ void BinPackingEnergy::on_simulation_start( // PPK_ASSERT_ERROR( // batsim_config["dynamic-jobs-enabled"].GetBool(), "This algorithm only // works if dynamic job are enabled!"); - // TODO: send an error if the order asked in not DescendingSizeOrder /* TODO (wait for batsim5.0): * - retrieve the nb of cores per machine from the platform file and diff --git a/test/test_assertion_error.py b/test/test_assertion_error.py index 7dcfdebbd14fd5869f8504a8dbe05c7bca1ffcb3..46ead0d4c28a7f0398b82de876bea552d03722c9 100644 --- a/test/test_assertion_error.py +++ b/test/test_assertion_error.py @@ -41,7 +41,7 @@ def error_user(user_name, platform_multiC, expected_error="", test_name=None, sc "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") instance = RobinInstance(output_dir=output_dir, batcmd=batcmd, - schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}", + schedcmd=f"batmen -v bin_packing --variant_options_filepath {schedconf}", simulation_timeout=30, ready_timeout=5, success_timeout=10, failure_timeout=0 ) diff --git a/test/test_broker.py b/test/test_broker.py index fc72749af6b1b06fc99c68183505d7f11d470b03..2effe5f4d376aba507da9b7d125347c03fe4d953 100644 --- a/test/test_broker.py +++ b/test/test_broker.py @@ -36,7 +36,7 @@ def test_broker_multi(platform_multiC, workload_static, sched_multi): batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") instance = RobinInstance(output_dir=output_dir, batcmd=batcmd, - schedcmd=f"batmen -v {sched_multi.name} --queue_order=desc_size --variant_options_filepath test/schedconf/user_description_file.json", + schedcmd=f"batmen -v {sched_multi.name} --variant_options_filepath test/schedconf/user_description_file.json", simulation_timeout=30, ready_timeout=5, success_timeout=10, failure_timeout=0 ) diff --git a/test/test_schedulers_multi.py b/test/test_schedulers_multi.py index ce0f4b029ee3cd217d674b7169025d48c26683ec..73b6e7f6d0529834f7ad9d0a7e8c6efe245a87fe 100644 --- a/test/test_schedulers_multi.py +++ b/test/test_schedulers_multi.py @@ -34,7 +34,7 @@ def test_bin_packing(platform_multiC, workload_static): batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing") instance = RobinInstance(output_dir=output_dir, batcmd=batcmd, - schedcmd=f"batmen -v {sched} --queue_order=desc_size", + schedcmd=f"batmen -v {sched}", simulation_timeout=30, ready_timeout=5, success_timeout=10, failure_timeout=0 ) @@ -57,7 +57,7 @@ def test_bin_packing_energy(platform_multiC, workload_static): batcmd = gen_batsim_cmd(platform_multiC.filename, workload_static.filename, output_dir, "--energy --enable-compute-sharing") instance = RobinInstance(output_dir=output_dir, batcmd=batcmd, - schedcmd=f"batmen -v {sched} --queue_order=desc_size", + schedcmd=f"batmen -v {sched}", simulation_timeout=30, ready_timeout=5, success_timeout=10, failure_timeout=0 ) diff --git a/test/test_users.py b/test/test_users.py index 65a5542c132e8485095c268f6691808502d15068..5be9550062f07985b66db36a775914e5b652f5bf 100644 --- a/test/test_users.py +++ b/test/test_users.py @@ -50,7 +50,7 @@ def run_user(user_name, platform_multiC, test_name=None, schedconf=None): "--energy --enable-compute-sharing --enable-dynamic-jobs --acknowledge-dynamic-jobs --enable-profile-reuse") instance = RobinInstance(output_dir=output_dir, batcmd=batcmd, - schedcmd=f"batmen -v bin_packing --queue_order=desc_size --variant_options_filepath {schedconf}", + schedcmd=f"batmen -v bin_packing --variant_options_filepath {schedconf}", simulation_timeout=30, ready_timeout=5, success_timeout=10, failure_timeout=0 )