Update.

[culture.git] / main.py

diff --git a/main.py b/main.py
index 5956be5..fc55b9c 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -18,6 +18,8 @@ import sky, grids, quiz_machine
 
 import threading
 
+import torch.multiprocessing as mp
+
 # world quizzes vs. culture quizzes
 
 ######################################################################
@@ -88,7 +90,7 @@ parser.add_argument("--min_to_validate", type=int, default=None)
 
 parser.add_argument("--max_to_validate", type=int, default=None)
 
-parser.add_argument("--accuracy_to_make_c_quizzes", type=float, default=0.9)
+parser.add_argument("--accuracy_to_make_c_quizzes", type=float, default=0.975)
 
 parser.add_argument("--generation_temperature", type=float, default=2.0)
 
@@ -96,6 +98,19 @@ parser.add_argument("--dirty_debug", action="store_true", default=False)
 
 ######################################################################
 
+grids_tasks = ", ".join(
+    [x.__name__.removeprefix("task_") for x in grids.Grids().all_tasks]
+)
+
+parser.add_argument(
+    "--grids_tasks",
+    type=str,
+    default=None,
+    help="A comma-separated subset of: " + grids_tasks + ", or None for all.",
+)
+
+######################################################################
+
 parser.add_argument("--sky_height", type=int, default=6)
 
 parser.add_argument("--sky_width", type=int, default=8)
@@ -248,6 +263,7 @@ elif args.problem == "grids":
         max_nb_cached_chunks=args.nb_gpus * args.nb_train_samples // 100,
         chunk_size=100,
         nb_threads=args.nb_threads,
+        tasks=args.grids_tasks,
     )
     back_accuracy = True
 else:
@@ -343,12 +359,10 @@ def one_epoch(model, quiz_machine, local_device=None):
 
     train_perplexity = math.exp(min(100, acc_train_loss / nb_train_samples))
 
-    log_string(f"train_perplexity {n_epoch} {train_perplexity}")
+    log_string(f"train_perplexity {n_epoch} model.id {model.id} {train_perplexity}")
 
     run_tests(model, quiz_machine, deterministic_synthesis=False)
 
-    model.TRAINING_LOCK.release()
-
 
 ######################################################################
 
@@ -356,9 +370,6 @@ def one_epoch(model, quiz_machine, local_device=None):
 def standard_validity(logproba):
     l = logproba.sort(dim=-1).values
     return (l[:, 0] < math.log(0.5)) & (l[:, 1] > math.log(0.99))
-    # warnings.warn("TEST!!!", RuntimeWarning)
-    # print(l.exp())
-    # return (l[:, 0] < math.log(0.99))
 
 
 def valid_c_quizzes(recorded, criteria):
@@ -452,15 +463,10 @@ for k in range(args.nb_gpts):
 
     model.main_test_accuracy = 0.0
     model.id = k
-    model.TRAINING_LOCK = threading.Lock()
 
-    model.train_w_quizzes = quiz_machine.generate_token_sequences(
-        args.nb_train_samples
-    ).to(device)
+    model.train_w_quizzes = quiz_machine.generate_token_sequences(args.nb_train_samples)
     quiz_machine.reverse_random_half_in_place(model.train_w_quizzes)
-    model.test_w_quizzes = quiz_machine.generate_token_sequences(
-        args.nb_test_samples
-    ).to(device)
+    model.test_w_quizzes = quiz_machine.generate_token_sequences(args.nb_test_samples)
     quiz_machine.reverse_random_half_in_place(model.test_w_quizzes)
 
     models.append(model)
@@ -536,7 +542,7 @@ if args.dirty_debug:
 
     def standard_validity(logproba):
         l = logproba.sort(dim=-1).values
-        return l[:, 0] < math.log(0.99)
+        return l[:, 0] < math.log(0.5)
 
 
 ######################################################################
@@ -548,34 +554,37 @@ for n_epoch in range(args.nb_epochs):
     log_string(f"current_test_accuracies {cta}")
 
     ##################################################
-    # Select, improve, and eval the worst models
+    # Select, improve, and eval the worst model
 
     ranked_models = sorted(models, key=lambda m: float(m.main_test_accuracy))
 
     weakest_models = ranked_models[: args.nb_gpus]
 
+    threads = []
+
     for gpu_id, model in enumerate(weakest_models):
-        model.TRAINING_LOCK.acquire()
+        log_string(f"training model {model.id}")
 
-        log_string(
-            f"training model {model.id} main_test_accuracy {model.main_test_accuracy}"
+        t = threading.Thread(
+            target=one_epoch, daemon=True, args=(model, quiz_machine, f"cuda:{gpu_id}")
         )
 
-        threading.Thread(
-            target=one_epoch, daemon=True, args=(model, quiz_machine, f"cuda:{gpu_id}")
-        ).start()
+        threads.append(t)
 
-    for model in weakest_models:
-        model.TRAINING_LOCK.acquire()
-        model.TRAINING_LOCK.release()
+        t.start()
+
+    for t in threads:
+        t.join()
 
     ##################################################
-    # Renew the train sets
+    # Replace a fraction of the w_quizzes with fresh ones
 
     log_string(
         f"cache_w_quizzes contains {quiz_machine.problem.nb_cached_quizzes()} quizzes"
     )
 
+    # Renew entirely the train set
+
     for model in weakest_models:
         quiz_machine.renew_w_quizzes(model, args.nb_train_samples)