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.

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

updated optuna_search to allow users to configure optuna storage #48547

Merged
merged 55 commits into from
Dec 10, 2024
Merged
Changes from 10 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
2828f4c
updated optuna_search to allow users to configure optuna storage
ravi-dalal Nov 4, 2024
79f6bc8
Merge branch 'master' into master
ravi-dalal Nov 4, 2024
9484070
Merge branch 'master' into master
ravi-dalal Nov 4, 2024
0dbeee5
fixed linting error
ravi-dalal Nov 4, 2024
ea8d81d
initialized _storage attribute
ravi-dalal Nov 5, 2024
63a0d0c
Merge branch 'master' into master
ravi-dalal Nov 5, 2024
770db2f
optimized code
ravi-dalal Nov 5, 2024
af1e14d
Merge branch 'master' into master
ravi-dalal Nov 5, 2024
86aad9a
Merge branch 'master' into master
ravi-dalal Nov 6, 2024
e16b55e
Merge branch 'master' into master
ravi-dalal Nov 6, 2024
1e27f12
addressed PR comments
ravi-dalal Nov 6, 2024
13ed996
Merge branch 'master' into master
ravi-dalal Nov 6, 2024
ccefd5c
added comment for study_name
ravi-dalal Nov 7, 2024
ea92f5b
Merge branch 'master' into master
ravi-dalal Nov 7, 2024
1f3aa16
Merge branch 'master' of https://github.com/ravi-dalal/ray
ravi-dalal Nov 7, 2024
41eda2e
Merge branch 'master' into master
ravi-dalal Nov 8, 2024
046aaab
Merge branch 'master' into master
ravi-dalal Nov 11, 2024
fe6b14e
Merge branch 'master' into master
ravi-dalal Nov 14, 2024
7de6478
Merge branch 'master' into master
ravi-dalal Nov 20, 2024
a9c4fbf
Merge branch 'master' into master
ravi-dalal Nov 20, 2024
053bfba
Merge branch 'master' into master
ravi-dalal Nov 25, 2024
4ab211b
reverted versionadded
ravi-dalal Nov 25, 2024
d367bb0
Merge branch 'master' into master
ravi-dalal Nov 25, 2024
01a29b0
Update python/ray/tune/search/optuna/optuna_search.py
ravi-dalal Nov 25, 2024
09cb437
Update python/ray/tune/search/optuna/optuna_search.py
ravi-dalal Nov 25, 2024
e4a8546
Update python/ray/tune/search/optuna/optuna_search.py
ravi-dalal Nov 25, 2024
902850a
Merge branch 'master' into master
ravi-dalal Nov 25, 2024
fa7b596
Merge branch 'master' into master
ravi-dalal Nov 26, 2024
a2f706d
added storage to testOptuna unit tests
ravi-dalal Nov 26, 2024
9becabe
Merge branch 'master' into master
ravi-dalal Nov 26, 2024
12364f8
added optunasearch with storage unit tests
ravi-dalal Nov 26, 2024
40f2348
Merge branch 'master' into master
ravi-dalal Nov 26, 2024
f76d42a
Merge branch 'master' into master
ravi-dalal Nov 28, 2024
f166190
updated optuna version
ravi-dalal Nov 28, 2024
87ab2a1
Merge branch 'master' into master
ravi-dalal Dec 5, 2024
080bb58
updated python/requirements_compiled.txt file
ravi-dalal Dec 5, 2024
eba9000
Merge branch 'master' into master
ravi-dalal Dec 5, 2024
a30b1e5
fix optuna upgrade issue
hongpeng-guo Dec 6, 2024
1acc9dd
Merge branch 'master' into master
hongpeng-guo Dec 6, 2024
7536ef8
Merge branch 'master' into master
ravi-dalal Dec 6, 2024
dd9a12f
Merge branch 'master' into master
ravi-dalal Dec 6, 2024
7898787
Merge branch 'master' into master
hongpeng-guo Dec 6, 2024
75f98b8
Merge branch 'master' into master
hongpeng-guo Dec 6, 2024
df706ac
Merge branch 'master' of https://github.com/ray-project/ray into hpgu…
hongpeng-guo Dec 6, 2024
39384da
Merge branch 'master' of https://github.com/ravi-dalal/ray into hpguo…
hongpeng-guo Dec 6, 2024
9a02042
fix py-spy version
hongpeng-guo Dec 6, 2024
42cd4ee
Merge branch 'master' into master
hongpeng-guo Dec 6, 2024
0e84c73
Merge branch 'master' into master
hongpeng-guo Dec 7, 2024
4cec1dc
Merge branch 'master' into master
hongpeng-guo Dec 9, 2024
2c407c7
update storage default behavior
hongpeng-guo Dec 9, 2024
2079f3c
Merge branch 'master' of https://github.com/ravi-dalal/ray into hpguo…
hongpeng-guo Dec 9, 2024
5f330b5
Update python/ray/tune/search/optuna/optuna_search.py
hongpeng-guo Dec 10, 2024
2df22ac
Update python/ray/tune/search/optuna/optuna_search.py
hongpeng-guo Dec 10, 2024
9e107c5
Merge branch 'master' into master
ravi-dalal Dec 10, 2024
6bc312f
Merge branch 'master' into master
ravi-dalal Dec 10, 2024
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
32 changes: 27 additions & 5 deletions python/ray/tune/search/optuna/optuna_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
import optuna as ot
from optuna.distributions import BaseDistribution as OptunaDistribution
from optuna.samplers import BaseSampler
from optuna.storages import BaseStorage
from optuna.trial import Trial as OptunaTrial
from optuna.trial import TrialState as OptunaTrialState
except ImportError:
ot = None
OptunaDistribution = None
BaseSampler = None
BaseStorage = None
OptunaTrialState = None
OptunaTrial = None

