Merge branch 'main' into json-formatting

microsoft · Jan 17, 2025 · 137f9fc · 137f9fc
2 parents 61bf996 + 662b79d
commit 137f9fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/mlos_bench/mlos_bench/optimizers/__init__.py b/mlos_bench/mlos_bench/optimizers/__init__.py
@@ -10,15 +10,17 @@
 """
 
 from mlos_bench.optimizers.base_optimizer import Optimizer
+from mlos_bench.optimizers.grid_search_optimizer import GridSearchOptimizer
 from mlos_bench.optimizers.manual_optimizer import ManualOptimizer
 from mlos_bench.optimizers.mlos_core_optimizer import MlosCoreOptimizer
 from mlos_bench.optimizers.mock_optimizer import MockOptimizer
 from mlos_bench.optimizers.one_shot_optimizer import OneShotOptimizer
 
 __all__ = [
-    "Optimizer",
+    "GridSearchOptimizer",
     "ManualOptimizer",
+    "MlosCoreOptimizer",
     "MockOptimizer",
     "OneShotOptimizer",
-    "MlosCoreOptimizer",
+    "Optimizer",
 ]
diff --git a/...nch/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc b/...nch/tests/config/schemas/optimizers/test-cases/good/partial/grid_search_opt_minimal.jsonc
@@ -1,4 +1,4 @@
 {
-    "class": "mlos_bench.optimizers.grid_search_optimizer.GridSearchOptimizer"
+    "class": "mlos_bench.optimizers.GridSearchOptimizer"
     // no config required
 }
diff --git a/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py b/mlos_bench/mlos_bench/tests/config/schemas/optimizers/test_optimizer_schemas.py
@@ -151,3 +151,7 @@ def test_optimizer_configs_with_extra_param(test_case_name: str) -> None:
         TEST_CASES.by_type["good"][test_case_name],
         ConfigSchema.UNIFIED,
     )
+
+
+if __name__ == "__main__":
+    pytest.main(args=["-n0", "-k", "grid_search_optimizer"])