Update.

[picoclvr.git] / main.py

diff --git a/main.py b/main.py
index 003028a..c763016 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -35,7 +35,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="picoclvr",
-    help="picoclvr, mnist, maze, snake, stack, expr",
+    help="picoclvr, mnist, maze, snake, stack, expr, world",
 )
 
 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)
 
 ##############################
-# Snake options
+# Stack options
 
 parser.add_argument("--stack_nb_steps", type=int, default=100)
 
@@ -125,7 +125,13 @@ parser.add_argument("--stack_fraction_values_for_train", type=float, default=0.7
 
 parser.add_argument("--expr_nb_variables", type=int, default=5)
 
-parser.add_argument("--expr_sequence_length", type=int, default=30)
+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)
 
 ######################################################################
 
@@ -170,11 +176,17 @@ default_args = {
         "nb_test_samples": 1000,
     },
     "expr": {
-        "nb_epochs": 50,
+        "nb_epochs": 40,
         "batch_size": 25,
-        "nb_train_samples": 250000,
+        "nb_train_samples": 1000000,
         "nb_test_samples": 10000,
     },
+    "world": {
+        "nb_epochs": 5,
+        "batch_size": 25,
+        "nb_train_samples": 10000,
+        "nb_test_samples": 1000,
+    },
 }
 
 if args.task in default_args:
@@ -305,6 +317,16 @@ elif args.task == "expr":
         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,
+    )
+
+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,
         device=device,
     )
@@ -366,6 +388,20 @@ else:
 
 ######################################################################
 
+if args.task == "expr" and args.expr_input_file is not None:
+    task.produce_results(
+        nb_epochs_finished,
+        model,
+        args.result_dir,
+        log_string,
+        args.deterministic_synthesis,
+        args.expr_input_file,
+    )
+
+    exit(0)
+
+######################################################################
+
 nb_epochs = args.nb_epochs if args.nb_epochs > 0 else nb_epochs_default
 
 # Compute the entropy of the training tokens