Skip to content

[tune] Disallow setting resources_per_trial when it is already configured #4880

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

Merged
ericl merged 9 commits into from
Jun 2, 2019
Merged

[tune] Disallow setting resources_per_trial when it is already configured #4880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
471882d
disallow it
ericl May 28, 2019
d8752f3
import fix
ericl May 28, 2019
b7d7b6d
fix example
ericl May 28, 2019
879d12f
fix test
ericl May 29, 2019
6060f9a
fix tests
ericl May 30, 2019
4393d3d
Update mock.py
ericl May 30, 2019
ea470e9
fix
ericl May 30, 2019
70350a7
make less convoluted
ericl Jun 1, 2019
00f2a66
fix tests
ericl Jun 2, 2019
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
4 changes: 4 additions & 0 deletions python/ray/rllib/agents/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ class _MockTrainer(Trainer):
"num_workers": 0,
})

@classmethod
def default_resource_request(cls, config):
return None

def _init(self, config, env_creator):
self.info = None
self.restored = False
Expand Down
16 changes: 6 additions & 10 deletions python/ray/rllib/examples/custom_train_fn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@ def my_train_fn(config, reporter):

if __name__ == "__main__":
ray.init()
tune.run(
my_train_fn,
resources_per_trial={
"cpu": 1,
},
config={
"lr": 0.01,
"num_workers": 0,
},
)
config = {
"lr": 0.01,
"num_workers": 0,
}
resources = PPOTrainer.default_resource_request(config).to_json()
tune.run(my_train_fn, resources_per_trial=resources, config=config)
3 changes: 1 addition & 2 deletions python/ray/tune/trainable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
TIMESTEPS_THIS_ITER, DONE, TIMESTEPS_TOTAL,
EPISODES_THIS_ITER, EPISODES_TOTAL,
TRAINING_ITERATION, RESULT_DUPLICATE)
from ray.tune.trial import Resources

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -96,7 +95,7 @@ def default_resource_request(cls, config):
allocation, so the user does not need to.
"""

return Resources(cpu=1, gpu=0)
return None

@classmethod
def resource_help(cls, config):
Expand Down
20 changes: 17 additions & 3 deletions python/ray/tune/trial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ def subtract(cls, original, to_remove):
return Resources(cpu, gpu, extra_cpu, extra_gpu, new_custom_res,
extra_custom_res)

def to_json(self):
return resources_to_json(self)


def json_to_resources(data):
if data is None or data == "null":
Expand Down Expand Up @@ -275,9 +278,20 @@ def __init__(self,
self.config = config or {}
self.local_dir = local_dir # This remains unexpanded for syncing.
self.experiment_tag = experiment_tag
self.resources = (
resources
or self._get_trainable_cls().default_resource_request(self.config))
trainable_cls = self._get_trainable_cls()
if trainable_cls and hasattr(trainable_cls,
"default_resource_request"):
default_resources = trainable_cls.default_resource_request(
self.config)
if default_resources:
if resources:
raise ValueError(
"Resources for {} have been automatically set to {} "
"by its `default_resource_request()` method. Please "
"clear the `resources_per_trial` option.".format(
trainable_cls, default_resources))
resources = default_resources
self.resources = resources or Resources(cpu=1, gpu=0)
self.stopping_criterion = stopping_criterion or {}
self.upload_dir = upload_dir
self.loggers = loggers
Expand Down