X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=17936c34dc7c3ea4a0108a219a3a386151a34755;hb=6e09c88d26d0bfd675af9afd9cdc32aa3485d1b7;hp=4a46fe64d968fef715389cec6b02bd94a8a2fec3;hpb=0f4c86c0e7730db4147f136df5aeb5528fc943a0;p=picoclvr.git

diff --git a/main.py b/main.py
index 4a46fe6..17936c3 100755
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="byheart, learnop, guessop, twocuts, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
+    help="byheart, learnop, guessop, mixing, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -160,9 +160,11 @@ parser.add_argument("--expr_result_max", type=int, default=99)
 parser.add_argument("--expr_input_file", type=str, default=None)
 
 ##############################
-# Misc
+# Mixing
 
-parser.add_argument("--twocuts_no_global", action="store_true", default=False)
+parser.add_argument("--mixing_hard", action="store_true", default=False)
+
+parser.add_argument("--mixing_deterministic_start", action="store_true", default=False)
 
 ######################################################################
 
@@ -254,10 +256,10 @@ default_task_args = {
         "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
-    "twocuts": {
+    "mixing": {
         "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 100000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
     "mnist": {
@@ -346,6 +348,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)}")
 
@@ -414,9 +418,11 @@ elif args.task == "twotargets":
         device=device,
     )
 
-elif args.task == "twocuts":
+elif args.task == "mixing":
     task = tasks.SandBox(
-        problem=problems.ProblemTwoCuts(global_constraint = not args.twocuts_no_global),
+        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,