Update.

[culture.git] / main.py

diff --git a/main.py b/main.py
index b6f2783..d63398c 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -12,7 +12,15 @@ from torch import nn
 from torch.nn import functional as F
 
 import ffutils
 from torch.nn import functional as F
 
 import ffutils

-import mygpt, tasks
+import mygpt
+import sky, wireworld, quizz_machine
+
+# world quizzes vs. culture quizzes
+
+######################################################################
+
+nb_new_c_quizzes_for_train = 1000
+nb_new_c_quizzes_for_test = 100

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


@@ -29,7 +37,7 @@ parser = argparse.ArgumentParser(
     formatter_class=argparse.ArgumentDefaultsHelpFormatter,
 )
 
     formatter_class=argparse.ArgumentDefaultsHelpFormatter,
 )
 

-parser.add_argument("--log_filename", type=str, default="train.log", help=" ")
+parser.add_argument("--log_filename", type=str, default="train.log")

 
 parser.add_argument("--result_dir", type=str, default=None)
 
 
 parser.add_argument("--result_dir", type=str, default=None)
 


@@ -49,7 +57,7 @@ parser.add_argument("--nb_train_samples", type=int, default=None)
 
 parser.add_argument("--nb_test_samples", type=int, default=None)
 
 
 parser.add_argument("--nb_test_samples", type=int, default=None)
 

-parser.add_argument("--learning_rate", type=float, default=1e-4)
+parser.add_argument("--learning_rate", type=float, default=1e-3)

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


@@ -71,9 +79,29 @@ 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("--both_directions", action="store_true", default=False)
+
+parser.add_argument("--problem", type=str, default="sky")
+

 parser.add_argument("--nb_gpts", type=int, default=5)
 
 parser.add_argument("--nb_gpts", type=int, default=5)
 

-parser.add_argument("--check", action="store_true", default=False)
+parser.add_argument("--min_to_validate", type=int, default=4)
+
+parser.add_argument("--max_to_validate", type=int, default=4)
+
+parser.add_argument("--accuracy_to_make_c_quizzes", type=float, default=0.975)
+
+parser.add_argument("--dirty_debug", action="store_true", default=False)
+
+parser.add_argument("--sky_height", type=int, default=6)
+
+parser.add_argument("--sky_width", type=int, default=8)
+
+parser.add_argument("--sky_nb_birds", type=int, default=3)
+
+parser.add_argument("--sky_nb_iterations", type=int, default=2)
+
+parser.add_argument("--sky_speed", type=int, default=3)

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


@@ -84,10 +112,17 @@ if args.result_dir is None:
 
 ######################################################################
 
 
 ######################################################################
 

+if args.dirty_debug:
+    args.accuracy_to_make_c_quizzes = 0.0
+    nb_new_c_quizzes_for_train = 100
+    nb_new_c_quizzes_for_test = 10
+
+######################################################################
+

 default_args = {
     "model": "37M",
     "batch_size": 100,
 default_args = {
     "model": "37M",
     "batch_size": 100,

-    "nb_train_samples": 250000,
+    "nb_train_samples": 100000,

     "nb_test_samples": 10000,
 }
 
     "nb_test_samples": 10000,
 }
 


@@ -182,8 +217,8 @@ for n in vars(args):
 
 ######################################################################
 
 
 ######################################################################
 

-if args.check:
-    args.nb_train_samples = 500
+if args.dirty_debug:
+    args.nb_train_samples = 2500

     args.nb_test_samples = 100
 
 if args.physical_batch_size is None:
     args.nb_test_samples = 100
 
 if args.physical_batch_size is None:


@@ -194,7 +229,21 @@ else:
 assert args.nb_train_samples % args.batch_size == 0
 assert args.nb_test_samples % args.batch_size == 0
 
 assert args.nb_train_samples % args.batch_size == 0
 assert args.nb_test_samples % args.batch_size == 0
 

