X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=world.py;h=36aa1e97638403195c0d711fde941be83ef17a7a;hb=fc1de19bf86b2cfd09264dfc6fbda1937248a40a;hp=68f46de76b1bea49fd25936696a604d000d48600;hpb=908351dd77e8a703fb55b32a209c2fca4f551669;p=culture.git

diff --git a/world.py b/world.py
index 68f46de..36aa1e9 100755
--- a/world.py
+++ b/world.py
@@ -18,26 +18,16 @@ from torch.nn import functional as F
 colors = torch.tensor(
     [
         [255, 255, 255],
-        [255, 20, 147],
-        [0, 0, 255],
+        [255, 0, 0],
         [0, 192, 0],
+        [0, 0, 255],
+        [255, 192, 0],
         [0, 255, 255],
+        [255, 0, 255],
+        [192, 255, 192],
+        [255, 192, 192],
+        [192, 192, 255],
         [192, 192, 192],
-        [106, 90, 205],
-        [255, 0, 0],
-        [220, 20, 60],
-        [65, 105, 225],
-        [255, 200, 0],
-        # [255, 182, 193],
-        # [75, 0, 130],
-        # [128, 0, 128],
-        # [30, 144, 255],
-        # [135, 206, 235],
-        # [0, 255, 0],
-        # [64, 224, 208],
-        # [250, 128, 114],
-        # [255, 165, 0],
-        # [0, 255, 255],
     ]
 )
 
@@ -50,88 +40,97 @@ token_backward = token_forward + 1
 token2char = "_" + "".join([chr(ord("A") + n) for n in range(len(colors) - 1)]) + "><"
 
 
