X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=e3fd9f0c37696a878b50f578d4d44c9141e1b0b2;hb=a3211f96c7426a613b82a2de87d4dd70640e8f46;hp=58e80462609bcda7cb8bc43f88d5dfec9022b8d4;hpb=8e23dd068df00df61c690ffa89ecc8cb9db4b32d;p=picoclvr.git

diff --git a/main.py b/main.py
index 58e8046..e3fd9f0 100755
--- a/main.py
+++ b/main.py
@@ -14,6 +14,7 @@ import torch, torchvision
 from torch import nn
 from torch.nn import functional as F
 
+import ffutils
 import mygpt, tasks
 
 ######################################################################
@@ -34,8 +35,8 @@ parser = argparse.ArgumentParser(
 parser.add_argument(
     "--task",
     type=str,
-    default="picoclvr",
-    help="picoclvr, mnist, maze, snake, stack, expr, world",
+    default="sandbox",
+    help="sandbox, picoclvr, mnist, maze, snake, stack, expr, world",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -136,7 +137,7 @@ parser.add_argument("--expr_input_file", type=str, default=None)
 ##############################
 # World options
 
-parser.add_argument("--world_vqae_nb_epochs", type=int, default=10)
+parser.add_argument("--world_vqae_nb_epochs", type=int, default=25)
 
 ######################################################################
 
@@ -150,6 +151,12 @@ if args.result_dir is None:
 ######################################################################
 
 default_args = {
+    "sandbox": {
+        "nb_epochs": 10,
+        "batch_size": 25,
+        "nb_train_samples": 25000,
+        "nb_test_samples": 10000,
+    },
     "picoclvr": {
         "nb_epochs": 25,
         "batch_size": 25,
@@ -187,9 +194,9 @@ default_args = {
         "nb_test_samples": 10000,
     },
     "world": {
-        "nb_epochs": 5,
+        "nb_epochs": 10,
         "batch_size": 25,
-        "nb_train_samples": 10000,
+        "nb_train_samples": 25000,
         "nb_test_samples": 1000,
     },
 }
@@ -257,7 +264,18 @@ picoclvr_pruner_eval = (
 
 ######################################################################
 
-if args.task == "picoclvr":
+if args.task == "sandbox":
+    task = tasks.SandBox(
+        tasks.ProblemLevel2(),
+        # tasks.ProblemAddition(zero_padded=False, inverted_result=False),
+        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,
@@ -334,6 +352,7 @@ elif args.task == "world":
         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,
     )