From 9fd608dbb89227f85271893b1ec5c2a67a8d3371 Mon Sep 17 00:00:00 2001 From: Richard Date: Sat, 12 Jan 2019 05:12:16 -0800 Subject: [PATCH 1/3] catch unbound localerror --- rlkit/launchers/launcher_util.py | 17 +++++++++-------- rlkit/scripts/__init__.py | 0 .../scripts}/run_experiment_from_doodad.py | 0 .../scripts}/sim_goal_conditioned_policy.py | 0 {scripts => rlkit/scripts}/sim_policy.py | 0 {scripts => rlkit/scripts}/sim_tdm_policy.py | 0 6 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 rlkit/scripts/__init__.py rename {scripts => rlkit/scripts}/run_experiment_from_doodad.py (100%) rename {scripts => rlkit/scripts}/sim_goal_conditioned_policy.py (100%) rename {scripts => rlkit/scripts}/sim_policy.py (100%) rename {scripts => rlkit/scripts}/sim_tdm_policy.py (100%) diff --git a/rlkit/launchers/launcher_util.py b/rlkit/launchers/launcher_util.py index d50eb71b9..567f00955 100644 --- a/rlkit/launchers/launcher_util.py +++ b/rlkit/launchers/launcher_util.py @@ -90,7 +90,7 @@ def run_experiment_here( variant=None, exp_id=0, seed=None, - use_gpu=True, + use_gpu=False, # Logger params: exp_prefix="default", snapshot_mode='last', @@ -438,10 +438,10 @@ def run_experiment( skip_wait=False, # ec2 settings sync_interval=180, - region='us-east-1', + region='us-east-2', instance_type=None, spot_price=None, - verbose=False, + verbose=True, num_exps_per_instance=1, # sss settings time_in_mins=None, @@ -565,7 +565,7 @@ def foo(variant): )) except git.exc.InvalidGitRepositoryError: pass - except ImportError: + except (ImportError, UnboundLocalError): git_infos = None run_experiment_kwargs = dict( exp_prefix=exp_prefix, @@ -590,10 +590,10 @@ def foo(variant): """ if mode == 'ec2' or mode == 'gcp': - if not ec2_okayed and not query_yes_no( - "{} costs money. Are you sure you want to run?".format(mode) - ): - sys.exit(1) + # if not ec2_okayed and not query_yes_no( + # "{} costs money. Are you sure you want to run?".format(mode) + # ): + # sys.exit(1) if not gpu_ec2_okayed and use_gpu: if not query_yes_no( "{} is more expensive with GPUs. Confirm?".format(mode) @@ -717,6 +717,7 @@ def foo(variant): gpu=use_gpu, aws_s3_path=aws_s3_path, num_exps=num_exps_per_instance, + **mode_kwargs ) elif mode == 'gcp': diff --git a/rlkit/scripts/__init__.py b/rlkit/scripts/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/scripts/run_experiment_from_doodad.py b/rlkit/scripts/run_experiment_from_doodad.py similarity index 100% rename from scripts/run_experiment_from_doodad.py rename to rlkit/scripts/run_experiment_from_doodad.py diff --git a/scripts/sim_goal_conditioned_policy.py b/rlkit/scripts/sim_goal_conditioned_policy.py similarity index 100% rename from scripts/sim_goal_conditioned_policy.py rename to rlkit/scripts/sim_goal_conditioned_policy.py diff --git a/scripts/sim_policy.py b/rlkit/scripts/sim_policy.py similarity index 100% rename from scripts/sim_policy.py rename to rlkit/scripts/sim_policy.py diff --git a/scripts/sim_tdm_policy.py b/rlkit/scripts/sim_tdm_policy.py similarity index 100% rename from scripts/sim_tdm_policy.py rename to rlkit/scripts/sim_tdm_policy.py From 40450cc19f97600649644f837169f58ccd71f40c Mon Sep 17 00:00:00 2001 From: Richard Date: Sun, 13 Jan 2019 11:01:49 -0800 Subject: [PATCH 2/3] update --- rlkit/launchers/launcher_util.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rlkit/launchers/launcher_util.py b/rlkit/launchers/launcher_util.py index 567f00955..73bbb59a5 100644 --- a/rlkit/launchers/launcher_util.py +++ b/rlkit/launchers/launcher_util.py @@ -438,10 +438,10 @@ def run_experiment( skip_wait=False, # ec2 settings sync_interval=180, - region='us-east-2', + region='us-east-1', instance_type=None, spot_price=None, - verbose=True, + verbose=False, num_exps_per_instance=1, # sss settings time_in_mins=None, @@ -590,10 +590,10 @@ def foo(variant): """ if mode == 'ec2' or mode == 'gcp': - # if not ec2_okayed and not query_yes_no( - # "{} costs money. Are you sure you want to run?".format(mode) - # ): - # sys.exit(1) + if not ec2_okayed and not query_yes_no( + "{} costs money. Are you sure you want to run?".format(mode) + ): + sys.exit(1) if not gpu_ec2_okayed and use_gpu: if not query_yes_no( "{} is more expensive with GPUs. Confirm?".format(mode) From 027bae87defc6ec0efd20f9f3e9198078943a25d Mon Sep 17 00:00:00 2001 From: Richard Date: Sun, 13 Jan 2019 11:03:12 -0800 Subject: [PATCH 3/3] delete space --- rlkit/launchers/launcher_util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rlkit/launchers/launcher_util.py b/rlkit/launchers/launcher_util.py index 73bbb59a5..111169446 100644 --- a/rlkit/launchers/launcher_util.py +++ b/rlkit/launchers/launcher_util.py @@ -717,7 +717,6 @@ def foo(variant): gpu=use_gpu, aws_s3_path=aws_s3_path, num_exps=num_exps_per_instance, - **mode_kwargs ) elif mode == 'gcp':