rename

microsoft · Oct 4, 2024 · 0a243cf · 0a243cf
1 parent b531507
commit 0a243cf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/mlos_bench/mlos_bench/config/optimizers/manual_opt.jsonc b/mlos_bench/mlos_bench/config/optimizers/manual_opt.jsonc
@@ -6,6 +6,6 @@
 
     "config": {
         "max_cycles": 30,
-        "cycle_tunable_values": []
+        "tunable_values_cycle": []
     }
 }
diff --git a/mlos_bench/mlos_bench/config/schemas/optimizers/optimizer-schema.json b/mlos_bench/mlos_bench/config/schemas/optimizers/optimizer-schema.json
@@ -232,7 +232,7 @@
                                         "type": "integer",
                                         "minimum": 1
                                     },
-                                    "cycle_tunable_values": {
+                                    "tunable_values_cycle": {
                                         "description": "The tunable values to cycle through.",
                                         "type": "array",
                                         "items": {

diff --git a/mlos_bench/mlos_bench/optimizers/manual_optimizer.py b/mlos_bench/mlos_bench/optimizers/manual_optimizer.py
@@ -26,23 +26,23 @@ def __init__(
         service: Optional[Service] = None,
     ):
         super().__init__(tunables, config, global_config, service)
-        self._cycle_tunable_values: List[Dict[str, TunableValue]] = config.get(
-            "cycle_tunable_values", []
+        self._tunable_values_cycle: List[Dict[str, TunableValue]] = config.get(
+            "tunable_values_cycle", []
         )
-        if len(self._cycle_tunable_values) == 0:
-            _LOG.warning("No cycle_tunable_values provided, using default values.")
-            self._cycle_tunable_values = [tunables.get_param_values()]
+        if len(self._tunable_values_cycle) == 0:
+            _LOG.warning("No tunable_values_cycle provided, using default values.")
+            self._tunable_values_cycle = [tunables.get_param_values()]
         max_cycles = int(config.get("max_cycles", 1))
         self._max_suggestions = min(
             self._max_suggestions,
-            max_cycles * len(self._cycle_tunable_values),
+            max_cycles * len(self._tunable_values_cycle),
         )
 
     def suggest(self) -> TunableGroups:
         """Always produce the same sequence of explicit suggestions, in a cycle."""
         tunables = super().suggest()
-        cycle_index = (self._iter - 1) % len(self._cycle_tunable_values)
-        tunables.assign(self._cycle_tunable_values[cycle_index])
+        cycle_index = (self._iter - 1) % len(self._tunable_values_cycle)
+        tunables.assign(self._tunable_values_cycle[cycle_index])
         _LOG.info("Iteration %d :: Suggest: %s", self._iter, tunables)
         return tunables
 

diff --git a/...s/config/schemas/optimizers/test-cases/bad/invalid/manual_opt_schema_bad_max_cycles.jsonc b/...s/config/schemas/optimizers/test-cases/bad/invalid/manual_opt_schema_bad_max_cycles.jsonc
@@ -5,6 +5,6 @@
     "config": {
         // max_cycles should be at least 1
         "max_cycles": 0,
-        "cycle_tunable_values": []
+        "tunable_values_cycle": []
     }
 }
diff --git a/...los_bench/tests/config/schemas/optimizers/test-cases/bad/unhandled/manual_opt_extra.jsonc b/...los_bench/tests/config/schemas/optimizers/test-cases/bad/unhandled/manual_opt_extra.jsonc
@@ -2,7 +2,7 @@
     "class": "mlos_bench.optimizers.ManualOptimizer",
 
     "config": {
-        "cycle_tunable_values": [],
+        "tunable_values_cycle": [],
         "extra_param": "should not be here"
     }
 }
diff --git a/...nch/mlos_bench/tests/config/schemas/optimizers/test-cases/good/full/manual_opt_full.jsonc b/...nch/mlos_bench/tests/config/schemas/optimizers/test-cases/good/full/manual_opt_full.jsonc
@@ -8,7 +8,7 @@
         "seed": 12345,
         "start_with_defaults": false,
         "max_cycles": 10,
-        "cycle_tunable_values": [
+        "tunable_values_cycle": [
             {
                 "param1": "value1",
                 "param2": 1,

diff --git a/.../config/schemas/optimizers/test-cases/good/partial/manual_opt_schema_partial_config.jsonc b/.../config/schemas/optimizers/test-cases/good/partial/manual_opt_schema_partial_config.jsonc
@@ -2,6 +2,6 @@
 
     "class": "mlos_bench.optimizers.ManualOptimizer",
     "config": {
-        "cycle_tunable_values": []
+        "tunable_values_cycle": []
     }
 }
diff --git a/mlos_bench/mlos_bench/tests/optimizers/conftest.py b/mlos_bench/mlos_bench/tests/optimizers/conftest.py
@@ -167,6 +167,6 @@ def manual_opt(tunable_groups: TunableGroups, mock_configs: List[dict]) -> Manua
         service=None,
         config={
             "max_cycles": 2,
-            "cycle_tunable_values": mock_configs,
+            "tunable_values_cycle": mock_configs,
         },
     )