-task = tasks.World(
+if args.problem == "sky":
+    problem = sky.Sky(
+        height=args.sky_height,
+        width=args.sky_width,
+        nb_birds=args.sky_nb_birds,
+        nb_iterations=args.sky_nb_iterations,
+        speed=args.sky_speed,
+    )
+elif args.problem == "wireworld":
+    problem = wireworld.Wireworld(height=8, width=10, nb_iterations=2, speed=5)
+else:
+    raise ValueError
+
+quizz_machine = quizz_machine.QuizzMachine(
+    problem=problem,

     nb_train_samples=args.nb_train_samples,
     nb_test_samples=args.nb_test_samples,
     batch_size=args.physical_batch_size,
     nb_train_samples=args.nb_train_samples,
     nb_test_samples=args.nb_test_samples,
     batch_size=args.physical_batch_size,


@@ -207,7 +256,7 @@ task = tasks.World(
 
 log_string(f"device {device}")
 
 
 log_string(f"device {device}")
 

-vocabulary_size = task.vocabulary_size()
+vocabulary_size = quizz_machine.vocabulary_size()

 
 log_string(f"vocabulary_size {vocabulary_size}")
 
 
 log_string(f"vocabulary_size {vocabulary_size}")
 


@@ -216,8 +265,10 @@ log_string(f"vocabulary_size {vocabulary_size}")
 # Compute the entropy of the training tokens
 
 token_count = 0
 # Compute the entropy of the training tokens
 
 token_count = 0

-for input in task.batches(split="train", desc="train-entropy"):
-    token_count += F.one_hot(input, num_classes=task.vocabulary_size()).sum((0, 1))
+for input in quizz_machine.batches(split="train", desc="train-entropy"):
+    token_count += F.one_hot(input, num_classes=quizz_machine.vocabulary_size()).sum(
+        (0, 1)
+    )

 token_probas = token_count / token_count.sum()
 entropy = -torch.xlogy(token_probas, token_probas).sum()
 train_set_perplexity = math.exp(entropy)
 token_probas = token_count / token_count.sum()
 entropy = -torch.xlogy(token_probas, token_probas).sum()
 train_set_perplexity = math.exp(entropy)


@@ -239,11 +290,11 @@ if args.max_percents_of_test_in_train >= 0:
 
     nb_test, nb_in_train = 0, 0
     for test_subset in subsets_as_tuples(
 
     nb_test, nb_in_train = 0, 0
     for test_subset in subsets_as_tuples(

-        task.batches(split="test", desc="test-check"), 25000
+        quizz_machine.batches(split="test", desc="test-check"), 25000

     ):
         in_train = set()
         for train_subset in subsets_as_tuples(
     ):
         in_train = set()
         for train_subset in subsets_as_tuples(

-            task.batches(split="train", desc="train-check"), 25000
+            quizz_machine.batches(split="train", desc="train-check"), 25000

         ):
             in_train.update(test_subset.intersection(train_subset))
         nb_in_train += len(in_train)
         ):
             in_train.update(test_subset.intersection(train_subset))
         nb_in_train += len(in_train)


@@ -260,14 +311,14 @@ if args.max_percents_of_test_in_train >= 0:
 ##############################
 
 
 ##############################
 
 

-def one_epoch(model, task):
+def one_epoch(model, quizz_machine):

     optimizer = torch.optim.Adam(model.parameters(), lr=args.learning_rate)
 
     model.train()
 
     nb_train_samples, acc_train_loss = 0, 0.0
 
     optimizer = torch.optim.Adam(model.parameters(), lr=args.learning_rate)
 
     model.train()
 
     nb_train_samples, acc_train_loss = 0, 0.0
 

-    for input in task.batches(split="train"):
+    for input in quizz_machine.batches(split="train"):

         input = input.to(device)
 
         if nb_train_samples % args.batch_size == 0:
         input = input.to(device)
 
         if nb_train_samples % args.batch_size == 0:


@@ -292,14 +343,14 @@ def one_epoch(model, task):
 ######################################################################
 
 
 ######################################################################
 
 

-def run_tests(model, task, deterministic_synthesis):
+def run_tests(model, quizz_machine, deterministic_synthesis):

     with torch.autograd.no_grad():
         model.eval()
 
         nb_test_samples, acc_test_loss = 0, 0.0
         nb_samples_accumulated = 0
 
     with torch.autograd.no_grad():
         model.eval()
 
         nb_test_samples, acc_test_loss = 0, 0.0
         nb_samples_accumulated = 0
 

-        for input in task.batches(split="test"):
+        for input in quizz_machine.batches(split="test"):

             input = input.to(device)
 
             bs = model(mygpt.BracketedSequence(input))
             input = input.to(device)
 
             bs = model(mygpt.BracketedSequence(input))


@@ -311,11 +362,10 @@ def run_tests(model, task, deterministic_synthesis):
 
             nb_test_samples += input.size(0)
 
 
             nb_test_samples += input.size(0)
 

-        main_test_accuracy = task.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,

-            logger=log_string,

             deterministic_synthesis=deterministic_synthesis,
         )
 
             deterministic_synthesis=deterministic_synthesis,
         )
 


@@ -323,48 +373,85 @@ def run_tests(model, task, 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
+
+######################################################################
+
+
+def valid_c_quizzes(recorded, criteria):
+    result = [q[criteria(c)] for q, c in recorded]
+    return torch.cat(result, dim=0) if len(result) > 0 else torch.tensor([])

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

-def create_quizzes(
-    model,
-    other_models,
-    task,
+def create_c_quizzes(
+    models,
+    quizz_machine,

     nb_for_train=1000,
     nb_for_test=100,
 ):
     nb_for_train=1000,
     nb_for_test=100,
 ):

-    kept = []
+    recorded = []

 
 

-    while sum([x.size(0) for x in kept]) < nb_for_train + nb_for_test:
-        new_quizzes, nb_correct = task.create_new_quizzes(
-            n_epoch=n_epoch,
-            result_dir=args.result_dir,
-            logger=log_string,
-            nb=4 * (nb_for_train + nb_for_test),
-            model=model,
-            other_models=other_models,
+    nb_to_create = nb_for_train + nb_for_test
+
+    # ------------------------------------------------------------
+
+    standard_validity = lambda nb_correct: torch.logical_and(
+        nb_correct >= args.min_to_validate, nb_correct <= args.max_to_validate
+    )
+
+    while valid_c_quizzes(recorded, standard_validity).size(0) < nb_to_create:
+        model_for_generation = models[torch.randint(len(models), (1,))]
+
+        c_quizzes, ave_seq_logproba = quizz_machine.generate_quizzes(
+            nb_to_create,
+            model_for_generation=model_for_generation,

         )
 
         )
 

-        print(nb_correct)
+        nb_correct = quizz_machine.compute_correctness(
+            c_quizzes, models, both_directions=args.both_directions
+        )

 
 

-        to_keep = new_quizzes[nb_correct == len(other_models) - 1]
-        log_string(f"keep {to_keep.size(0)} quizzes")
-        kept.append(to_keep)
+        if args.dirty_debug:
+            nb_correct = torch.randint(
+                len(models) + 1, nb_correct.size(), device=c_quizzes.device
+            )

 
 

-    new_quizzes = torch.cat(kept, dim=0)[: nb_for_train + nb_for_test]
+        recorded.append((c_quizzes, nb_correct))

 
 

-    task.store_new_quizzes(new_quizzes[:nb_for_train], for_train=True)
-    task.store_new_quizzes(new_quizzes[nb_for_train:], for_train=False)
+        nv = F.one_hot(nb_correct, num_classes=len(models) + 1).sum(0)
+        nv = " ".join([str(x.item()) for x in nv])

 
 

-    task.save_image(
-        new_quizzes[:72],
-        args.result_dir,
-        f"world_quiz_{n_epoch:04d}_{model.id:02d}.png",
-        log_string,
-    )
+        nb_validated = valid_c_quizzes(recorded, standard_validity).size(0)
+
+        log_string(
+            f"keep c_quizzes model {model_for_generation.id} kept {nv} nb_accumulated {nb_validated} / {nb_to_create}"
+        )
+
+    # store the new c_quizzes which have been validated
+
+    new_c_quizzes = valid_c_quizzes(recorded, standard_validity)
+
+    quizz_machine.store_c_quizzes(new_c_quizzes[:nb_for_train], for_train=True)
+    quizz_machine.store_c_quizzes(new_c_quizzes[nb_for_train:], for_train=False)
+
+    # save a bunch of images to investigate what quizzes with a
+    # certain nb of correct predictions look like
+
+    for n in range(len(models) + 1):
+        s = (
+            "_validated"
+            if n >= args.min_to_validate and n <= args.max_to_validate
+            else ""
+        )
+
+        q = valid_c_quizzes(recorded, criteria=lambda nb_correct: nb_correct == n)[:72]
+
+        if q.size(0) > 0:
+            quizz_machine.save_quizzes(
+                args.result_dir, f"culture_c_quiz_{n_epoch:04d}_N{n}{s}", q
+            )

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


@@ -394,53 +481,49 @@ log_string(f"nb_parameters {nb_parameters} ({int(nb_parameters/1e6)}M)")
 
 ######################################################################
 
 
 ######################################################################
 

-accuracy_to_make_quizzes = 0.975
-nb_new_quizzes_for_train = 1000
-nb_new_quizzes_for_test = 100
+for n_epoch in range(args.nb_epochs):
+    log_string(f"--- epoch {n_epoch} ----------------------------------------")

 
 

-if args.check:
-    accuracy_to_make_quizzes = 0.0
-    nb_new_quizzes_for_train = 10
-    nb_new_quizzes_for_test = 10
+    # Select, improve, and eval the worst model

 
 

-for n_epoch in range(args.nb_epochs):
-    a = [(model.id, model.main_test_accuracy.item()) for model in models]
-    a.sort(key=lambda p: p[0])
-    log_string(f"current accuracies {a}")
+    weakest_model = min(models, key=lambda m: float(m.main_test_accuracy))
+
+    log_string(
+        f"training model {weakest_model.id} main_test_accuracy {weakest_model.main_test_accuracy}"
+    )

 
 

-    # select the model with lowest accuracy
-    models.sort(key=lambda model: model.main_test_accuracy)
-    model = models[0]
+    one_epoch(weakest_model, quizz_machine)

 
     log_string(
 
     log_string(

-        f"training model {model.id} main_test_accuracy {model.main_test_accuracy}"
+        f"train_set_composition w_quizzes {quizz_machine.nb_batch_w_quizzes} c_quizzes {quizz_machine.nb_batch_c_quizzes}"

     )
 
     )
 

-    # improve it
-    one_epoch(model, task)
+    run_tests(weakest_model, quizz_machine, deterministic_synthesis=False)

 
     log_string(
 
     log_string(

-        f"train_set_composition world {task.nb_batch_samples_world} quizzes {task.nb_batch_samples_quizzes}"
+        f"test_set_composition w_quizzes {quizz_machine.nb_batch_w_quizzes} c_quizzes {quizz_machine.nb_batch_c_quizzes}"

     )
 
     )
 

-    # test it
-    run_tests(model, task, deterministic_synthesis=False)
+    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 fresh ones
+
+    quizz_machine.renew_w_quizzes(args.nb_train_samples // args.nb_gpts)

 
 

-    if model.main_test_accuracy >= accuracy_to_make_quizzes:
-        other_models = models.copy()
-        other_models.remove(model)
+    # If all the models are good enough, generate new quizzes and
+    # re-compute the test errors

 
 

-        create_quizzes(
-            model,
-            other_models,
-            task,
-            nb_for_train=nb_new_quizzes_for_train,
-            nb_for_test=nb_new_quizzes_for_test,
+    if min([m.main_test_accuracy for m in models]) >= args.accuracy_to_make_c_quizzes:
+        create_c_quizzes(
+            models,
+            quizz_machine,
+            nb_for_train=nb_new_c_quizzes_for_train,
+            nb_for_test=nb_new_c_quizzes_for_test,

         )
 
         )
 

-        # We update everyone

         for model in models:
         for model in models:

-            run_tests(model, task, deterministic_synthesis=False)
+            run_tests(model, quizz_machine, deterministic_synthesis=False)

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