Update.

[culture.git] / main.py

diff --git a/main.py b/main.py
index ee4e9e5..8033836 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -73,7 +73,7 @@ parser.add_argument("--deterministic_synthesis", action="store_true", default=Fa
 
 parser.add_argument("--nb_gpts", type=int, default=5)
 
-parser.add_argument("--check", action="store_true", default=False)
+parser.add_argument("--dirty_debug", action="store_true", default=False)
 
 ######################################################################
 
@@ -182,9 +182,9 @@ for n in vars(args):
 
 ######################################################################
 
-if args.check:
-    args.nb_train_samples = 25000
-    args.nb_test_samples = 1000
+if args.dirty_debug:
+    args.nb_train_samples = 2500
+    args.nb_test_samples = 100
 
 if args.physical_batch_size is None:
     args.physical_batch_size = args.batch_size
@@ -339,12 +339,12 @@ def create_quizzes(
 ):
     kept = []
 
-    sum_logits = 0
+    sum_logits, sum_nb_quizzes = 0, 0
 
     while sum([x.size(0) for x in kept]) < nb_for_train + nb_for_test:
         nb_to_generate = 4 * (nb_for_train + nb_for_test)
 
-        new_quizzes, nb_correct, _sum_logits = task.create_new_quizzes(
+        new_quizzes, nb_correct, average_logits = task.create_new_quizzes(
             n_epoch=n_epoch,
             result_dir=args.result_dir,
             logger=log_string,
@@ -354,12 +354,18 @@ def create_quizzes(
             desired_average_logits=desired_average_logits,
         )
 
-        sum_logits += _sum_logits
+        sum_logits += new_quizzes.size(0) * average_logits
+        sum_nb_quizzes += new_quizzes.size(0)
 
         to_keep = new_quizzes[nb_correct == len(other_models) - 1]
+
+        if args.dirty_debug:
+            to_keep = new_quizzes
+
         log_string(
             f"keep {to_keep.size(0)}/{new_quizzes.size(0)} quizzes ({to_keep.size(0)*100/new_quizzes.size(0):.02f}%)"
         )
+
         kept.append(to_keep)
 
     new_quizzes = torch.cat(kept, dim=0)[: nb_for_train + nb_for_test]
@@ -374,7 +380,7 @@ def create_quizzes(
         log_string,
     )
 
-    return sum_logits / new_quizzes.size(0)
+    return sum_logits / sum_nb_quizzes
 
 
 ######################################################################
@@ -408,7 +414,7 @@ accuracy_to_make_quizzes = 0.975
 nb_new_quizzes_for_train = 1000
 nb_new_quizzes_for_test = 100
 
-if args.check:
+if args.dirty_debug:
     accuracy_to_make_quizzes = 0.0
     nb_new_quizzes_for_train = 100
     nb_new_quizzes_for_test = 10