Update.

[culture.git] / tasks.py

diff --git a/tasks.py b/tasks.py
index 1a6c415..49b83ec 100755 (executable)
--- a/tasks.py
+++ b/tasks.py
@@ -2208,7 +2208,8 @@ class World(Task):
             f"accuracy_test {n_epoch} nb_total {test_nb_total} nb_correct {test_nb_correct} accuracy {(100.0*test_nb_correct)/test_nb_total:.02f}%"
         )
 
-        logger(f"main_test_accuracy {n_epoch} {test_nb_correct/test_nb_total}")
+        main_test_accuracy = test_nb_correct / test_nb_total
+        logger(f"main_test_accuracy {n_epoch} {main_test_accuracy}")
 
         ##############################
 
@@ -2227,38 +2228,42 @@ class World(Task):
 
         self.save_image(result, result_dir, f"world_result_{n_epoch:04d}.png", logger)
 
-    def store_new_problems(self, new_problems):
-        nb_current = self.train_input.size(0)
-        nb_new = new_problems.size(0)
+        return main_test_accuracy
+
+    def store_new_quizzes(self, new_quizzes, for_train=True):
+        input = self.train_input if for_train else self.test_input
+
+        nb_current = input.size(0)
+        nb_new = new_quizzes.size(0)
         if nb_new >= nb_current:
-            self.train_input[...] = new_problems[:nb_current]
+            input[...] = new_quizzes[:nb_current]
         else:
             nb_kept = nb_current - nb_new
-            self.train_input[:nb_kept] = self.train_input[-nb_kept:].clone()
-            self.train_input[nb_kept:] = new_problems
+            input[:nb_kept] = input[-nb_kept:].clone()
+            input[nb_kept:] = new_quizzes
 
-    def create_new_problems(self, n_epoch, result_dir, logger, nb, model, nb_runs):
-        new_problems = torch.empty(
+    def create_new_quizzes(self, n_epoch, result_dir, logger, nb, model, nb_runs):
+        new_quizzes = torch.empty(
             nb, self.height * self.width * 2 + 1, device=self.device, dtype=torch.int64
         )
-        ar_mask = torch.full(new_problems.size(), 1, device=self.device)
+        ar_mask = torch.full(new_quizzes.size(), 1, device=self.device)
 
         masked_inplace_autoregression(
             model,
             self.batch_size,
-            new_problems,
+            new_quizzes,
             ar_mask,
             deterministic_synthesis=False,
-            progress_bar_desc="new problems",
+            progress_bar_desc="new quizzes",
             device=self.device,
         )
 
         nb_correct = torch.empty(nb, device=self.device, dtype=torch.int64)
 
         for n in tqdm.tqdm(
-            range(new_problems.size(0)), dynamic_ncols=True, desc="checking problems"
+            range(new_quizzes.size(0)), dynamic_ncols=True, desc="checking quizzes"
         ):
-            result = new_problems[n][None, :].expand(nb_runs, -1).clone()
+            result = new_quizzes[n][None, :].expand(nb_runs, -1).clone()
             ar_mask = (
                 (torch.arange(result.size(1), device=self.device) > result.size(1) // 2)
                 .long()[None, :]
@@ -2276,7 +2281,7 @@ class World(Task):
             )
 
             nb_correct[n] = (
-                (new_problems[n][None, :] == result).long().min(dim=1).values.sum()
+                (new_quizzes[n][None, :] == result).long().min(dim=1).values.sum()
             )
 
-        return new_problems, nb_correct
+        return new_quizzes, nb_correct