Model contains instructions and memory by default.

bharatr21 · May 31, 2018 · 1854c6c · 1854c6c
1 parent 37a4738
commit 1854c6c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/rl/scripts/train_il.py b/rl/scripts/train_il.py
@@ -45,10 +45,10 @@
                     help="number of epochs (default: 10)")
 parser.add_argument("--batch-size", type=int, default=256,
                     help="batch size (default: 256)")
-parser.add_argument("--model-instr", action="store_true", default=False,
-                    help="use instructions in the model")
-parser.add_argument("--model-mem", action="store_true", default=False,
-                    help="use memory in the model")
+parser.add_argument("--no-instr", action="store_true", default=False,
+                    help="don't use instructions in the model")
+parser.add_argument("--no-mem", action="store_true", default=False,
+                    help="don't use memory in the model")
 parser.add_argument("--arch", default='cnn1',
                     help="image embedding architecture")
 args = parser.parse_args()
@@ -80,7 +80,8 @@
 
 # Define actor-critic model
 
-acmodel = utils.load_model(obss_preprocessor.obs_space, env.action_space, model_name)
+acmodel = utils.load_model(obss_preprocessor.obs_space, env.action_space, model_name,
+                           not(args.no_instr), not(args.no_mem), args.arch)
 if torch.cuda.is_available():
     acmodel.cuda()
 

diff --git a/rl/scripts/train_rl.py b/rl/scripts/train_rl.py
@@ -58,10 +58,10 @@
                     help="number of epochs for PPO (default: 4)")
 parser.add_argument("--batch-size", type=int, default=256,
                     help="batch size for PPO (default: 256)")
-parser.add_argument("--model-instr", action="store_true", default=False,
-                    help="use instructions in the model")
-parser.add_argument("--model-mem", action="store_true", default=False,
-                    help="use memory in the model")
+parser.add_argument("--no-instr", action="store_true", default=False,
+                    help="don't use instructions in the model")
+parser.add_argument("--no-mem", action="store_true", default=False,
+                    help="don't use memory in the model")
 parser.add_argument("--arch", default='cnn1',
                     help="image embedding architecture")
 parser.add_argument("--exp-name", default=None,
@@ -94,7 +94,7 @@
 # Define actor-critic model
 
 acmodel = utils.load_model(obss_preprocessor.obs_space, envs[0].action_space, model_name,
-                           args.model_instr, args.model_mem, args.arch)
+                           not(args.no_instr), not(args.no_mem), args.arch)
 if torch.cuda.is_available():
     acmodel.cuda()
 

diff --git a/rl/scripts/train_wd.py b/rl/scripts/train_wd.py
@@ -45,10 +45,10 @@
                     help="number of epochs (default: 10)")
 parser.add_argument("--batch-size", type=int, default=10,
                     help="batch size (default: 10)")
-parser.add_argument("--model-instr", action="store_true", default=False,
-                    help="use instructions in the model")
-parser.add_argument("--model-mem", action="store_true", default=False,
-                    help="use memory in the model")
+parser.add_argument("--no-instr", action="store_true", default=False,
+                    help="don't use instructions in the model")
+parser.add_argument("--no-mem", action="store_true", default=False,
+                    help="don't use memory in the model")
 parser.add_argument("--arch", default='cnn1',
                     help="image embedding architecture")
 parser.add_argument("--discount", type=float, default=0.99,
@@ -89,7 +89,7 @@
 
 # Define actor-critic model
 acmodel = utils.load_model(obss_preprocessor.obs_space, env.action_space, model_name,
-                            args.model_instr, args.model_mem, args.arch)
+                           not(args.no_instr), not(args.no_mem), args.arch)
 
 acmodel.train()