X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=0d4930dc32104f7dd3bf579262f4ab7e82746d03;hb=d6f73f1d5093fb098e822e14db382dd3a1c63a2a;hp=69ee58f8d050ec021082f30b5190cceea5090587;hpb=a92a5ca00f4277f7a133fa6cfaada2bc1981f524;p=culture.git

diff --git a/main.py b/main.py
index 69ee58f..0d4930d 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
 
 ######################################################################
@@ -81,6 +82,17 @@ parser.add_argument("--checkpoint_name", type=str, default="checkpoint.pth")
 ##############################
 # picoclvr options
 
+parser.add_argument("--sandbox_level", type=int, default=0)
+
+parser.add_argument("--sandbox_levels_nb_items", type=int, default=25)
+
+parser.add_argument("--sandbox_levels_len_source", type=int, default=5)
+
+parser.add_argument("--sandbox_levels_len_result", type=int, default=8)
+
+##############################
+# picoclvr options
+
 parser.add_argument("--picoclvr_nb_colors", type=int, default=5)
 
 parser.add_argument("--picoclvr_height", type=int, default=12)
@@ -264,7 +276,29 @@ picoclvr_pruner_eval = (
 ######################################################################
 
 if args.task == "sandbox":
+    if args.sandbox_level == 0:
+        problem = tasks.ProblemLevel0(
+            nb_sentences=args.sandbox_levels_nb_items,
+            len_prompt=args.sandbox_levels_len_source,
+            len_result=args.sandbox_levels_len_result,
+        )
+    elif args.sandbox_level == 1:
+        problem = tasks.ProblemLevel1(
+            nb_operators=args.sandbox_levels_nb_items,
+            len_source=args.sandbox_levels_len_source,
+            len_result=args.sandbox_levels_len_result,
+        )
+    elif args.sandbox_level == 2:
+        problem = tasks.ProblemLevel2(
+            len_source=args.sandbox_levels_len_source,
+            len_result=args.sandbox_levels_len_result,
+        )
+    else:
+        raise ValueError(f"Unknown sandbox level {args.sandbox_level}")
+
     task = tasks.SandBox(
+        problem,
+        # 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,