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

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

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

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

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

{hydra_optuna_sweeper-1.4.0.dev6 → hydra_optuna_sweeper-1.4.0.dev7}/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.dev6"
+__version__ = "1.4.0.dev7"

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

@@ -82,9 +82,9 @@ def create_optuna_distribution_from_override(override: Override) -> Any:
     if override.is_choice_sweep():
         assert isinstance(value, ChoiceSweep)
         for x in override.sweep_iterator(transformer=Transformer.encode):
-            assert isinstance(
-                x, (str, int, float, bool, type(None))
-            ), f"A choice sweep expects str, int, float, bool, or None type. Got {type(x)}."
+            assert isinstance(x, (str, int, float, bool, type(None))), (
+                f"A choice sweep expects str, int, float, bool, or None type. Got {type(x)}."
+            )
             choices.append(x)
         return CategoricalDistribution(choices)
 
@@ -94,9 +94,9 @@ def create_optuna_distribution_from_override(override: Override) -> Any:
         assert value.stop is not None
         if value.shuffle:
             for x in override.sweep_iterator(transformer=Transformer.encode):
-                assert isinstance(
-                    x, (str, int, float, bool, type(None))
-                ), f"A choice sweep expects str, int, float, bool, or None type. Got {type(x)}."
+                assert isinstance(x, (str, int, float, bool, type(None))), (
+                    f"A choice sweep expects str, int, float, bool, or None type. Got {type(x)}."
+                )
                 choices.append(x)
             return CategoricalDistribution(choices)
         if (
@@ -273,9 +273,9 @@ class OptunaSweeperImpl(Sweeper):
         if isinstance(distribution, CategoricalDistribution):
             return distribution.choices
         elif isinstance(distribution, IntDistribution):
-            assert (
-                distribution.step is not None
-            ), "`step` of IntDistribution must be a positive integer."
+            assert distribution.step is not None, (
+                "`step` of IntDistribution must be a positive integer."
+            )
             n_items = (distribution.high - distribution.low) // distribution.step
             return [distribution.low + i * distribution.step for i in range(n_items)]
         elif (

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

@@ -3,17 +3,16 @@ from typing import Any, List, Optional
 
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import HydraContext, TaskFunction
+from hydra.utils import instantiate
 from omegaconf import DictConfig
 
-from .config import SamplerConfig
-
 
 class OptunaSweeper(Sweeper):
     """Class to interface with Optuna"""
 
     def __init__(
         self,
-        sampler: SamplerConfig,
+        sampler: Any,
         direction: Any,
         storage: Optional[Any],
         study_name: Optional[str],
@@ -26,6 +25,15 @@ class OptunaSweeper(Sweeper):
     ) -> None:
         from ._impl import OptunaSweeperImpl
 
+        sampler = instantiate(
+            sampler,
+            _skip_instantiate_full_deepcopy_=True,
+            _target_whitelist_=(
+                "hydra_plugins.hydra_optuna_sweeper.*",
+                "optuna.samplers.*",
+            ),
+        )
+
         self.sweeper = OptunaSweeperImpl(
             sampler,
             direction,

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

@@ -387,7 +387,10 @@ def test_motpe_sampler_removed() -> None:
         InstantiationException,
         match="The 'motpe' sampler was removed in Optuna 4.0",
     ):
-        instantiate(OmegaConf.structured(MOTPESamplerConfig))
+        instantiate(
+            OmegaConf.structured(MOTPESamplerConfig),
+            _target_whitelist_="hydra_plugins.hydra_optuna_sweeper.config.raise_motpe_removed",
+        )
 
 
 def test_example_with_removed_motpe(
@@ -406,4 +409,5 @@ def test_example_with_removed_motpe(
     ]
 
     out, err = run_process(cmd, print_error=False, raise_exception=False)
-    assert "The 'motpe' sampler was removed in Optuna 4.0" in err
+    assert "motpe" in err
+    assert "sampler was removed in Optuna 4.0" in err