-def generate(
-    nb,
-    height,
-    width,
-    nb_birds=3,
-    nb_iterations=1,
+def generate_seq(
+    nb, height, width, nb_birds=3, nb_iterations=2, return_iterations=False
 ):
     pairs = []
+    kept_iterations = []
 
     for _ in tqdm.tqdm(range(nb), dynamic_ncols=True, desc="world generation"):
-        f_start = torch.zeros(height, width, dtype=torch.int64)
+        while True:
+            iterations = []
 
-        i, j, vi, vj = (
-            torch.empty(nb_birds, dtype=torch.int64),
-            torch.empty(nb_birds, dtype=torch.int64),
-            torch.empty(nb_birds, dtype=torch.int64),
-            torch.empty(nb_birds, dtype=torch.int64),
-        )
-
-        col = torch.randperm(colors.size(0) - 1)[:nb_birds].sort().values + 1
-
-        for n in range(nb_birds):
-            c = col[n]
-
-            while True:
-                i[n], j[n] = (
-                    torch.randint(height, (1,))[0],
-                    torch.randint(width, (1,))[0],
-                )
-                vm = torch.randint(4, (1,))[0]
-                vi[n], vj[n] = (vm % 2) * 2 - 1, (vm // 2) * 2 - 1
-                if (
-                    i[n] - vi[n] >= 0
-                    and i[n] - vi[n] < height
-                    and j[n] - vj[n] >= 0
-                    and j[n] - vj[n] < width
-                    and f_start[i[n], j[n]] == 0
-                    and f_start[i[n] - vi[n], j[n]] == 0
-                    and f_start[i[n], j[n] - vj[n]] == 0
-                ):
-                    break
-
-            f_start[i[n], j[n]] = c
-            f_start[i[n] - vi[n], j[n]] = c
-            f_start[i[n], j[n] - vj[n]] = c
-
-        f_end = f_start.clone()
-
-        for l in range(nb_iterations):
-            for n in range(nb_birds):
-                c = col[n]
-                f_end[i[n], j[n]] = 0
-                f_end[i[n] - vi[n], j[n]] = 0
-                f_end[i[n], j[n] - vj[n]] = 0
+            f_start = torch.zeros(height, width, dtype=torch.int64)
 
-                pi, pj, pvi, pvj = i[n].item(), j[n].item(), vi[n].item(), vj[n].item()
-
-                assert (
-                    f_end[i[n], j[n]] == 0
-                    and f_end[i[n] - vi[n], j[n]] == 0
-                    and f_end[i[n], j[n] - vj[n]] == 0
-                )
-
-                if (i[n] == 0 and vi[n] == -1) or (i[n] == height - 1 and vi[n] == 1):
-                    vi[n] = -vi[n]
-                if (j[n] == 0 and vj[n] == -1) or (j[n] == width - 1 and vj[n] == 1):
-                    vj[n] = -vj[n]
+            i, j, vi, vj = (
+                torch.empty(nb_birds, dtype=torch.int64),
+                torch.empty(nb_birds, dtype=torch.int64),
+                torch.empty(nb_birds, dtype=torch.int64),
+                torch.empty(nb_birds, dtype=torch.int64),
+            )
 
-                i[n] += vi[n]
-                j[n] += vj[n]
+            col = torch.randperm(colors.size(0) - 1)[:nb_birds].sort().values + 1
 
-                if not (
-                    f_end[i[n], j[n]] == 0
-                    and f_end[i[n] - vi[n], j[n]] == 0
-                    and f_end[i[n], j[n] - vj[n]] == 0
-                ):
-                    i[n], j[n], vi[n], vj[n] = pi, pj, pvi, pvj
+            for n in range(nb_birds):
+                c = col[n]
 
-                f_end[i[n], j[n]] = c
-                f_end[i[n] - vi[n], j[n]] = c
-                f_end[i[n], j[n] - vj[n]] = c
+                while True:
+                    i[n], j[n] = (
+                        torch.randint(height, (1,))[0],
+                        torch.randint(width, (1,))[0],
+                    )
+                    vm = torch.randint(4, (1,))[0]
+                    vi[n], vj[n] = (vm % 2) * 2 - 1, (vm // 2) * 2 - 1
+                    if (
+                        i[n] - vi[n] >= 0
+                        and i[n] - vi[n] < height
+                        and j[n] - vj[n] >= 0
+                        and j[n] - vj[n] < width
+                        and f_start[i[n], j[n]] == 0
+                        and f_start[i[n] - vi[n], j[n]] == 0
+                        and f_start[i[n], j[n] - vj[n]] == 0
+                    ):
+                        break
+
+                f_start[i[n], j[n]] = c
+                f_start[i[n] - vi[n], j[n]] = c
+                f_start[i[n], j[n] - vj[n]] = c
+
+            f_end = f_start.clone()
 
+            for l in range(nb_iterations):
+                iterations.append(f_end.clone())
+                f_end[...] = 0
+                nb_collisions = 0
+                for n in range(nb_birds):
+                    c = col[n]
+
+                    pi, pj, pvi, pvj = (
+                        i[n].item(),
+                        j[n].item(),
+                        vi[n].item(),
+                        vj[n].item(),
+                    )
+
+                    if (i[n] == 0 and vi[n] == -1) or (
+                        i[n] == height - 1 and vi[n] == 1
+                    ):
+                        vi[n] = -vi[n]
+                    if (j[n] == 0 and vj[n] == -1) or (
+                        j[n] == width - 1 and vj[n] == 1
+                    ):
+                        vj[n] = -vj[n]
+
+                    i[n] += vi[n]
+                    j[n] += vj[n]
+
+                    if not (
+                        f_end[i[n], j[n]] == 0
+                        and f_end[i[n] - vi[n], j[n]] == 0
+                        and f_end[i[n], j[n] - vj[n]] == 0
+                    ):
+                        nb_collisions += 1
+
+                    f_end[i[n], j[n]] = c
+                    f_end[i[n] - vi[n], j[n]] = c
+                    f_end[i[n], j[n] - vj[n]] = c
+
+            iterations.append(f_end.clone())
+
+            if nb_collisions == 0:
+                break
+
+        kept_iterations.append(iterations)
         pairs.append((f_start, f_end))
 
     result = []
@@ -151,10 +150,17 @@ def generate(
                 )[None, :]
             )
 
-    return torch.cat(result, dim=0)
+    if return_iterations:
+        # iterations = torch.cat([ torch.cat([ x[None, None] for x in l], dim = 1) for l in kept_iterations ], dim=0)
+        return torch.cat(result, dim=0), kept_iterations
+    else:
+        return torch.cat(result, dim=0)
+
+
+######################################################################
 
 
-def generate_(
+def generate_seq_old(
     nb,
     height,
     width,
@@ -220,32 +226,33 @@ def generate_(
     return torch.cat(result, dim=0)
 
 
-def sample2img(seq, height, width, upscale=15):
-    f_first = seq[:, : height * width].reshape(-1, height, width)
-    f_second = seq[:, height * width + 1 :].reshape(-1, height, width)
-    direction = seq[:, height * width]
+def frame2img(x, height, width, upscale=15):
+    x = x.reshape(-1, height, width)
+    m = torch.logical_and(x >= 0, x < first_bird_token + nb_bird_tokens).long()
+    x = colors[x * m].permute(0, 3, 1, 2)
+    s = x.shape
+    x = x[:, :, :, None, :, None].expand(-1, -1, -1, upscale, -1, upscale)
+    x = x.reshape(s[0], s[1], s[2] * upscale, s[3] * upscale)
+
+    x[:, :, :, torch.arange(0, x.size(3), upscale)] = 0
+    x[:, :, torch.arange(0, x.size(2), upscale), :] = 0
+    x = x[:, :, 1:, 1:]
 
-    def mosaic(x, upscale):
-        x = x.reshape(-1, height, width)
-        m = torch.logical_and(x >= 0, x < first_bird_token + nb_bird_tokens).long()
-        x = colors[x * m].permute(0, 3, 1, 2)
-        s = x.shape
-        x = x[:, :, :, None, :, None].expand(-1, -1, -1, upscale, -1, upscale)
-        x = x.reshape(s[0], s[1], s[2] * upscale, s[3] * upscale)
+    for n in range(m.size(0)):
+        for i in range(m.size(1)):
+            for j in range(m.size(2)):
+                if m[n, i, j] == 0:
+                    for k in range(2, upscale - 2):
+                        x[n, :, i * upscale + k, j * upscale + k] = 0
+                        x[n, :, i * upscale + upscale - 1 - k, j * upscale + k] = 0
 
-        x[:, :, :, torch.arange(0, x.size(3), upscale)] = 0
-        x[:, :, torch.arange(0, x.size(2), upscale), :] = 0
-        x = x[:, :, 1:, 1:]
+    return x
 
-        for n in range(m.size(0)):
-            for i in range(m.size(1)):
-                for j in range(m.size(2)):
-                    if m[n, i, j] == 0:
-                        for k in range(2, upscale - 2):
-                            x[n, :, i * upscale + k, j * upscale + k] = 0
-                            x[n, :, i * upscale + upscale - 1 - k, j * upscale + k] = 0
 
-        return x
+def seq2img(seq, height, width, upscale=15):
+    f_first = seq[:, : height * width].reshape(-1, height, width)
+    f_second = seq[:, height * width + 1 :].reshape(-1, height, width)
+    direction = seq[:, height * width]
 
     direction_symbol = torch.full((direction.size(0), height * upscale - 1, upscale), 0)
     direction_symbol = colors[direction_symbol].permute(0, 3, 1, 2)
@@ -279,11 +286,11 @@ def sample2img(seq, height, width, upscale=15):
 
     return torch.cat(
         [
-            mosaic(f_first, upscale),
+            frame2img(f_first, height, width, upscale),
             separator,
             direction_symbol,
             separator,
-            mosaic(f_second, upscale),
+            frame2img(f_second, height, width, upscale),
         ],
         dim=3,
     )
@@ -303,16 +310,28 @@ if __name__ == "__main__":
 
     height, width = 6, 8
     start_time = time.perf_counter()
-    seq = generate(nb=90, height=height, width=width)
+    seq, it = generate_seq(
+        nb=64, height=height, width=width, nb_iterations=100, return_iterations=True
+    )
     delay = time.perf_counter() - start_time
     print(f"{seq.size(0)/delay:02f} samples/s")
 
     print(seq2str(seq[:4]))
 
+    for t in range(len(it[0])):
+        img = torch.cat([frame2img(f[t], height, width) for f in it], dim=0)
+        torchvision.utils.save_image(
+            img.float() / 255.0,
+            f"/tmp/frame_{t:03d}.png",
+            nrow=8,
+            padding=6,
+            pad_value=0,
+        )
+
     # m = (torch.rand(seq.size()) < 0.05).long()
     # seq = (1 - m) * seq + m * 23
 
-    img = sample2img(seq, height, width)
+    img = seq2img(seq, height, width)
     print(img.size())
 
     torchvision.utils.save_image(