hydra-optuna-sweeper 1.4.0.dev7__tar.gz → 1.4.0.dev8__tar.gz

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-optuna-sweeper
-Version: 1.4.0.dev7
+Version: 1.4.0.dev8
 Summary: Hydra Optuna Sweeper plugin
 Home-page: https://github.com/facebookresearch/hydra/
 Author: Toshihiko Yanase, Hiroyuki Vincent Yamazaki

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/hydra_optuna_sweeper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-optuna-sweeper
-Version: 1.4.0.dev7
+Version: 1.4.0.dev8
 Summary: Hydra Optuna Sweeper plugin
 Home-page: https://github.com/facebookresearch/hydra/
 Author: Toshihiko Yanase, Hiroyuki Vincent Yamazaki

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/hydra_plugins/hydra_optuna_sweeper/__init__.py

@@ -1,3 +1,3 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
-__version__ = "1.4.0.dev7"
+__version__ = "1.4.0.dev8"

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/hydra_plugins/hydra_optuna_sweeper/_impl.py

@@ -2,14 +2,11 @@
 import functools
 import logging
 import sys
-import warnings
-from textwrap import dedent
 from typing import (
     Any,
     Callable,
     Dict,
     List,
-    MutableMapping,
     MutableSequence,
     Optional,
     Sequence,
@@ -17,7 +14,6 @@ from typing import (
 )
 
 import optuna
-from hydra._internal.deprecation_warning import deprecation_warning
 from hydra.core.override_parser.overrides_parser import OverridesParser
 from hydra.core.override_parser.types import (
     ChoiceSweep,
@@ -40,39 +36,11 @@ from optuna.distributions import (
 )
 from optuna.trial import Trial
 
-from .config import Direction, DistributionConfig, DistributionType
+from .config import Direction
 
 log = logging.getLogger(__name__)
 
 
-def create_optuna_distribution_from_config(
-    config: MutableMapping[str, Any],
-) -> BaseDistribution:
-    kwargs = dict(config)
-    if isinstance(config["type"], str):
-        kwargs["type"] = DistributionType[config["type"]]
-    param = DistributionConfig(**kwargs)
-    if param.type == DistributionType.categorical:
-        assert param.choices is not None
-        return CategoricalDistribution(param.choices)
-    if param.type == DistributionType.int:
-        assert param.low is not None
-        assert param.high is not None
-        if param.log:
-            return IntDistribution(int(param.low), int(param.high), log=True)
-        step = int(param.step) if param.step is not None else 1
-        return IntDistribution(int(param.low), int(param.high), step=step)
-    if param.type == DistributionType.float:
-        assert param.low is not None
-        assert param.high is not None
-        if param.log:
-            return FloatDistribution(param.low, param.high, log=True)
-        if param.step is not None:
-            return FloatDistribution(param.low, param.high, step=param.step)
-        return FloatDistribution(param.low, param.high)
-    raise NotImplementedError(f"{param.type} is not supported by Optuna sweeper.")
-
-
 def create_optuna_distribution_from_override(override: Override) -> Any:
     if not override.is_sweep_override():
         return override.get_value_element_as_str()
@@ -160,7 +128,6 @@ class OptunaSweeperImpl(Sweeper):
         n_trials: int,
         n_jobs: int,
         max_failure_rate: float,
-        search_space: Optional[DictConfig],
         custom_search_space: Optional[str],
         params: Optional[DictConfig],
     ) -> None:
@@ -178,34 +145,12 @@ class OptunaSweeperImpl(Sweeper):
         ] = None
         if custom_search_space:
             self.custom_search_space_extender = get_method(custom_search_space)
-        self.search_space = search_space
         self.params = params
         self.job_idx: int = 0
-        self.search_space_distributions: Optional[Dict[str, BaseDistribution]] = None
 
     def _process_searchspace_config(self) -> None:
-        url = "https://hydra.cc/docs/upgrades/1.1_to_1.2/changes_to_sweeper_config/"
-        if self.params is None and self.search_space is None:
+        if self.params is None:
             self.params = OmegaConf.create({})
