Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with subsolvers whose hyperparameters share names but not types #221

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Fix issue with subsolvers whose hyperparameters share names but not types #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions discrete_optimization/generic_tools/hyperparameters/hyperparametrizable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,10 @@ def suggest_hyperparameters_with_optuna(
] = suggested_and_fixed_hyperparameters[
hyperparameter.subbrick_hyperparameter
]
kwargs_for_optuna_suggestion[
"prefix"
] = f"{prefix}{hyperparameter.subbrick_hyperparameter}."
kwargs_for_optuna_suggestion["prefix"] = (
f"{prefix}{hyperparameter.subbrick_hyperparameter}."
f"{suggested_and_fixed_hyperparameters[hyperparameter.subbrick_hyperparameter].__name__}."
)
elif hyperparameter.subbrick_hyperparameter in skipped_hyperparameters:
# subbrick_kwargs must be skipped if subbrick itself is skipped
skipped_hyperparameters.add(name)
Expand Down
32 changes: 23 additions & 9 deletions tests/generic_tools/hyperparameters/test_hyperparameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def solve(

class DummySolver2(SolverDO):
hyperparameters = [
IntegerHyperparameter("nb", low=0, high=3, default=1),
CategoricalHyperparameter("nb", choices=[0, 1, 2, 3], default=1),
FloatHyperparameter("coeff2", low=-1.0, high=1.0, default=1.0),
FloatHyperparameter("coeff3", low=-1.0, high=1.0, default=1.0),
]
Expand Down Expand Up @@ -280,9 +280,17 @@ def objective(trial: optuna.Trial) -> float:
assert "nb" in suggested_hyperparameters_kwargs
assert "nb" in suggested_hyperparameters_kwargs["kwargs_subsolver"]
assert "nb" in trial.params
assert "subsolver.nb" in trial.params
assert (
trial.params["subsolver.nb"]
"subsolver.DummySolver.nb" in trial.params
or "subsolver.DummySolver2.nb" in trial.params
)
if "subsolver.DummySolver.nb" in trial.params:
param_name = "subsolver.DummySolver.nb"
else:
param_name = "subsolver.DummySolver2.nb"

assert (
trial.params[param_name]
== suggested_hyperparameters_kwargs["kwargs_subsolver"]["nb"]
)

Expand Down Expand Up @@ -325,14 +333,20 @@ def objective(trial: optuna.Trial) -> float:
in suggested_hyperparameters_kwargs["kwargs_subsolver"]["kwargs_subsolver"]
)
assert "nb" in trial.params
assert "subsolver.nb" in trial.params
assert "subsolver.subsolver.nb" in trial.params
assert "subsolver.MetaSolver.nb" in trial.params
assert (
"subsolver.MetaSolver.subsolver.DummySolver.nb" in trial.params
or "subsolver.MetaSolver.subsolver.DummySolver2.nb" in trial.params
)
assert (
trial.params["subsolver.nb"]
trial.params["subsolver.MetaSolver.nb"]
== suggested_hyperparameters_kwargs["kwargs_subsolver"]["nb"]
)
param_name = "subsolver.MetaSolver.subsolver.DummySolver.nb"
if param_name not in trial.params:
param_name = "subsolver.MetaSolver.subsolver.DummySolver2.nb"
assert (
trial.params["subsolver.subsolver.nb"]
trial.params[param_name]
== suggested_hyperparameters_kwargs["kwargs_subsolver"]["kwargs_subsolver"][
"nb"
]
Expand Down Expand Up @@ -389,9 +403,9 @@ def objective(trial: optuna.Trial) -> float:
assert "nb" in suggested_hyperparameters_kwargs
assert "nb" in suggested_hyperparameters_kwargs["kwargs_subsolver"]
assert "nb" in trial.params
assert "subsolver.nb" in trial.params
assert "subsolver.DummySolver.nb" in trial.params
assert (
trial.params["subsolver.nb"]
trial.params["subsolver.DummySolver.nb"]
== suggested_hyperparameters_kwargs["kwargs_subsolver"]["nb"]
)

Expand Down