fixed merge conflict

lasgroup · Nov 28, 2023 · d7d3672 · d7d3672
2 parents 9909610 + 2de7794
commit d7d3672
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/experiments/online_rl_hardware/launcher.py b/experiments/online_rl_hardware/launcher.py
@@ -3,12 +3,11 @@
 
 def main(args):
     _applicable_configs = {
-        'prior': ['none_FVSGD', 'none_SVGD', 'high_fidelity', 'low_fidelity'],  # 'high_fidelity_no_aditive_GP'],
+        'prior': ['none_FVSGD', 'none_SVGD', 'high_fidelity', 'low_fidelity'],
         'seed': list(range(5)),
-        'run_remote': [0],
+        'machine': ['local'],
         'gpu': [1],
-        'wandb_tag': ['gpu' if args.num_gpus > 0 else 'cpu'],
-        'project_name': ['OnlineRLDebug3'],
+        'project_name': ['OnlineRLDebug4'],
     }
 
     all_flags_combinations = dict_permutations(_applicable_configs)

diff --git a/experiments/online_rl_hardware/online_rl_loop.py b/experiments/online_rl_hardware/online_rl_loop.py
@@ -23,7 +23,7 @@
 from sim_transfer.sims.envs import RCCarSimEnv
 from sim_transfer.sims.util import plot_rc_trajectory
 
-WANDB_ENTITY = 'sukhijab'
+WANDB_ENTITY = 'jonasrothfuss'
 EULER_ENTITY = 'rojonas'
 WANDB_LOG_DIR_EULER = '/cluster/scratch/' + EULER_ENTITY
 PRIORS = {'none_FVSGD',
@@ -359,13 +359,13 @@ def policy(x, key: jr.PRNGKey = jr.PRNGKey(0)):
     parser = argparse.ArgumentParser(description='Meta-BO run')
     parser.add_argument('--seed', type=int, default=914)
     parser.add_argument('--project_name', type=str, default='OnlineRL_RCCar')
-    parser.add_argument('--machine', type=str, default='local')
+    parser.add_argument('--machine', type=str, default='optimality')
     parser.add_argument('--gpu', type=int, default=1)
     parser.add_argument('--sim', type=int, default=1)
     parser.add_argument('--control_time_ms', type=float, default=24.)
 
     parser.add_argument('--prior', type=str, default='none_FVSGD')
-    parser.add_argument('--num_env_steps', type=int, default=200)
+    parser.add_argument('--num_env_steps', type=int, default=200, info='number of steps in the environment per episode')
     parser.add_argument('--reset_bnn', type=int, default=0)
     parser.add_argument('--deterministic_policy', type=int, default=1)
     parser.add_argument('--initial_state_fraction', type=float, default=0.5)

diff --git a/experiments/util.py b/experiments/util.py
@@ -149,7 +149,7 @@ def generate_run_commands(command_list: List[str], output_file_list: Optional[Li
                    f'--cpus-per-task {num_cpus} '
 
         if num_gpus > 0:
-            bsub_cmd += f'-G {num_gpus} --gres=gpumem:10240m'
+            bsub_cmd += f'-G {num_gpus} --gres=gpumem:10240m '
 
         assert output_file_list is None or len(command_list) == len(output_file_list)
         if output_file_list is None: