Update.

[culture.git] / main.py

diff --git a/main.py b/main.py
index 714327d..d194a8d 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -79,7 +79,7 @@ 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("--reverse_cleanup", action="store_true", default=False)
+parser.add_argument("--reverse_cleanup", action="store_true", default=True)

 
 parser.add_argument("--validation_forward_only", action="store_true", default=False)
 
 
 parser.add_argument("--validation_forward_only", action="store_true", default=False)
 


@@ -364,7 +364,7 @@ def run_tests(model, quizz_machine, deterministic_synthesis):
 
             nb_test_samples += input.size(0)
 
 
             nb_test_samples += input.size(0)
 

-        main_test_accuracy = quizz_machine.produce_results(
+        model.main_test_accuracy = quizz_machine.produce_results(

             n_epoch=n_epoch,
             model=model,
             result_dir=args.result_dir,
             n_epoch=n_epoch,
             model=model,
             result_dir=args.result_dir,


@@ -375,8 +375,6 @@ def run_tests(model, quizz_machine, deterministic_synthesis):
 
         log_string(f"test_perplexity {n_epoch} {test_perplexity}")
 
 
         log_string(f"test_perplexity {n_epoch} {test_perplexity}")
 

-    model.main_test_accuracy = main_test_accuracy
-

 
 ######################################################################
 
 
 ######################################################################
 


@@ -397,8 +395,6 @@ def create_c_quizzes(
 ):
     recorded = []
 
 ):
     recorded = []
 

-    sum_logits, sum_nb_c_quizzes = 0, 0
-

     nb_to_create = nb_for_train + nb_for_test
 
     # ------------------------------------------------------------
     nb_to_create = nb_for_train + nb_for_test
 
     # ------------------------------------------------------------


@@ -416,9 +412,6 @@ def create_c_quizzes(
             reverse_cleanup=args.reverse_cleanup,
         )
 
             reverse_cleanup=args.reverse_cleanup,
         )
 

-        sum_logits += c_quizzes.size(0) * ave_seq_logproba
-        sum_nb_c_quizzes += c_quizzes.size(0)
-

         nb_correct = quizz_machine.compute_correctness(
             c_quizzes, models, both_directions=not args.validation_forward_only
         )
         nb_correct = quizz_machine.compute_correctness(
             c_quizzes, models, both_directions=not args.validation_forward_only
         )


@@ -456,13 +449,12 @@ def create_c_quizzes(
             else ""
         )
 
             else ""
         )
 

-        quizz_machine.problem.save_quizzes(
-            valid_c_quizzes(recorded, criteria=lambda nb_correct: nb_correct == n)[:72],
-            args.result_dir,
-            f"culture_c_quiz_{n_epoch:04d}_N{n}{s}",
-        )
+        q = valid_c_quizzes(recorded, criteria=lambda nb_correct: nb_correct == n)[:72]

 
 

-    return sum_logits / sum_nb_c_quizzes
+        if q.size(0) > 0:
+            quizz_machine.save_quizzes(
+                args.result_dir, f"culture_c_quiz_{n_epoch:04d}_N{n}{s}", q
+            )

 
 
 ######################################################################
 
 
 ######################################################################


@@ -518,7 +510,7 @@ for n_epoch in range(args.nb_epochs):
     cta = " ".join([f"{float(m.main_test_accuracy):.04f}" for m in models])
     log_string(f"current_test_accuracies {cta}")
 
     cta = " ".join([f"{float(m.main_test_accuracy):.04f}" for m in models])
     log_string(f"current_test_accuracies {cta}")
 

-    # replace a fraction of the w_quizzes with a fresh ones
+    # replace a fraction of the w_quizzes with fresh ones

     quizz_machine.renew_w_quizzes(args.nb_train_samples // args.nb_gpts)
 
     if min([m.main_test_accuracy for m in models]) >= args.accuracy_to_make_c_quizzes:
     quizz_machine.renew_w_quizzes(args.nb_train_samples // args.nb_gpts)
 
     if min([m.main_test_accuracy for m in models]) >= args.accuracy_to_make_c_quizzes: