Skip to content

Make the experiment wrapper a module #586

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
ryanjulian merged 1 commit into from
Mar 19, 2019
Merged

Make the experiment wrapper a module #586

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
3 changes: 2 additions & 1 deletion examples/resume_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
if args.log_dir is not None:
params['log_dir'] = args.log_dir
params['resume_from'] = args.file
command = to_local_command(params, script='scripts/run_experiment.py')
command = to_local_command(
params, script='garage.experiment.experiment_wrapper')
print(command)
try:
subprocess.call(command, shell=True, env=os.environ)
Expand Down
17 changes: 8 additions & 9 deletions garage/experiment/experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def run_experiment(method_call=None,
exp_prefix="experiment",
exp_name=None,
log_dir=None,
script="scripts/run_experiment.py",
script='garage.experiment.experiment_wrapper',
python_command="python",
mode="local",
dry=False,
Expand Down Expand Up @@ -379,7 +379,7 @@ def run_experiment(method_call=None,
command = to_local_command(
task,
python_command=python_command,
script=osp.join(config.PROJECT_PATH, script),
script=script,
use_gpu=use_gpu)
print(command)
if dry:
Expand Down Expand Up @@ -545,10 +545,9 @@ def _to_param_val(v):

def to_local_command(params,
python_command="python",
script=osp.join(config.PROJECT_PATH,
'scripts/run_experiment.py'),
script='garage.experiment.experiment_wrapper',
use_gpu=False):
command = python_command + " " + script
command = python_command + " -m " + script
for k, v in config.ENV.items():
command = ("%s=%s " % (k, v)) + command
pre_commands = params.pop("pre_commands", None)
Expand All @@ -573,7 +572,7 @@ def to_local_command(params,
def to_docker_command(params,
docker_image,
python_command="python",
script='scripts/run_experiment.py',
script='garage.experiment.experiment_wrapper',
pre_commands=None,
use_tty=False,
mujoco_path=None,
Expand Down Expand Up @@ -642,7 +641,7 @@ def to_docker_command(params,
to_local_command(
params,
python_command=python_command,
script=osp.join(config.DOCKER_CODE_DIR, script),
script='garage.experiment.experiment_wrapper',
use_gpu=use_gpu))
# We for 2 min sleep after termination to allow for last syncs.
if post_commands is None:
Expand All @@ -661,7 +660,7 @@ def launch_ec2(params_list,
docker_image,
code_full_path,
python_command="python",
script='scripts/run_experiment.py',
script='garage.experiment.experiment_wrapper',
aws_config=None,
dry=False,
terminate_machine=True,
Expand Down Expand Up @@ -1095,7 +1094,7 @@ def to_lab_kube_pod(params,
docker_image,
code_full_path,
python_command="python",
script='scripts/run_experiment.py',
script='garage.experiment.experiment_wrapper',
is_gpu=False,
sync_s3_pkl=False,
periodic_sync=True,
Expand Down
1 change: 1 addition & 0 deletions scripts/run_experiment.py → garage/experiment/experiment_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python3
import argparse
import ast
import base64
Expand Down