Expand Down Expand Up @@ -133,7 +135,9 @@ class OptunaSearch(Searcher):
a delay when suggesting new configurations.
This is an Optuna issue and may be fixed in a future
Optuna release.

storage: Optuna storage used for storing trial results to
storages other than in-momemory storage,
ravi-dalal marked this conversation as resolved.
Show resolved Hide resolved
for instance optuna.storages.RDBStorage.
seed: Seed to initialize sampler with. This parameter is only
used when ``sampler=None``. In all other cases, the sampler
you pass should be initialized with the seed already.
Expand Down Expand Up @@ -305,7 +309,7 @@ def define_search_space(trial: optuna.Trial):
)
tuner.fit()

.. versionadded:: 0.8.8
.. versionadded:: 0.8.9
ravi-dalal marked this conversation as resolved.
Show resolved Hide resolved

"""

Expand All @@ -322,6 +326,8 @@ def __init__(
mode: Optional[Union[str, List[str]]] = None,
points_to_evaluate: Optional[List[Dict]] = None,
sampler: Optional["BaseSampler"] = None,
study_name: Optional[str] = None,
storage: Optional["BaseStorage"] = None,
seed: Optional[int] = None,
evaluated_rewards: Optional[List] = None,
):
Expand All @@ -343,8 +349,10 @@ def __init__(

self._points_to_evaluate = points_to_evaluate or []
self._evaluated_rewards = evaluated_rewards

self._study_name = "optuna" # Fixed study name for in-memory storage
if study_name:
self._study_name = study_name
else:
self._study_name = "optuna" # Fixed study name for in-memory storage

if sampler and seed:
logger.warning(
Expand All @@ -362,6 +370,17 @@ def __init__(
self._sampler = sampler
self._seed = seed

if storage:
assert (
study_name
ravi-dalal marked this conversation as resolved.
Show resolved Hide resolved
), "You must pass a study name if you are passing a storage."
assert isinstance(storage, BaseStorage), (
"You can only pass an instance of "
"`optuna.samplers.BaseStorage` "
"as a storage to `OptunaSearcher`."
ravi-dalal marked this conversation as resolved.
Show resolved Hide resolved
)

self._storage = storage
self._completed_trials = set()

self._ot_trials = {}
Expand All @@ -380,7 +399,10 @@ def _setup_study(self, mode: Union[str, list]):
self._metric = DEFAULT_METRIC

pruner = ot.pruners.NopPruner()
storage = ot.storages.InMemoryStorage()
if self._storage:
storage = self._storage
else:
storage = ot.storages.InMemoryStorage()
ravi-dalal marked this conversation as resolved.
Show resolved Hide resolved

if self._sampler:
sampler = self._sampler
Expand Down