Update.

[picoclvr.git] / tasks.py

diff --git a/tasks.py b/tasks.py
index 56c2b0f..29f1e5a 100755 (executable)
--- a/tasks.py
+++ b/tasks.py
@@ -27,6 +27,7 @@ def masked_inplace_autoregression(
     ar_mask,
     deterministic_synthesis,
     forbidden_tokens=None,
+    logit_biases=None,
     progress_bar_desc="autoregression",
     device=torch.device("cpu"),
 ):
@@ -48,7 +49,11 @@ def masked_inplace_autoregression(
 
         for input, ar_mask in batches:
             model.masked_inplace_autoregression(
-                input, ar_mask, forbidden_tokens, deterministic_synthesis
+                input,
+                ar_mask,
+                deterministic_synthesis,
+                forbidden_tokens,
+                logit_biases,
             )
 
         model.train(t)
@@ -1917,9 +1922,12 @@ class Escape(Task):
         t = torch.arange(result.size(1), device=result.device)[None, :]
 
         state_len = self.height * self.width
+        index_action = state_len
+        index_reward = state_len + 1
+        index_lookahead_reward = state_len + 2
         it_len = state_len + 3  # state / action / reward / lookahead_reward
 
-        def ar(result, ar_mask):
+        def ar(result, ar_mask, logit_biases=None):
             ar_mask = ar_mask.expand_as(result)
             result *= 1 - ar_mask
             masked_inplace_autoregression(
@@ -1927,41 +1935,38 @@ class Escape(Task):
                 self.batch_size,
                 result,
                 ar_mask,
-                deterministic_synthesis,
+                deterministic_synthesis=deterministic_synthesis,
+                logit_biases=logit_biases,
                 device=self.device,
                 progress_bar_desc=None,
             )
 
         # Generate iteration after iteration
 
+        optimistic_bias = result.new_zeros(self.nb_codes, device=result.device)
+        optimistic_bias[escape.lookahead_reward2code(-1)] = -math.log(1e1)
+        optimistic_bias[escape.lookahead_reward2code(1)] = math.log(1e1)
+
         for u in tqdm.tqdm(
             range(it_len, result.size(1) - it_len + 1, it_len), desc="thinking"
         ):
-            # Put the lookahead reward to either 0 or -1 for the
-            # current iteration, sample the next state
-            s = -1  # (torch.rand(result.size(0), device = result.device) < 0.2).long()
-            result[:, u - 1] = s + 1 + escape.first_lookahead_rewards_code
+            # Re-generate the lookahead_reward pessimistically in the
+            # previous iterations
+            ar_mask = (t < u).long() * (t % it_len == index_lookahead_reward).long()
+            ar(result, ar_mask, logit_biases=-optimistic_bias)
+
+            # Generate the state
             ar_mask = (t >= u).long() * (t < u + state_len).long()
             ar(result, ar_mask)
 
-            # Put the lookahead reward to +1 for the current
-            # iteration, sample the action and reward
-            s = 1
-            result[:, u - 1] = s + 1 + escape.first_lookahead_rewards_code
-            ar_mask = (t >= u + state_len).long() * (t < u + state_len + 2).long()
-            ar(result, ar_mask)
+            # Re-generate the lookahead_reward optimistically in the
+            # previous iterations
+            ar_mask = (t < u).long() * (t % it_len == index_lookahead_reward).long()
+            ar(result, ar_mask, logit_biases=optimistic_bias)
 
-            # Fix the previous lookahead rewards in a consistant state
-            for v in range(0, u, it_len):
-                # Extract the rewards
-                r = result[:, range(v + state_len + 1 + it_len, u + it_len - 1, it_len)]
-                r = r - escape.first_rewards_code - 1
-                a = r.min(dim=1).values
-                b = r.max(dim=1).values
-                s = (a < 0).long() * a + (a >= 0).long() * b
-                result[:, v + state_len + 2] = (
-                    s + 1 + escape.first_lookahead_rewards_code
-                )
+            # Generate the action and reward
+            ar_mask = (t >= u + index_action).long() * (t <= u + index_reward).long()
+            ar(result, ar_mask)
 
         # Saving the generated sequences
 
@@ -1980,7 +1985,7 @@ class Escape(Task):
     def produce_results(
         self, n_epoch, model, result_dir, logger, deterministic_synthesis, nmax=1000
     ):
-        result = self.test_input[:100].clone()
+        result = self.test_input[:250].clone()
 
         # Saving the ground truth