X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=quizz_machine.py;h=3828e5b06d82a8ad17e169c8e0ec7520854c7dca;hb=5a77666812f943678094edea26bc17dff8304073;hp=de855201c03cc0115ecdddb873e17da0adfd1ed3;hpb=eaed6307836d88abe7c0f4be733a38364ba20e2f;p=culture.git diff --git a/quizz_machine.py b/quizz_machine.py index de85520..3828e5b 100755 --- a/quizz_machine.py +++ b/quizz_machine.py @@ -105,19 +105,95 @@ def masked_inplace_autoregression( class QuizzMachine: - def make_ar_mask(self, input): - b = torch.arange(input.size(1), device=input.device) > input.size(1) // 2 - return b.long()[None, :].expand_as(input) + def indices_forward_and_backward(self, quizzes): + i_forward = quizzes[:, 0] == self.token_forward + j_forward = quizzes[:, 1 + self.prompt_len] == self.token_forward + i_backward = quizzes[:, 0] == self.token_backward + j_backward = quizzes[:, 1 + self.answer_len] == self.token_backward + assert torch.logical_or( + torch.logical_and(i_forward, j_forward), + torch.logical_and(i_backward, j_backward), + ).all() + return i_forward, i_backward + + def reverse_time(self, quizzes): + i_forward, i_backward = self.indices_forward_and_backward(quizzes) + + forward_to_backward = torch.cat( + [ + quizzes[:, 0:1], + quizzes[:, 2 + self.prompt_len :], + quizzes[:, 1 + self.prompt_len : 2 + self.prompt_len], + quizzes[:, 1 : 1 + self.prompt_len], + ], + dim=1, + ) + forward_to_backward[:, 0] = self.token_backward + forward_to_backward[:, 1 + self.answer_len] = self.token_backward + + backward_to_forward = torch.cat( + [ + quizzes[:, 0:1], + quizzes[:, 2 + self.answer_len :], + quizzes[:, 1 + self.answer_len : 2 + self.answer_len], + quizzes[:, 1 : 1 + self.answer_len], + ], + dim=1, + ) + + backward_to_forward[:, 0] = self.token_forward + backward_to_forward[:, 1 + self.prompt_len] = self.token_forward + + m = i_forward.long()[:, None] + + return m * forward_to_backward + (1 - m) * backward_to_forward + + def make_ar_mask(self, quizzes, first=False): + i_forward, i_backward = self.indices_forward_and_backward(quizzes) + + t = torch.arange(quizzes.size(1), device=quizzes.device) + + if first: + m_forward = (t >= 1).long() * (t < 1 + self.prompt_len).long() + m_backward = (t >= 1).long() * (t < 1 + self.answer_len).long() + else: + m_forward = (t >= 2 + self.prompt_len).long() + m_backward = (t >= 2 + self.answer_len).long() + + m = i_forward.long()[:, None] + + return m * m_forward + (1 - m) * m_backward def generate_token_sequences(self, nb): prompts, answers = self.problem.generate_prompts_and_answers(nb) + + print(f"{prompts.size()=} {answers.size()=}") + + if self.prompt_len is None: + self.prompt_len = prompts.size(1) + + if self.answer_len is None: + self.answer_len = answers.size(1) + + assert prompts.size(1) == self.prompt_len and answers.size(1) == self.answer_len + result = [] for prompt, answer in zip(prompts, answers): if torch.rand(1) < 0.5: - a = [torch.tensor([self.token_forward]), prompt, answer] + a = [ + torch.tensor([self.token_forward]), + prompt, + torch.tensor([self.token_forward]), + answer, + ] else: - a = [torch.tensor([self.token_backward]), answer, prompt] + a = [ + torch.tensor([self.token_backward]), + answer, + torch.tensor([self.token_backward]), + prompt, + ] result.append(torch.cat(a, dim=0)[None, :]) @@ -144,6 +220,8 @@ class QuizzMachine: self.batch_size = batch_size self.device = device self.logger = logger + self.prompt_len = None + self.answer_len = None self.train_w_quizzes = self.generate_token_sequences(nb_train_samples).to( device @@ -159,19 +237,20 @@ class QuizzMachine: result_dir, "culture_w_quizzes", self.train_w_quizzes[:72] ) + # toto = self.reverse_time(self.train_w_quizzes[:72]) + # self.save_quizzes(result_dir, "toto", toto) + # exit(0) + def save_quizzes(self, result_dir, filename_prefix, quizzes, prediction=False): - l = (quizzes.size(1) - 1) // 2 - forward = (quizzes[:, 0] == self.token_forward).long() - backward = (quizzes[:, 0] == self.token_backward).long() - assert forward.equal(1 - backward) - first = quizzes[:, 1 : 1 + l] - second = quizzes[:, 1 + l : 1 + 2 * l] - prompts = forward[:, None] * first + backward[:, None] * second - answers = forward[:, None] * second + backward[:, None] * first + forward = quizzes[quizzes[:, 0] == self.token_forward] + ib = quizzes[:, 0] == self.token_backward + backward = quizzes[ib] + assert forward.size(0) + backward.size(0) == quizzes.size(0) + quizzes[ib] = self.reverse_time(quizzes[ib]) if prediction: - predicted_prompts = backward - predicted_answers = forward + predicted_prompts = ib + predicted_answers = torch.logical_not(ib) else: predicted_prompts = None predicted_answers = None @@ -179,8 +258,8 @@ class QuizzMachine: self.problem.save_quizzes( result_dir, filename_prefix, - prompts, - answers, + quizzes[:, 1 : 1 + self.prompt_len], + quizzes[:, 2 + self.prompt_len :], predicted_prompts, predicted_answers, ) @@ -248,10 +327,8 @@ class QuizzMachine: device=self.device, ) - nb_total, nb_correct = ( - input.size(0), - (input == result).long().min(dim=1).values.sum(), - ) + nb_total = input.size(0) + nb_correct = (input == result).long().min(dim=1).values.sum() return nb_total, nb_correct @@ -310,17 +387,6 @@ class QuizzMachine: else: self.test_c_quizzes.append(new_c_quizzes) - def reverse_time(self, c_quizzes): - l = (c_quizzes.size(1) - 1) // 2 - direction = c_quizzes[:, 0:1] - direction = self.token_forward * ( - direction == self.token_backward - ) + self.token_backward * (direction == self.token_forward) - - return torch.cat( - [direction, c_quizzes[:, l + 1 :], c_quizzes[:, 1 : l + 1]], dim=1 - ) - def compute_correctness( self, c_quizzes, @@ -328,17 +394,15 @@ class QuizzMachine: bidirectional_validation=False, deterministic_validation=True, ): - reversed_c_quizzes = self.reverse_time(c_quizzes) + if bidirectional_validation: + backward_c_quizzes = self.forward_to_backward(c_quizzes) - ar_mask = self.make_ar_mask(c_quizzes) seq_logproba = torch.zeros( c_quizzes.size(0), max([m.id for m in models_for_validation]) + 1, device=self.device, ) - # Check how many of models can solve the quizzes in both directions - nb_correct = 0 for model in models_for_validation: @@ -346,6 +410,8 @@ class QuizzMachine: seq_logproba[...] = 0.0 + ar_mask = self.make_ar_mask(result) + masked_inplace_autoregression( model=model, batch_size=self.batch_size, @@ -361,25 +427,27 @@ class QuizzMachine: correct = (c_quizzes == result).long().min(dim=-1).values if bidirectional_validation: - reversed_result = reversed_c_quizzes.clone() + backward_result = backward_c_quizzes.clone() + + ar_mask = self.make_ar_mask(backward_result) masked_inplace_autoregression( model=model, batch_size=self.batch_size, - input=reversed_result, + input=backward_result, ar_mask=ar_mask, seq_logproba=seq_logproba[:, model.id], temperature=1.0, deterministic_synthesis=deterministic_validation, - # progress_bar_desc="solving reversed c_quizzes", + # progress_bar_desc="solving backward c_quizzes", device=self.device, ) - reversed_correct = ( - (reversed_c_quizzes == reversed_result).long().min(dim=-1).values + backward_correct = ( + (backward_c_quizzes == backward_result).long().min(dim=-1).values ) - correct *= reversed_correct + correct *= backward_correct # endif @@ -394,23 +462,18 @@ class QuizzMachine: nb, self.train_w_quizzes.size(1), device=self.device, dtype=torch.int64 ) - ar_mask_first = torch.zeros(c_quizzes.size(), device=self.device) - ar_mask_first[:, : ar_mask_first.size(1) // 2 + 1] = 1 - ar_mask_second = 1 - ar_mask_first - ar_mask_first[:, 0] = 0 - ar_mask_second[:, 0] = 0 - - seq_logproba = torch.zeros(ar_mask_first.size(0), device=self.device) + seq_logproba = torch.zeros(nb, device=self.device) # First, we generate the answer at high temperature c_quizzes[:, 0] = self.token_backward + c_quizzes[:, 1 + self.answer_len] = self.token_backward masked_inplace_autoregression( model=model_for_generation, batch_size=self.batch_size, input=c_quizzes, - ar_mask=ar_mask_first, + ar_mask=self.make_ar_mask(c_quizzes, first=True), seq_logproba=seq_logproba, temperature=temperature, deterministic_synthesis=False, @@ -423,7 +486,7 @@ class QuizzMachine: model=model_for_generation, batch_size=self.batch_size, input=c_quizzes, - ar_mask=ar_mask_second, + ar_mask=self.make_ar_mask(c_quizzes), seq_logproba=seq_logproba, temperature=1 / temperature, deterministic_synthesis=False, @@ -439,7 +502,7 @@ class QuizzMachine: model=model_for_generation, batch_size=self.batch_size, input=c_quizzes, - ar_mask=ar_mask_second, + ar_mask=self.make_ar_mask(c_quizzes), seq_logproba=seq_logproba, temperature=1 / temperature, deterministic_synthesis=False,