Merge branch 'main' into sergiym/datetime/utc

motus · Mar 18, 2024 · 08c3180 · 08c3180
2 parents 9086992 + 020add2
commit 08c3180
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/mlos_bench/mlos_bench/config/schemas/cli/cli-schema.json b/mlos_bench/mlos_bench/config/schemas/cli/cli-schema.json
@@ -57,6 +57,11 @@
             "uniqueItems": true
         },
 
+        "scheduler": {
+            "description": "Path to the json config of scheduler to use for running the experiments.",
+            "$ref": "#/$defs/json_config_path"
+        },
+
         "environment": {
             "description": "Path to the json config describing the environment to run the benchmark in.",
             "$ref": "#/$defs/json_config_path"

diff --git a/mlos_bench/mlos_bench/tests/config/cli/test-cli-config.jsonc b/mlos_bench/mlos_bench/tests/config/cli/test-cli-config.jsonc
@@ -9,6 +9,8 @@
         "bar"
     ],
 
+    "scheduler": "schedulers/sync_scheduler.jsonc",
+
     "optimizer": "optimizers/mlos_core_default_opt.jsonc",
 
     "services": [

diff --git a/mlos_bench/mlos_bench/tests/launcher_parse_args_test.py b/mlos_bench/mlos_bench/tests/launcher_parse_args_test.py
@@ -73,6 +73,7 @@ def test_launcher_args_parse_1(config_paths: List[str]) -> None:
     cli_args = '--config-paths ' + ' '.join(config_paths) + \
         ' --service services/remote/mock/mock_auth_service.jsonc' + \
         ' --service services/remote/mock/mock_remote_exec_service.jsonc' + \
+        ' --scheduler schedulers/sync_scheduler.jsonc' + \
         f' --environment {env_conf_path}' + \
         ' --globals globals/global_test_config.jsonc' + \
         ' --globals globals/global_test_extra_config.jsonc' \
@@ -105,6 +106,9 @@ def test_launcher_args_parse_1(config_paths: List[str]) -> None:
     # Check that the optimizer got initialized with defaults.
     assert launcher.optimizer.tunable_params.is_defaults()
     assert launcher.optimizer.max_iterations == 1   # value for OneShotOptimizer
+    # Check that we pick up the right scheduler config:
+    assert isinstance(launcher.scheduler, SyncScheduler)
+    assert launcher.scheduler._trial_config_repeat_count == 3  # pylint: disable=protected-access
 
 
 def test_launcher_args_parse_2(config_paths: List[str]) -> None:
@@ -132,7 +136,7 @@ def test_launcher_args_parse_2(config_paths: List[str]) -> None:
         ' --no-teardown' + \
         ' --random-init' + \
         ' --random-seed 1234' + \
-        ' --trial-config-repeat-count 3'
+        ' --trial-config-repeat-count 5'
     launcher = Launcher(description=__name__, argv=cli_args.split())
     # Check that the parent service
     assert isinstance(launcher.service, SupportsAuth)
@@ -181,8 +185,9 @@ def test_launcher_args_parse_2(config_paths: List[str]) -> None:
     # values through the stack.
     # See Also: #495
 
+    # Check that CLI parameter overrides JSON config:
     assert isinstance(launcher.scheduler, SyncScheduler)
-    assert launcher.scheduler._trial_config_repeat_count == 3  # pylint: disable=protected-access
+    assert launcher.scheduler._trial_config_repeat_count == 5  # pylint: disable=protected-access
 
     # Check that the value from the file is overridden by the CLI arg.
     assert config['random_seed'] == 42