X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=958dfc70a791d2b47708b10e7f44e53e7456fc2e;hb=545b06257dd69285c6321d7bd713d819da74953b;hp=7b104bfa6db294ffbf1a53cb42aa28877e72f4b0;hpb=c797d1dc0243e6bf7a7e4a0d93bfcf13bf719163;p=picoclvr.git

diff --git a/main.py b/main.py
index 7b104bf..958dfc7 100755
--- a/main.py
+++ b/main.py
@@ -5,7 +5,7 @@
 
 # Written by Francois Fleuret <francois@fleuret.org>
 
-import math, sys, argparse, time, tqdm, os
+import math, sys, argparse, time, tqdm, os, datetime
 
 import torch, torchvision
 from torch import nn
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="byheart, learnop, guessop, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl",
+    help="file, byheart, learnop, guessop, mixing, memory, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -46,7 +46,7 @@ parser.add_argument("--max_percents_of_test_in_train", type=int, default=1)
 
 ########################################
 
-parser.add_argument("--nb_epochs", type=int, default=None)
+parser.add_argument("--nb_epochs", type=int, default=25)
 
 parser.add_argument("--batch_size", type=int, default=None)
 
@@ -62,7 +62,7 @@ parser.add_argument("--learning_rate_schedule", type=str, default="10: 2e-5,30:
 
 ########################################
 
-parser.add_argument("--model", type=str, default="37M")
+parser.add_argument("--model", type=str, default=None)
 
 parser.add_argument("--dim_model", type=int, default=None)
 
@@ -86,19 +86,33 @@ parser.add_argument("--overwrite_results", action="store_true", default=False)
 
 parser.add_argument("--checkpoint_name", type=str, default="checkpoint.pth")
 
+##############################
+# filetask
+
+parser.add_argument("--filetask_train_file", type=str, default=None)
+
+parser.add_argument("--filetask_test_file", type=str, default=None)
+
 ##############################
 # rpl options
 
-parser.add_argument("--rpl_nb_starting_values", type=int, default=5)
+parser.add_argument("--rpl_nb_starting_values", type=int, default=3)
 
 parser.add_argument("--rpl_max_input", type=int, default=9)
 
-parser.add_argument("--rpl_prog_len", type=int, default=10)
+parser.add_argument("--rpl_prog_len", type=int, default=8)
 
-parser.add_argument("--rpl_nb_runs", type=int, default=8)
+parser.add_argument("--rpl_nb_runs", type=int, default=5)
 
 parser.add_argument("--rpl_no_prog", action="store_true", default=False)
 
+##############################
+# grid options
+
+parser.add_argument("--grid_size", type=int, default=6)
+
+parser.add_argument("--grid_fraction_play", type=float, default=0)
+
 ##############################
 # picoclvr options
 
@@ -113,11 +127,11 @@ parser.add_argument("--picocvlr_prune_properties", type=str, default="none")
 ##############################
 # Maze options
 
-parser.add_argument("--maze_height", type=int, default=23)
+parser.add_argument("--maze_height", type=int, default=13)
 
-parser.add_argument("--maze_width", type=int, default=39)
+parser.add_argument("--maze_width", type=int, default=21)
 
-parser.add_argument("--maze_nb_walls", type=int, default=45)
+parser.add_argument("--maze_nb_walls", type=int, default=15)
 
 ##############################
 # Snake options
@@ -155,9 +169,11 @@ parser.add_argument("--expr_result_max", type=int, default=99)
 parser.add_argument("--expr_input_file", type=str, default=None)
 
 ##############################
-# World options
+# Mixing
+
+parser.add_argument("--mixing_hard", action="store_true", default=False)
 
-parser.add_argument("--world_vqae_nb_epochs", type=int, default=25)
+parser.add_argument("--mixing_deterministic_start", action="store_true", default=False)
 
 ######################################################################
 
@@ -171,83 +187,107 @@ if args.result_dir is None:
 ######################################################################
 
 default_task_args = {
-    "byheart": {
-        "nb_epochs": 5,
+    "file": {
+        "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 50000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
-    "learnop": {
-        "nb_epochs": 5,
+    "addition": {
+        "model": "352M",
         "batch_size": 25,
-        "nb_train_samples": 50000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
-    "guessop": {
-        "nb_epochs": 5,
+    "byheart": {
+        "model": "37M",
         "batch_size": 25,
         "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
-    "twotargets": {
-        "nb_epochs": 5,
+    "expr": {
+        "model": "352M",
         "batch_size": 25,
-        "nb_train_samples": 50000,
+        "nb_train_samples": 2500000,
         "nb_test_samples": 10000,
     },
-    "addition": {
-        "nb_epochs": 5,
+    "grid": {
+        "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 50000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
-    "picoclvr": {
-        "nb_epochs": 25,
+    "qmlp": {
+        "model": "37M",
+        "batch_size": 10,
+        "nb_train_samples": 100000,
+        "nb_test_samples": 1000,
+    },
+    "guessop": {
+        "model": "352M",
         "batch_size": 25,
-        "nb_train_samples": 250000,
+        "nb_train_samples": 1000000,
         "nb_test_samples": 10000,
     },
-    "mnist": {
-        "nb_epochs": 25,
-        "batch_size": 10,
-        "nb_train_samples": 60000,
+    "learnop": {
+        "model": "37M",
+        "batch_size": 25,
+        "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
     "maze": {
-        "nb_epochs": 25,
+        "model": "37M",
         "batch_size": 5,
+        "nb_train_samples": 100000,
+        "nb_test_samples": 10000,
+    },
+    "picoclvr": {
+        "model": "37M",
+        "batch_size": 25,
         "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
+    "rpl": {
+        "model": "352M",
+        "batch_size": 5,
+        "nb_train_samples": 2500000,
+        "nb_test_samples": 10000,
+    },
     "snake": {
-        "nb_epochs": 5,
+        "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 50000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
     "stack": {
-        "nb_epochs": 5,
+        "model": "37M",
         "batch_size": 25,
         "nb_train_samples": 100000,
         "nb_test_samples": 1000,
     },
-    "expr": {
-        "nb_epochs": 40,
+    "twotargets": {
+        "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 1000000,
+        "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
-    "rpl": {
-        "nb_epochs": 40,
+    "memory": {
+        "model": "37M",
+        "batch_size": 100,
+        "nb_train_samples": 25000,
+        "nb_test_samples": 1000,
+    },
+    "mixing": {
+        "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 100000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
-    "world": {
-        "nb_epochs": 10,
-        "batch_size": 25,
-        "nb_train_samples": 25000,
-        "nb_test_samples": 1000,
+    "mnist": {
+        "model": "37M",
+        "batch_size": 10,
+        "nb_train_samples": 60000,
+        "nb_test_samples": 10000,
     },
 }
 
@@ -266,6 +306,13 @@ default_model_args = {
         "nb_heads": 2,
         "nb_blocks": 2,
     },
+    "4M": {
+        "dim_model": 256,
+        "dim_keys": 32,
+        "dim_hidden": 1024,
+        "nb_heads": 4,
+        "nb_blocks": 6,
+    },
     "37M": {
         "dim_model": 512,
         "dim_keys": 64,
@@ -329,6 +376,8 @@ def log_string(s):
     sys.stdout.flush()
 
 
+log_string(f"argv {' '.join(sys.argv)}")
+
 for n in vars(args):
     log_string(f"args.{n} {getattr(args, n)}")
 
@@ -354,7 +403,22 @@ picoclvr_pruner_eval = (
 
 ######################################################################
 
-if args.task == "byheart":
+if args.task == "file":
+    assert (
+        args.filetask_train_file is not None and args.filetask_test_file is not None
+    ), "You have to specify the task train and test files"
+    task = tasks.TaskFromFile(
+        args.filetask_train_file,
+        args.filetask_test_file,
+        nb_train_samples=args.nb_train_samples,
+        nb_test_samples=args.nb_test_samples,
+        batch_size=args.batch_size,
+        shuffle=True,
+        device=device,
+    )
+    args.max_percents_of_test_in_train = 0
+
+elif args.task == "byheart":
     task = tasks.SandBox(
         problem=problems.ProblemByHeart(),
         nb_train_samples=args.nb_train_samples,
@@ -397,6 +461,28 @@ elif args.task == "twotargets":
         device=device,
     )
 
+elif args.task == "memory":
+    task = tasks.SandBox(
+        problem=problems.ProblemMemory(),
+        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 == "mixing":
+    task = tasks.SandBox(
+        problem=problems.ProblemMixing(
+            hard=args.mixing_hard, random_start=not args.mixing_deterministic_start
+        ),
+        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 == "addition":
     task = tasks.SandBox(
         problem=problems.ProblemAddition(),
@@ -492,12 +578,23 @@ elif args.task == "rpl":
         device=device,
     )
 
-elif args.task == "world":
-    task = tasks.World(
+elif args.task == "grid":
+    task = tasks.Grid(
+        nb_train_samples=args.nb_train_samples,
+        nb_test_samples=args.nb_test_samples,
+        batch_size=args.batch_size,
+        size=args.grid_size,
+        fraction_play=args.grid_fraction_play,
+        logger=log_string,
+        device=device,
+    )
+
+elif args.task == "qmlp":
+    task = tasks.QMLP(
         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,
+        result_dir=args.result_dir,
         logger=log_string,
         device=device,
     )
@@ -652,6 +749,8 @@ if nb_epochs_finished >= nb_epochs:
         deterministic_synthesis=args.deterministic_synthesis,
     )
 
+time_pred_result = None
+
 for n_epoch in range(nb_epochs_finished, nb_epochs):
     learning_rate = learning_rate_schedule[n_epoch]
 
@@ -710,6 +809,13 @@ for n_epoch in range(nb_epochs_finished, nb_epochs):
             deterministic_synthesis=args.deterministic_synthesis,
         )
 
+        time_current_result = datetime.datetime.now()
+        if time_pred_result is not None:
+            log_string(
+                f"next_result {time_current_result + (time_current_result - time_pred_result)}"
+            )
+        time_pred_result = time_current_result
+
     checkpoint = {
         "nb_epochs_finished": n_epoch + 1,
         "model_state": model.state_dict(),