Cleanup internal usage of HydraConfig

facebookresearch · Jan 26, 2021 · 085e6d6 · 085e6d6
1 parent 41c3119
commit 085e6d6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/...plugins/example_launcher_plugin/hydra_plugins/example_launcher_plugin/example_launcher.py b/...plugins/example_launcher_plugin/hydra_plugins/example_launcher_plugin/example_launcher.py
@@ -7,7 +7,6 @@
 
 from hydra.core.config_loader import ConfigLoader
 from hydra.core.config_store import ConfigStore
-from hydra.core.hydra_config import HydraConfig
 from hydra.core.singleton import Singleton
 from hydra.core.utils import (
     JobReturn,
@@ -101,7 +100,6 @@ def launch(
                 # but instead should be populated remotely before calling the task_function.
                 sweep_config.hydra.job.id = f"job_id_for_{idx}"
                 sweep_config.hydra.job.num = idx
-            HydraConfig.instance().set_config(sweep_config)
 
             # If your launcher is executing code in a different process, it is important to restore
             # the singleton state in the new process.

diff --git a/hydra/_internal/core_plugins/basic_launcher.py b/hydra/_internal/core_plugins/basic_launcher.py
@@ -8,7 +8,6 @@
 
 from hydra.core.config_loader import ConfigLoader
 from hydra.core.config_store import ConfigStore
-from hydra.core.hydra_config import HydraConfig
 from hydra.core.utils import (
     JobReturn,
     configure_log,
@@ -72,7 +71,6 @@ def launch(
             with open_dict(sweep_config):
                 sweep_config.hydra.job.id = idx
                 sweep_config.hydra.job.num = idx
-            HydraConfig.instance().set_config(sweep_config)
             ret = run_job(
                 config=sweep_config,
                 task_function=self.task_function,

diff --git a/hydra/_internal/hydra.py b/hydra/_internal/hydra.py
@@ -13,7 +13,6 @@
 from hydra._internal.utils import get_column_widths, run_and_report
 from hydra.core.config_loader import ConfigLoader
 from hydra.core.config_search_path import ConfigSearchPath
-from hydra.core.hydra_config import HydraConfig
 from hydra.core.plugins import Plugins
 from hydra.core.utils import (
     JobReturn,
@@ -104,7 +103,6 @@ def run(
             with_log_configuration=with_log_configuration,
             run_mode=RunMode.RUN,
         )
-        HydraConfig.instance().set_config(cfg)
 
         return run_job(
             config=cfg,
@@ -129,7 +127,6 @@ def multirun(
             with_log_configuration=with_log_configuration,
             run_mode=RunMode.MULTIRUN,
         )
-        HydraConfig.instance().set_config(cfg)
 
         sweeper = Plugins.instance().instantiate_sweeper(
             config=cfg, config_loader=self.config_loader, task_function=task_function

diff --git a/plugins/hydra_ax_sweeper/tests/test_ax_sweeper_plugin.py b/plugins/hydra_ax_sweeper/tests/test_ax_sweeper_plugin.py
@@ -5,7 +5,6 @@
 from typing import Any, List
 
 import pytest
-from hydra.core.hydra_config import HydraConfig
 from hydra.core.plugins import Plugins
 from hydra.plugins.sweeper import Sweeper
 from hydra.test_utils.test_utils import (
@@ -177,10 +176,6 @@ def test_configuration_set_via_cmd_and_default_config(
         ],
     )
     with sweep:
-        ax_config = HydraConfig.get().sweeper.ax_config
-        assert ax_config.max_trials == 2
-        assert ax_config.early_stop.max_epochs_without_improvement == 2
-        assert ax_config.experiment.minimize is True
         assert sweep.returns is None
         returns = OmegaConf.load(f"{sweep.temp_dir}/optimization_results.yaml")
         assert isinstance(returns, DictConfig)

diff --git a/plugins/hydra_ray_launcher/hydra_plugins/hydra_ray_launcher/_core_aws.py b/plugins/hydra_ray_launcher/hydra_plugins/hydra_ray_launcher/_core_aws.py
@@ -7,7 +7,6 @@
 
 import cloudpickle  # type: ignore
 import pickle5 as pickle  # type: ignore
-from hydra.core.hydra_config import HydraConfig
 from hydra.core.singleton import Singleton
 from hydra.core.utils import JobReturn, configure_log, filter_overrides, setup_globals
 from omegaconf import OmegaConf, open_dict, read_write
@@ -108,7 +107,7 @@ def launch(
             )
 
             return launch_jobs(
-                launcher, local_tmp_dir, Path(HydraConfig.get().sweep.dir)
+                launcher, local_tmp_dir, Path(launcher.config.hydra.sweep.dir)
             )