Update.

[culture.git] / main.py

diff --git a/main.py b/main.py
index 1565499..11eb8fd 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -13,7 +13,7 @@ from torch.nn import functional as F
 
 import ffutils
 import mygpt
 
 import ffutils
 import mygpt

-import sky, quizz_machine
+import sky, wireworld, quizz_machine

 
 # world quizzes vs. culture quizzes
 
 
 # world quizzes vs. culture quizzes
 


@@ -37,7 +37,7 @@ parser = argparse.ArgumentParser(
     formatter_class=argparse.ArgumentDefaultsHelpFormatter,
 )
 
     formatter_class=argparse.ArgumentDefaultsHelpFormatter,
 )
 

-parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
+parser.add_argument("--log_filename", type=str, default="train.log")

 
 parser.add_argument("--result_dir", type=str, default=None)
 
 
 parser.add_argument("--result_dir", type=str, default=None)
 


@@ -79,6 +79,8 @@ parser.add_argument("--dropout", type=float, default=0.1)
 
 parser.add_argument("--deterministic_synthesis", action="store_true", default=False)
 
 
 parser.add_argument("--deterministic_synthesis", action="store_true", default=False)
 

+parser.add_argument("--problem", type=str, default="sky")
+

 parser.add_argument("--nb_gpts", type=int, default=5)
 
 parser.add_argument("--nb_models_for_generation", type=int, default=1)
 parser.add_argument("--nb_gpts", type=int, default=5)
 
 parser.add_argument("--nb_models_for_generation", type=int, default=1)


@@ -93,6 +95,16 @@ parser.add_argument("--accuracy_to_make_c_quizzes", type=float, default=0.975)
 
 parser.add_argument("--dirty_debug", action="store_true", default=False)
 
 
 parser.add_argument("--dirty_debug", action="store_true", default=False)
 

+parser.add_argument("--sky_height", type=int, default=6)
+
+parser.add_argument("--sky_width", type=int, default=8)
+
+parser.add_argument("--sky_nb_birds", type=int, default=3)
+
+parser.add_argument("--sky_nb_iterations", type=int, default=2)
+
+parser.add_argument("--sky_speed", type=int, default=3)
+

 ######################################################################
 
 args = parser.parse_args()
 ######################################################################
 
 args = parser.parse_args()


@@ -219,8 +231,21 @@ else:
 assert args.nb_train_samples % args.batch_size == 0
 assert args.nb_test_samples % args.batch_size == 0
 
 assert args.nb_train_samples % args.batch_size == 0
 assert args.nb_test_samples % args.batch_size == 0
 

+if args.problem == "sky":
+    problem = sky.Sky(
+        height=args.sky_height,
+        width=args.sky_width,
+        nb_birds=args.sky_nb_birds,
+        nb_iterations=args.sky_nb_iterations,
+        speed=args.sky_speed,
+    )
+elif args.problem == "wireworld":
+    problem = wireworld.Wireworld(height=8, width=10, nb_iterations=2, speed=5)
+else:
+    raise ValueError
+

 quizz_machine = quizz_machine.QuizzMachine(
 quizz_machine = quizz_machine.QuizzMachine(

-    problem=sky.Sky(height=6, width=8, nb_birds=3, nb_iterations=2, speed=2),
+    problem=problem,

     nb_train_samples=args.nb_train_samples,
     nb_test_samples=args.nb_test_samples,
     batch_size=args.physical_batch_size,
     nb_train_samples=args.nb_train_samples,
     nb_test_samples=args.nb_test_samples,
     batch_size=args.physical_batch_size,


@@ -409,9 +434,9 @@ def create_c_quizzes(
         for n in range(nb_correct.max() + 1):
             recorded[n].append(new_c_quizzes[nb_correct == n].clone())
 
         for n in range(nb_correct.max() + 1):
             recorded[n].append(new_c_quizzes[nb_correct == n].clone())
 

-        log_string(
-            f"keep c_quizzes {nb_validated()*100/nb_generated():.02f}% kept total {nb_validated()} / {nb_to_create}"
-        )
+        nv = [recorded[n][-1].size(0) for n in recorded.keys()]
+
+        log_string(f"keep c_quizzes kept {nv} total {nb_validated()} / {nb_to_create}")

 
     # concatenate and shuffle
     for n in recorded.keys():
 
     # concatenate and shuffle
     for n in recorded.keys():