Update.

[picoclvr.git] / main.py

diff --git a/main.py b/main.py
index 6a1e8c1..f4e4f5c 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -33,7 +33,7 @@ parser.add_argument(
     "--task",
     type=str,
     default="twotargets",
-    help="byheart, learnop, guessop, degradation, 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=" ")
@@ -162,7 +162,9 @@ parser.add_argument("--expr_input_file", type=str, default=None)
 ##############################
 # Misc
 
-parser.add_argument("--degradation_hard", 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,
     },
-    "degradation": {
+    "mixing": {
         "model": "37M",
         "batch_size": 25,
-        "nb_train_samples": 100000,
+        "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
     "mnist": {
@@ -414,9 +416,11 @@ elif args.task == "twotargets":
         device=device,
     )
 
-elif args.task == "degradation":
+elif args.task == "mixing":
     task = tasks.SandBox(
-        problem=problems.ProblemDegradation(hard=args.degradation_hard),
+        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,