X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=main.py;h=d961301b4115b20a19cc63f1432d605564597305;hb=4aa7e109b4c712643cdddc2480b66d8799f71d3f;hp=7197414b772c9a8640a85124a1c31721d9a83332;hpb=c951702f59f869c58d59b59f60a4931d890a13dc;p=picoclvr.git

diff --git a/main.py b/main.py
index 7197414..d961301 100755
--- a/main.py
+++ b/main.py
@@ -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, grid",
+    help="byheart, learnop, guessop, twotargets, addition, picoclvr, mnist, maze, snake, stack, expr, rpl, grid, qmlp",
 )
 
 parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
@@ -159,11 +159,6 @@ parser.add_argument("--expr_result_max", type=int, default=99)
 
 parser.add_argument("--expr_input_file", type=str, default=None)
 
-##############################
-# World options
-
-parser.add_argument("--world_vqae_nb_epochs", type=int, default=25)
-
 ######################################################################
 
 args = parser.parse_args()
@@ -200,6 +195,12 @@ default_task_args = {
         "nb_train_samples": 250000,
         "nb_test_samples": 10000,
     },
+    "qmlp": {
+        "model": "37M",
+        "batch_size": 10,
+        "nb_train_samples": 100000,
+        "nb_test_samples": 1000,
+    },
     "guessop": {
         "model": "352M",
         "batch_size": 25,
@@ -248,19 +249,12 @@ default_task_args = {
         "nb_train_samples": 50000,
         "nb_test_samples": 10000,
     },
-
     "mnist": {
         "model": "37M",
         "batch_size": 10,
         "nb_train_samples": 60000,
         "nb_test_samples": 10000,
     },
-    "world": {
-        "model": "37M",
-        "batch_size": 25,
-        "nb_train_samples": 25000,
-        "nb_test_samples": 1000,
-    },
 }
 
 if args.task in default_task_args:
@@ -514,12 +508,12 @@ elif args.task == "grid":
         device=device,
     )
 
-elif args.task == "world":
-    task = tasks.World(
+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,
     )