X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=mygpt.py;h=ab4ccbc1b2168c27419e5810d07bd55d2c48665b;hb=1fb7ff66e07f267511f0f2592509a3f3212fc8f0;hp=0cf70e0f674317b0c5c4884d248eb55a18ef6232;hpb=8492656cf0cc5de4f7e2c4aa8ccb717193293b40;p=culture.git

diff --git a/mygpt.py b/mygpt.py
index 0cf70e0..ab4ccbc 100755
--- a/mygpt.py
+++ b/mygpt.py
@@ -264,6 +264,7 @@ class MyGPT(nn.Module):
                     m.weight.fill_(1.0)
 
     def forward(self, bs):
+        # print(f"GENERATE {bs.first} {bs.first+bs.nb}")
         bs = BracketedSequence(F.pad(bs.x, (1, -1)), bs.first, bs.nb)
         bs = self.embedding(bs)
         bs = self.trunk(bs)
@@ -275,23 +276,44 @@ class MyGPT(nn.Module):
     # unchanged.
 
     def masked_inplace_autoregression(
-        self, input, ar_mask, forbidden_tokens=None, deterministic_synthesis=False
+        self,
+        input,
+        ar_mask,
+        summed_logits,
+        temperature=1.0,
+        deterministic_synthesis=False,
+        forbidden_tokens=None,
+        forced_biases=None,
     ):
         to_generate = (ar_mask.sum(0) > 0).nonzero()
+
         if to_generate.min() > 0:
             self(
                 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 = self(BracketedSequence(input, s, 1)).x
+
             logits = output[:, s]
+
+            logits = (logits / temperature).log_softmax(dim=-1)
+
             if forbidden_tokens is not None:
                 logits = logits.masked_fill(forbidden_tokens, float("-inf"))
+
+            if forced_biases is not None:
+                logits = logits + forced_biases[None, :]
+
             if deterministic_synthesis:
-                t_next = logits.argmax(1)
+                t_next = logits.argmax(-1)
             else:
                 dist = torch.distributions.categorical.Categorical(logits=logits)
                 t_next = dist.sample()
+                if summed_logits is not None:
+                    summed_logits += logits[torch.arange(t_next.size(0)), t_next].sum(
+                        dim=-1
+                    )
+
             input[:, s] = ar_mask[:, s] * t_next + (1 - ar_mask[:, s]) * input[:, s]
 
     def record_attention(self, v=True):