-        elif self.search_space is not None:
-            if self.params is not None:
-                warnings.warn(
-                    "Both hydra.sweeper.params and hydra.sweeper.search_space are configured."
-                    "\nHydra will use hydra.sweeper.params for defining search space."
-                    f"\n{url}"
-                )
-            else:
-                deprecation_warning(
-                    message=dedent(f"""\
-                        `hydra.sweeper.search_space` is deprecated and will be removed in the next major release.
-                        Please configure with `hydra.sweeper.params`.
-                        {url}
-                        """),
-                )
-                self.search_space_distributions = {
-                    str(x): create_optuna_distribution_from_config(y)
-                    for x, y in self.search_space.items()
-                }
 
     def setup(
         self,
@@ -308,10 +253,7 @@ class OptunaSweeperImpl(Sweeper):
             fixed_overrides,
         ) = create_params_from_overrides(params_conf)
 
-        search_space_distributions = dict()
-        if self.search_space_distributions:
-            search_space_distributions = self.search_space_distributions.copy()
-        search_space_distributions.update(override_search_space_distributions)
+        search_space_distributions = override_search_space_distributions
 
         if is_grid_sampler:
             search_space_for_grid_sampler = {

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/hydra_plugins/hydra_optuna_sweeper/config.py

@@ -15,12 +15,6 @@ def raise_motpe_removed(*args: Any, **kwargs: Any) -> NoReturn:
     )
 
 
-class DistributionType(Enum):
-    int = 1
-    float = 2
-    categorical = 3
-
-
 class Direction(Enum):
     minimize = 1
     maximize = 2
@@ -144,30 +138,6 @@ class QMCSamplerConfig(SamplerConfig):
     warn_independent_sampling: bool = True
 
 
-@dataclass
-class DistributionConfig:
-    # Type of distribution. "int", "float" or "categorical"
-    type: DistributionType
-
-    # Choices of categorical distribution
-    # List element type should be Union[str, int, float, bool]
-    choices: Optional[List[Any]] = None
-
-    # Lower bound of int or float distribution
-    low: Optional[float] = None
-
-    # Upper bound of int or float distribution
-    high: Optional[float] = None
-
-    # If True, space is converted to the log domain
-    # Valid for int or float distribution
-    log: bool = False
-
-    # Discritization step
-    # Valid for int or float distribution
-    step: Optional[float] = None
-
-
 defaults = [{"sampler": "tpe"}]
 
 
@@ -203,8 +173,6 @@ class OptunaSweeperConf:
     # Maximum authorized failure rate for a batch of parameters
     max_failure_rate: float = 0.0
 
-    search_space: Optional[Dict[str, Any]] = None
-
     params: Optional[Dict[str, str]] = None
 
     # Allow custom trial configuration via Python methods.

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/hydra_plugins/hydra_optuna_sweeper/optuna_sweeper.py

@@ -19,7 +19,6 @@ class OptunaSweeper(Sweeper):
         n_trials: int,
         n_jobs: int,
         max_failure_rate: float,
-        search_space: Optional[DictConfig],
         custom_search_space: Optional[str],
         params: Optional[DictConfig],
     ) -> None:
