From 6ca2c05c7470e92cd591fe1b8de33c80c1b27180 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Fleuret?= <francois@fleuret.org>
Date: Fri, 26 Jan 2024 16:29:01 +0100
Subject: [PATCH] Update.

---
 maxval.py | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mygpt.py  |   8 ++---
 2 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100755 maxval.py

diff --git a/maxval.py b/maxval.py
new file mode 100755
index 0000000..747f4b9
--- /dev/null
+++ b/maxval.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+
+import torch
+
+######################################################################
+
+
+def baseline(X, V):
+    Y = X.new(X.size())
+    W = V.new(V.size())
+    for t in range(X.size(1)):
+        if t == 0:
+            Y[:, t] = X[:, t]
+            W[:, t] = V[:, t]
+        else:
+            m = (V[:, t] >= W[:, t - 1] - 1).long()
+            Y[:, t] = m * X[:, t] + (1 - m) * Y[:, t - 1]
+            W[:, t] = m * V[:, t] + (1 - m) * (W[:, t - 1] - 1)
+
+    return Y, W
+
+
+######################################################################
+
+
+def pscan(X, V, s=1):
+    if X.size(1) == 1:
+        return X, V
+
+    T = 2 * (X.size(1) // 2)
+
+    Xf = X[:, :T].view(X.size(0), X.size(1) // 2, 2, X.size(2))
+    Vf = V[:, :T].view(V.size(0), V.size(1) // 2, 2)
+
+    m = (Vf[:, :, 0] - s >= Vf[:, :, 1]).long()
+    Vf[:, :, 1] = m * (Vf[:, :, 0] - s) + (1 - m) * Vf[:, :, 1]
+    m = m[:, :, None]
+    Xf[:, :, 1] = m * Xf[:, :, 0] + (1 - m) * Xf[:, :, 1]
+
+    pscan(Xf[:, :, 1], Vf[:, :, 1], s * 2)
+
+    m = (Vf[:, 1:, 0] >= Vf[:, :-1, 1] - s).long()
+    Vf[:, 1:, 0] = m * Vf[:, 1:, 0] + (1 - m) * (Vf[:, :-1, 1] - s)
+    m = m[:, :, None]
+    Xf[:, 1:, 0] = m * Xf[:, 1:, 0] + (1 - m) * Xf[:, :-1, 1]
+
+    if T < X.size(1):
+        m = (V[:, -2] - s >= V[:, -1]).long()
+        V[:, -1] = m * (V[:, -2] - s) + (1 - m) * V[:, -1]
+        m = m[:, None]
+        X[:, -1] = m * X[:, -2] + (1 - m) * X[:, -1]
+
+
+######################################################################
+
+if __name__ == "__main__":
+    N = 1
+    T = 513
+    D = 2
+
+    # X = torch.randn(N, T, D, dtype=torch.float64).requires_grad_()
+    # V = torch.rand(N, T, dtype=torch.float64) * 50
+
+    # X0, V0 = baseline(X, V)
+
+    # print("########### X0 V0 ###########################################")
+    # print(V0)
+    # print(X0)
+
+    # X1, V1 = X.clone(), V.clone()
+    # pscan(X1, V1)
+
+    # print("########### X V ############################################")
+    # print(V)
+    # print(X)
+
+    # print("ERROR", ((X0 - X1).abs().max() + (V0 - V1).abs().max()).item())
+
+    # s = X1.sum()
+    # print(torch.autograd.grad(s, X))
+
+    # with open("/tmp/v.dat", "w") as f:
+    # for t in range(T):
+    # f.write(f"{V1[0,t].item()}\n")
+
+    Y = torch.randn(1, 1, D)
+    X = torch.randn(
+        N, T, D
+    )  # * 0.1 + (torch.rand(N,T,1).sort(dim=1).indices==0).float() * Y
+    V = torch.rand(N, T).requires_grad_()
+
+    optimizer = torch.optim.SGD([V], lr=1e-2)
+
+    for k in range(1000):
+        X1, V1 = X.clone(), V.clone()
+        pscan(X1, V1)
+        # X1=X1*(1+V1-V1.detach())[:,:,None]
+        loss = (X1[:, -1:] - Y).pow(2).mean()
+        print(k, loss.item())
+        optimizer.zero_grad()
+        loss.backward()
+        optimizer.step()
diff --git a/mygpt.py b/mygpt.py
index 9a02bcd..67c5cfd 100755
--- a/mygpt.py
+++ b/mygpt.py
@@ -21,7 +21,7 @@ from torch.nn import functional as F
 
 import ffutils
 
-from blanket import blanket
+# from blanket import blanket
 
 # import memload
 
@@ -569,7 +569,7 @@ class Caterpillar(nn.Module):
         V = torch.einsum("ntc,hdc->nhtd", X, self.w_V)
         K = torch.einsum("ntc,hdc->nhtd", X, self.w_K)
 
-        V, K = blanket(V), blanket(K)
+        # V, K = blanket(V), blanket(K)
 
         ######################################################################
         # Compute the recurrent state
@@ -673,7 +673,7 @@ class Caterpillar(nn.Module):
 
         Q = torch.einsum("ntc,hdc->nhtd", X, self.w_Q)
 
-        Q = blanket(Q)
+        # Q = blanket(Q)
 
         # We build tensors NxHxTxRxL where N is the sample index, H
         # the head, T the time, R the row in the caterpillar, and L
@@ -712,7 +712,7 @@ class Caterpillar(nn.Module):
 
         # Compute the final output
 
-        Y = blanket(Y)
+        # Y = blanket(Y)
 
         self.cache_Y[:, t0:t1] = Y @ self.w_O
 
-- 
2.20.1