X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=quizz_machine.py;h=470b095ce38ec23d6a034ee3a338d87b7b1e9b52;hb=08d4ba04f038318080fc2815d85843c4873c896f;hp=28b94d10dbc990430f1a7587b11645da14b36206;hpb=c8979c695ad584c54d605b8f183e5d2e99f2d1cc;p=culture.git diff --git a/quizz_machine.py b/quizz_machine.py index 28b94d1..470b095 100755 --- a/quizz_machine.py +++ b/quizz_machine.py @@ -12,10 +12,48 @@ import torch, torchvision from torch import nn from torch.nn import functional as F +import mygpt from mygpt import BracketedSequence ###################################################################### +# ar_mask is a tensor with 0s and 1s, of same shape as input, with +# 1s where tokens should be generated. The others are kept +# unchanged. + + +def one_batch_masked_inplace_autoregression( + model, + input, + ar_mask, + seq_logproba, + temperature=1.0, + deterministic_synthesis=False, +): + to_generate = (ar_mask.sum(0) > 0).nonzero() + + if to_generate.min() > 0: + model( + BracketedSequence(input, 0, to_generate.min()) + ) # Needed to initialize the model's cache + for s in range(to_generate.min(), to_generate.max() + 1): + output = model(BracketedSequence(input, s, 1)).x + + logits = output[:, s] + + logits = (logits / temperature).log_softmax(dim=-1) + + if deterministic_synthesis: + t_next = logits.argmax(-1) + else: + dist = torch.distributions.categorical.Categorical(logits=logits) + t_next = dist.sample() + + all_n = torch.arange(t_next.size(0)) + seq_logproba += logits[all_n, t_next].sum(dim=-1) + + input[:, s] = ar_mask[:, s] * t_next + (1 - ar_mask[:, s]) * input[:, s] + def masked_inplace_autoregression( model, @@ -27,7 +65,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() @@ -51,14 +89,13 @@ def masked_inplace_autoregression( model.eval() for input, ar_mask, seq_logproba in batches: - model.masked_inplace_autoregression( + one_batch_masked_inplace_autoregression( + model=model, input=input, ar_mask=ar_mask, seq_logproba=seq_logproba, temperature=temperature, deterministic_synthesis=deterministic_synthesis, - forbidden_tokens=forbidden_tokens, - forced_biases=logit_biases, ) model.train(t) @@ -66,42 +103,88 @@ def masked_inplace_autoregression( ###################################################################### -import sky - 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 generate_token_sequences(self, nb): + prompts, answers = self.problem.generate_prompts_and_answers(nb) + result = [] + + for prompt, answer in zip(prompts, answers): + if torch.rand(1) < 0.5: + a = [torch.tensor([self.token_forward]), prompt, answer] + else: + a = [torch.tensor([self.token_backward]), answer, prompt] + + result.append(torch.cat(a, dim=0)[None, :]) + + return torch.cat(result, dim=0) + def __init__( self, + problem, nb_train_samples, nb_test_samples, batch_size, - result_dir=None, - logger=None, + result_dir, + logger, device=torch.device("cpu"), ): super().__init__() - self.problem = sky.Sky(height=6, width=8, nb_birds=3, nb_iterations=2) + v = problem.nb_token_values() + self.token_forward = v + self.token_backward = v + 1 + self.nb_token_values = v + 2 + + self.problem = problem self.batch_size = batch_size self.device = device + self.logger = logger - self.train_w_quizzes = self.problem.generate_seq(nb_train_samples).to(device) - self.test_w_quizzes = self.problem.generate_seq(nb_test_samples).to(device) + self.train_w_quizzes = self.generate_token_sequences(nb_train_samples).to( + device + ) - self.nb_codes = max(self.train_w_quizzes.max(), self.test_w_quizzes.max()) + 1 + self.test_w_quizzes = self.generate_token_sequences(nb_test_samples).to(device) self.train_c_quizzes = [] self.test_c_quizzes = [] if result_dir is not None: - self.problem.save_quizzes( - self.train_w_quizzes[:72], result_dir, f"culture_w_quizzes", logger + self.save_quizzes( + result_dir, "culture_w_quizzes", self.train_w_quizzes[:72] ) + 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 + + if prediction: + predicted_prompts = backward + predicted_answers = forward + else: + predicted_prompts = None + predicted_answers = None + + self.problem.save_quizzes( + result_dir, + filename_prefix, + prompts, + answers, + predicted_prompts, + predicted_answers, + ) + def batches(self, split="train", desc=None): assert split in {"train", "test"} if split == "train": @@ -114,7 +197,7 @@ class QuizzMachine: if len(c_quizzes) > 0: c_quizzes = torch.cat(c_quizzes, dim=0) if c_quizzes.size(0) > w_quizzes.size(0) // 2: - i = torch.randperm(w_quizzes.size(0))[: w_quizzes.size(0) // 2] + i = torch.randperm(c_quizzes.size(0))[: w_quizzes.size(0) // 2] c_quizzes = c_quizzes[i] i = torch.randperm(w_quizzes.size(0))[ @@ -142,12 +225,12 @@ class QuizzMachine: yield batch def vocabulary_size(self): - return self.nb_codes + return self.nb_token_values def produce_results( - self, n_epoch, model, result_dir, logger, deterministic_synthesis, nmax=1000 + self, n_epoch, model, result_dir, deterministic_synthesis, nmax=1000 ): - def compute_accuracy(input, logger=None): + def compute_accuracy(input): input = input[:nmax] ar_mask = self.make_ar_mask(input) result = input.clone() * (1 - ar_mask) @@ -174,18 +257,18 @@ class QuizzMachine: train_nb_total, train_nb_correct = compute_accuracy(self.train_w_quizzes) - logger( + self.logger( f"accuracy_train {n_epoch} nb_total {train_nb_total} nb_correct {train_nb_correct} accuracy {(100.0*train_nb_correct)/train_nb_total:.02f}%" ) - test_nb_total, test_nb_correct = compute_accuracy(self.test_w_quizzes, logger) + test_nb_total, test_nb_correct = compute_accuracy(self.test_w_quizzes) - logger( + self.logger( 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}%" ) main_test_accuracy = test_nb_correct / test_nb_total - logger(f"main_test_accuracy {n_epoch} {main_test_accuracy}") + self.logger(f"main_test_accuracy {n_epoch} {main_test_accuracy}") ############################## @@ -206,11 +289,11 @@ class QuizzMachine: device=self.device, ) - self.problem.save_quizzes( - result[:72], + self.save_quizzes( result_dir, f"culture_prediction_{n_epoch:04d}_{model.id:02d}", - logger, + quizzes=result[:72], + prediction=True, ) return main_test_accuracy @@ -219,7 +302,7 @@ class QuizzMachine: input = self.train_w_quizzes if for_train else self.test_w_quizzes nb = min(nb, input.size(0)) input[:-nb] = input[nb:].clone() - input[-nb:] = self.problem.generate_seq(nb).to(self.device) + input[-nb:] = self.generate_token_sequences(nb).to(self.device) def store_c_quizzes(self, new_c_quizzes, for_train=True): if for_train: @@ -227,125 +310,138 @@ class QuizzMachine: else: self.test_c_quizzes.append(new_c_quizzes) - def create_c_quizzes( - self, - n_epoch, - result_dir, - logger, - nb, - model, - other_models, - min_ave_seq_logproba, + 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, models_for_validation, both_directions=False ): - ############################################################### - # Generate quizzes with model + reversed_c_quizzes = self.reverse_time(c_quizzes) - c_quizzes = torch.empty( - nb, self.train_w_quizzes.size(1), device=self.device, dtype=torch.int64 + 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, ) - ar_mask = torch.full(c_quizzes.size(), 1, device=self.device) - seq_logproba = torch.empty(ar_mask.size(0), device=self.device) + # Check how many of models can solve the quizzes in both directions + + nb_correct = 0 - temperature = 1 - d_temperature = 1 / 3 + for model in models_for_validation: + result = c_quizzes.clone() - while True: - seq_logproba[...] = 0 + seq_logproba[...] = 0.0 masked_inplace_autoregression( model=model, batch_size=self.batch_size, - input=c_quizzes, + input=result, ar_mask=ar_mask, - seq_logproba=seq_logproba, - temperature=temperature, - deterministic_synthesis=False, - progress_bar_desc="sampling c_quizzes", + seq_logproba=seq_logproba[:, model.id], + temperature=1.0, + deterministic_synthesis=True, + # progress_bar_desc="solving c_quizzes", device=self.device, ) - ave_seq_logproba = seq_logproba.mean() + correct = (c_quizzes == result).long().min(dim=-1).values - logger(f"{ave_seq_logproba=} {min_ave_seq_logproba=}") + if both_directions: + reversed_result = reversed_c_quizzes.clone() - if min_ave_seq_logproba is None: - break + masked_inplace_autoregression( + model=model, + batch_size=self.batch_size, + input=reversed_result, + ar_mask=ar_mask, + seq_logproba=seq_logproba[:, model.id], + temperature=1.0, + deterministic_synthesis=True, + # progress_bar_desc="solving reversed c_quizzes", + device=self.device, + ) - # Oh man that's ugly - if ave_seq_logproba < min_ave_seq_logproba * 1.1: - if d_temperature > 0: - d_temperature *= -1 / 3 - temperature += d_temperature - elif ave_seq_logproba > min_ave_seq_logproba: - if d_temperature < 0: - d_temperature *= -1 / 3 - temperature += d_temperature - else: - break + reversed_correct = ( + (reversed_c_quizzes == reversed_result).long().min(dim=-1).values + ) - logger(f"chaging temperature to {temperature}") + correct *= reversed_correct - ############################################################### - # Create the reverse quizzes + # endif - token_forward, token_backward = self.problem.direction_tokens() + nb_correct += correct - l = (c_quizzes.size(1) - 1) // 2 - direction = c_quizzes[:, l : l + 1] - direction = self.problem.token_forward * ( - direction == self.problem.token_backward - ) + self.problem.token_backward * (direction == self.problem.token_forward) - reverse_c_quizzes = torch.cat( - [c_quizzes[:, l + 1 :], direction, c_quizzes[:, :l]], dim=1 + return nb_correct, seq_logproba + + ############################################################### + + def generate_quizzes(self, nb, model_for_generation): + c_quizzes = torch.empty( + nb, self.train_w_quizzes.size(1), device=self.device, dtype=torch.int64 ) - ar_mask = self.make_ar_mask(c_quizzes) - seq_logproba = torch.empty(ar_mask.size(0), device=self.device) + 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 - ############################################################### - # Check how many of the other models can solve them in both - # directions + seq_logproba = torch.zeros(ar_mask_first.size(0), device=self.device) - nb_correct = [] + temperature = 10.0 - for m in other_models: - result = c_quizzes.clone() + # First, we generate the answer at high temperature - masked_inplace_autoregression( - model=m, - 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", - device=self.device, - ) + c_quizzes[:, 0] = self.token_backward - correct = (c_quizzes == result).long().min(dim=-1).values + masked_inplace_autoregression( + model=model_for_generation, + batch_size=self.batch_size, + input=c_quizzes, + ar_mask=ar_mask_first, + seq_logproba=seq_logproba, + temperature=temperature, + deterministic_synthesis=False, + device=self.device, + ) - reverse_result = reverse_c_quizzes.clone() + # Then, we generate the prompt deterministically - masked_inplace_autoregression( - model=m, - 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", - device=self.device, - ) + masked_inplace_autoregression( + model=model_for_generation, + batch_size=self.batch_size, + input=c_quizzes, + ar_mask=ar_mask_second, + seq_logproba=seq_logproba, + temperature=1.0, + deterministic_synthesis=True, + device=self.device, + ) - reverse_correct = ( - (reverse_c_quizzes == reverse_result).long().min(dim=-1).values - ) + # Then we return the quizz, and re-generate the response, now + # deterministically - nb_correct.append((correct * reverse_correct)[None, :]) + c_quizzes = self.reverse_time(c_quizzes) - nb_correct = torch.cat(nb_correct, dim=0).sum(dim=0) + masked_inplace_autoregression( + model=model_for_generation, + batch_size=self.batch_size, + input=c_quizzes, + ar_mask=ar_mask_second, + seq_logproba=seq_logproba, + temperature=temperature, + deterministic_synthesis=True, + device=self.device, + ) - return c_quizzes, nb_correct, seq_logproba.mean() + return c_quizzes