projects
/
picoclvr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[picoclvr.git]
/
main.py
diff --git
a/main.py
b/main.py
index
e2b705d
..
69ee58f
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-34,8
+34,8
@@
parser = argparse.ArgumentParser(
parser.add_argument(
"--task",
type=str,
parser.add_argument(
"--task",
type=str,
- default="
picoclvr
",
- help="
picoclvr, mnist, maze, snake, stack, expr
",
+ default="
sandbox
",
+ help="
sandbox, picoclvr, mnist, maze, snake, stack, expr, world
",
)
parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
)
parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@
-110,7
+110,7
@@
parser.add_argument("--snake_nb_colors", type=int, default=5)
parser.add_argument("--snake_length", type=int, default=200)
##############################
parser.add_argument("--snake_length", type=int, default=200)
##############################
-# S
nake
options
+# S
tack
options
parser.add_argument("--stack_nb_steps", type=int, default=100)
parser.add_argument("--stack_nb_steps", type=int, default=100)
@@
-127,8
+127,17
@@
parser.add_argument("--expr_nb_variables", type=int, default=5)
parser.add_argument("--expr_sequence_length", type=int, default=40)
parser.add_argument("--expr_sequence_length", type=int, default=40)
+parser.add_argument("--expr_operand_max", type=int, default=9)
+
+parser.add_argument("--expr_result_max", type=int, default=99)
+
parser.add_argument("--expr_input_file", type=str, default=None)
parser.add_argument("--expr_input_file", type=str, default=None)
+##############################
+# World options
+
+parser.add_argument("--world_vqae_nb_epochs", type=int, default=25)
+
######################################################################
args = parser.parse_args()
######################################################################
args = parser.parse_args()
@@
-141,6
+150,12
@@
if args.result_dir is None:
######################################################################
default_args = {
######################################################################
default_args = {
+ "sandbox": {
+ "nb_epochs": 10,
+ "batch_size": 25,
+ "nb_train_samples": 25000,
+ "nb_test_samples": 10000,
+ },
"picoclvr": {
"nb_epochs": 25,
"batch_size": 25,
"picoclvr": {
"nb_epochs": 25,
"batch_size": 25,
@@
-172,11
+187,17
@@
default_args = {
"nb_test_samples": 1000,
},
"expr": {
"nb_test_samples": 1000,
},
"expr": {
- "nb_epochs":
5
0,
+ "nb_epochs":
4
0,
"batch_size": 25,
"batch_size": 25,
- "nb_train_samples":
25
0000,
+ "nb_train_samples":
100
0000,
"nb_test_samples": 10000,
},
"nb_test_samples": 10000,
},
+ "world": {
+ "nb_epochs": 10,
+ "batch_size": 25,
+ "nb_train_samples": 25000,
+ "nb_test_samples": 1000,
+ },
}
if args.task in default_args:
}
if args.task in default_args:
@@
-242,7
+263,16
@@
picoclvr_pruner_eval = (
######################################################################
######################################################################
-if args.task == "picoclvr":
+if args.task == "sandbox":
+ task = tasks.SandBox(
+ nb_train_samples=args.nb_train_samples,
+ nb_test_samples=args.nb_test_samples,
+ batch_size=args.batch_size,
+ logger=log_string,
+ device=device,
+ )
+
+elif args.task == "picoclvr":
task = tasks.PicoCLVR(
nb_train_samples=args.nb_train_samples,
nb_test_samples=args.nb_test_samples,
task = tasks.PicoCLVR(
nb_train_samples=args.nb_train_samples,
nb_test_samples=args.nb_test_samples,
@@
-307,10
+337,22
@@
elif args.task == "expr":
nb_test_samples=args.nb_test_samples,
nb_variables=args.expr_nb_variables,
sequence_length=args.expr_sequence_length,
nb_test_samples=args.nb_test_samples,
nb_variables=args.expr_nb_variables,
sequence_length=args.expr_sequence_length,
+ operand_max=args.expr_operand_max,
+ result_max=args.expr_result_max,
batch_size=args.batch_size,
device=device,
)
batch_size=args.batch_size,
device=device,
)
+elif args.task == "world":
+ task = tasks.World(
+ nb_train_samples=args.nb_train_samples,
+ nb_test_samples=args.nb_test_samples,
+ batch_size=args.batch_size,
+ vqae_nb_epochs=args.world_vqae_nb_epochs,
+ logger=log_string,
+ device=device,
+ )
+
else:
raise ValueError(f"Unknown task {args.task}")
else:
raise ValueError(f"Unknown task {args.task}")