Merge pull request #33 from automl/final_config_fix

Fixing and simplifying final config creation

Author: TheEimer

.github/workflows/pytest.yml

@@ -56,7 +56,7 @@ jobs:
         echo "::set-output name=BEFORE::$(git status --porcelain -b)"
 
     - name: Tests
-      run: pytest tests -v --disable-pytest-warnings
+      run: python -m pytest tests -v --disable-pytest-warnings
 
     - name: Check for files left behind by test
       run: |
@@ -67,4 +67,4 @@ jobs:
             echo "git status from after: $after"
             echo "Not all generated files have been deleted!"
             exit 1
-        fi
+        fi

hydra_plugins/hypersweeper/hypersweeper_backend.py

@@ -3,12 +3,11 @@
 from __future__ import annotations
 
 import logging
-import operator
 from collections.abc import Callable
-from functools import reduce
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+import numpy as np
 from hydra.core.plugins import Plugins
 from hydra.plugins.sweeper import Sweeper
 from hydra.utils import get_class, get_method
@@ -163,23 +162,13 @@ def sweep(self, arguments: list[str]) -> list | None:
         final_config = self.config
         with open_dict(final_config):
             del final_config["hydra"]
-        for a in arguments:
-            try:
-                n, v = a.split("=")
-                key_parts = n.split(".")
-                reduce(operator.getitem, key_parts[:-1], final_config)[key_parts[-1]] = v
-            except:  # noqa: E722
-                print(f"Could not parse argument {a}, skipping.")
-        schedules = {}
-        for i in range(len(incumbent)):
-            for k, v in incumbent[i].items():
-                if k not in schedules:
-                    schedules[k] = []
-                schedules[k].append(v)
-        for k in schedules:
-            key_parts = k.split(".")
-            reduce(operator.getitem, key_parts[:-1], final_config)[key_parts[-1]] = schedules[k]
+
+        for k, v in incumbent.items():
+            if isinstance(v, np.integer | np.floating):
+                v = v.item()  # noqa: PLW2901
+            OmegaConf.update(final_config, k, v, force_add=True)
+
         with open(Path(optimizer.output_dir) / "final_config.yaml", "w+") as fp:
-            OmegaConf.save(config=final_config, f=fp)
+            OmegaConf.save(config=final_config, f=fp, resolve=True)
 
         return incumbent

hydra_plugins/hypersweeper/hypersweeper_sweeper.py

@@ -523,4 +523,4 @@ def run(self, verbose=False):
                     incumbent had a performance of {np.round(inc_performance, decimals=2)}"
             )
             log.info(f"The incumbent configuration is {inc_config}")
-        return self.incumbents[-1]
+        return self.incumbents["config"][-1]