Merge branch 'master' into next_doc_iteration

automl · Feb 10, 2024 · fc14ddd · fc14ddd
2 parents 01fe73f + 9dd412c
commit fc14ddd
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 36 deletions.
diff --git a/neps/api.py b/neps/api.py
@@ -98,8 +98,13 @@ def write_loss_and_config(file_handle, loss_, config_id_, config_):
 def run(
     run_pipeline: Callable,
     root_directory: str | Path,
-    pipeline_space: dict[str, Parameter | CS.ConfigurationSpace] | str | Path |
-                    CS.ConfigurationSpace | None = None,
+    pipeline_space: (
+        dict[str, Parameter | CS.ConfigurationSpace]
+        | str
+        | Path
+        | CS.ConfigurationSpace
+        | None
+    ) = None,
     overwrite_working_directory: bool = False,
     post_run_summary: bool = False,
     development_stage_id=None,
@@ -112,17 +117,19 @@ def run(
     loss_value_on_error: None | float = None,
     cost_value_on_error: None | float = None,
     pre_load_hooks: Iterable | None = None,
-    searcher: Literal[
-        "default",
-        "bayesian_optimization",
-        "random_search",
-        "hyperband",
-        "priorband",
-        "mobster",
-        "asha",
-        "regularized_evolution",
-    ]
-    | BaseOptimizer = "default",
+    searcher: (
+        Literal[
+            "default",
+            "bayesian_optimization",
+            "random_search",
+            "hyperband",
+            "priorband",
+            "mobster",
+            "asha",
+            "regularized_evolution",
+        ]
+        | BaseOptimizer
+    ) = "default",
     searcher_path: Path | str | None = None,
     **searcher_kwargs,
 ) -> None:
@@ -259,6 +266,11 @@ def run(
             "skipped. Accurate continuation of runs can no longer be guaranteed!"
         )
 
+    if task_id is not None:
+        root_directory = Path(root_directory) / f"task_{task_id}"
+    if development_stage_id is not None:
+        root_directory = Path(root_directory) / f"dev_{development_stage_id}"
+
     metahyper_run(
         run_pipeline,
         searcher_instance,
@@ -267,8 +279,6 @@ def run(
         max_evaluations_total=max_evaluations_total,
         max_evaluations_per_run=max_evaluations_per_run,
         continue_until_max_evaluation_completed=continue_until_max_evaluation_completed,
-        development_stage_id=development_stage_id,
-        task_id=task_id,
         logger=logger,
         post_evaluation_hook=_post_evaluation_hook_function(
             loss_value_on_error, ignore_errors
@@ -283,25 +293,31 @@ def run(
 
 def _run_args(
     searcher_info: dict,
-    pipeline_space: dict[str, Parameter | CS.ConfigurationSpace]
-    | CS.ConfigurationSpace
-    | None = None,
+    pipeline_space: (
+        dict[str, Parameter | CS.ConfigurationSpace]
+        | str
+        | Path
+        | CS.ConfigurationSpace
+        | None
+    ) = None,
     max_cost_total: int | float | None = None,
     ignore_errors: bool = False,
     loss_value_on_error: None | float = None,
     cost_value_on_error: None | float = None,
     logger=None,
-    searcher: Literal[
-        "default",
-        "bayesian_optimization",
-        "random_search",
-        "hyperband",
-        "priorband",
-        "mobster",
-        "asha",
-        "regularized_evolution",
-    ]
-    | BaseOptimizer = "default",
+    searcher: (
+        Literal[
+            "default",
+            "bayesian_optimization",
+            "random_search",
+            "hyperband",
+            "priorband",
+            "mobster",
+            "asha",
+            "regularized_evolution",
+        ]
+        | BaseOptimizer
+    ) = "default",
     searcher_path: Path | str | None = None,
     **searcher_kwargs,
 ) -> tuple[BaseOptimizer, dict]:

diff --git a/neps/metahyper/api.py b/neps/metahyper/api.py
@@ -421,8 +421,6 @@ def metahyper_run(
     max_evaluations_total=None,
     max_evaluations_per_run=None,
     continue_until_max_evaluation_completed=False,
-    development_stage_id=None,
-    task_id=None,
     logger=None,
     post_evaluation_hook=None,
     overwrite_optimization_dir=False,
@@ -432,11 +430,6 @@ def metahyper_run(
     if logger is None:
         logger = logging.getLogger("metahyper")
 
-    if task_id is not None:
-        optimization_dir = Path(optimization_dir) / f"task_{task_id}"
-    if development_stage_id is not None:
-        optimization_dir = Path(optimization_dir) / f"dev_{development_stage_id}"
-
     optimization_dir = Path(optimization_dir)
     if overwrite_optimization_dir and optimization_dir.exists():
         logger.warning("Overwriting working_directory")