@@ -27,7 +26,6 @@ class OptunaSweeper(Sweeper):
 
         sampler = instantiate(
             sampler,
-            _skip_instantiate_full_deepcopy_=True,
             _target_whitelist_=(
                 "hydra_plugins.hydra_optuna_sweeper.*",
                 "optuna.samplers.*",
@@ -42,7 +40,6 @@ class OptunaSweeper(Sweeper):
             n_trials,
             n_jobs,
             max_failure_rate,
-            search_space,
             custom_search_space,
             params,
         )

{hydra_optuna_sweeper-1.4.0.dev7 → hydra_optuna_sweeper-1.4.0.dev8}/tests/test_optuna_sweeper_plugin.py

@@ -1,9 +1,8 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import os
 import sys
-from functools import partial
 from pathlib import Path
-from typing import Any, List, Optional
+from typing import Any, List
 
 import optuna
 from hydra.core.override_parser.overrides_parser import OverridesParser
@@ -24,12 +23,10 @@ from optuna.distributions import (
     FloatDistribution,
     IntDistribution,
 )
-from optuna.samplers import RandomSampler
-from pytest import mark, raises, warns
+from pytest import mark, raises
 
 from hydra_plugins.hydra_optuna_sweeper import _impl
-from hydra_plugins.hydra_optuna_sweeper._impl import OptunaSweeperImpl
-from hydra_plugins.hydra_optuna_sweeper.config import Direction, MOTPESamplerConfig
+from hydra_plugins.hydra_optuna_sweeper.config import MOTPESamplerConfig
 from hydra_plugins.hydra_optuna_sweeper.optuna_sweeper import OptunaSweeper
 
 chdir_plugin_root()
@@ -60,39 +57,6 @@ def check_distribution(expected: BaseDistribution, actual: BaseDistribution) ->
     assert set(expected.choices) == set(actual.choices)
 
 
-@mark.parametrize(
-    "input, expected",
-    [
-        (
-            {"type": "categorical", "choices": [1, 2, 3]},
-            CategoricalDistribution([1, 2, 3]),
-        ),
-        ({"type": "int", "low": 0, "high": 10}, IntDistribution(0, 10)),
-        (
-            {"type": "int", "low": 0, "high": 10, "step": 2},
-            IntDistribution(0, 10, step=2),
-        ),
-        ({"type": "int", "low": 0, "high": 5}, IntDistribution(0, 5)),
-        (
-            {"type": "int", "low": 1, "high": 100, "log": True},
-            IntDistribution(1, 100, log=True),
-        ),
-        ({"type": "float", "low": 0, "high": 1}, FloatDistribution(0, 1)),
-        (
-            {"type": "float", "low": 0, "high": 10, "step": 2},
-            FloatDistribution(0, 10, step=2),
-        ),
-        (
-            {"type": "float", "low": 1, "high": 100, "log": True},
-            FloatDistribution(1, 100, log=True),
-        ),
-    ],
-)
-def test_create_optuna_distribution_from_config(input: Any, expected: Any) -> None:
-    actual = _impl.create_optuna_distribution_from_config(input)
-    check_distribution(expected, actual)
-
-
 @mark.parametrize(
     "input, expected",
     [
@@ -307,58 +271,6 @@ def test_optuna_custom_search_space_example(tmpdir: Path) -> None:
     assert 0 <= w <= 1
 
 
-@mark.parametrize(
-    "search_space,params,raise_warning,msg",
-    [
-        (None, None, False, None),
-        (
-            {},
-            {},
-            True,
-            r"Both hydra.sweeper.params and hydra.sweeper.search_space are configured.*",
-        ),
-        (
-            {},
-            None,
-            True,
-            r"`hydra.sweeper.search_space` is deprecated and will be removed in the next major release.*",
-        ),
-        (None, {}, False, None),
-    ],
-)
-def test_warnings(
-    tmpdir: Path,
-    search_space: Optional[DictConfig],
-    params: Optional[DictConfig],
-    raise_warning: bool,
-    msg: Optional[str],
-) -> None:
-    partial_sweeper = partial(
-        OptunaSweeperImpl,
-        sampler=RandomSampler(),
-        direction=Direction.minimize,
-        storage=None,
-        study_name="test",
-        n_trials=1,
-        n_jobs=1,
-        max_failure_rate=0.0,
-        custom_search_space=None,
-    )
-    if search_space is not None:
-        search_space = OmegaConf.create(search_space)
-    if params is not None:
-        params = OmegaConf.create(params)
-    sweeper = partial_sweeper(search_space=search_space, params=params)
-    if raise_warning:
-        with warns(
-            UserWarning,
-            match=msg,
-        ):
-            sweeper._process_searchspace_config()
-    else:
-        sweeper._process_searchspace_config()
-
-
 @mark.parametrize("max_failure_rate", (0.5, 1.0))
 def test_failure_rate(max_failure_rate: float, tmpdir: Path) -> None:
     cmd = [