X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=quizz_machine.py;h=f799bf1c52a133dd6c2970ae80ac1f835143d45c;hb=e5efa329be244007e11013af84be1f448a04e1a0;hp=2cc6cfd59d02fcb417834a34455a1f42b7dfcbd5;hpb=45018258b05a979037477b978ef0c55fd444af7e;p=culture.git

diff --git a/quizz_machine.py b/quizz_machine.py
index 2cc6cfd..f799bf1 100755
--- a/quizz_machine.py
+++ b/quizz_machine.py
@@ -27,7 +27,7 @@ def masked_inplace_autoregression(
     deterministic_synthesis,
     forbidden_tokens=None,
     logit_biases=None,
-    progress_bar_desc="autoregression",
+    progress_bar_desc=None,
     device=torch.device("cpu"),
 ):
     assert input.size() == ar_mask.size()
@@ -225,13 +225,13 @@ class QuizzMachine:
 
     def create_c_quizzes(
         self,
+        nb,
+        model_for_generation,
+        models_for_validation,
+        min_ave_seq_logproba,
         n_epoch,
         result_dir,
         logger,
-        nb,
-        model,
-        other_models,
-        min_ave_seq_logproba,
     ):
         ###############################################################
         # Generate quizzes with model
@@ -250,14 +250,14 @@ class QuizzMachine:
             seq_logproba[...] = 0
 
             masked_inplace_autoregression(
-                model=model,
+                model=model_for_generation,
                 batch_size=self.batch_size,
                 input=c_quizzes,
                 ar_mask=ar_mask,
                 seq_logproba=seq_logproba,
                 temperature=temperature,
                 deterministic_synthesis=False,
-                progress_bar_desc="sampling c_quizzes",
+                # progress_bar_desc="sampling c_quizzes",
                 device=self.device,
             )
 
@@ -278,7 +278,7 @@ class QuizzMachine:
             else:
                 break
 
-            logger(f"chaging temperature to {temperature}")
+            logger(f"changing temperature to {temperature}")
 
         ###############################################################
         # Create the reverse quizzes
@@ -303,18 +303,18 @@ class QuizzMachine:
 
         nb_correct = []
 
-        for m in other_models:
+        for model in models_for_validation:
             result = c_quizzes.clone()
 
             masked_inplace_autoregression(
-                model=m,
+                model=model,
                 batch_size=self.batch_size,
                 input=result,
                 ar_mask=ar_mask,
                 seq_logproba=seq_logproba,
                 temperature=1.0,
                 deterministic_synthesis=True,
-                progress_bar_desc="solving c_quizzes",
+                # progress_bar_desc="solving c_quizzes",
                 device=self.device,
             )
 
@@ -323,14 +323,14 @@ class QuizzMachine:
             reverse_result = reverse_c_quizzes.clone()
 
             masked_inplace_autoregression(
-                model=m,
+                model=model,
                 batch_size=self.batch_size,
                 input=reverse_result,
                 ar_mask=ar_mask,
                 seq_logproba=seq_logproba,
                 temperature=1.0,
                 deterministic_synthesis=True,
-                progress_bar_desc="solving reversed c_quizzes",
+                # progress_bar_desc="solving reversed c_quizzes",
                 device=self.device,
             )