X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=picoclvr.py;h=bd0470f6279b7bdf5bf1c715eb848e4751fc5810;hb=8f806c62be589d2837f88ffca084ed2ae833124c;hp=cc937af2a10ca89cfb4328c604e790c6866252a6;hpb=bd9e5951a5741f7e3e44fc03379795eff83242d6;p=picoclvr.git
diff --git a/picoclvr.py b/picoclvr.py
index cc937af..bd0470f 100755
--- a/picoclvr.py
+++ b/picoclvr.py
@@ -241,15 +241,9 @@ def generate(
# Extracts the image after in descr as a 1x3xHxW tensor
-def descr2img(descr, n, height, width):
+def descr2img(descr, height, width):
- if type(descr) == list:
- return torch.cat([descr2img(d, n, height, width) for d in descr], 0)
-
- if type(n) == list:
- return torch.cat([descr2img(descr, k, height, width) for k in n], 0).unsqueeze(
- 0
- )
+ result = []
def token2color(t):
try:
@@ -257,15 +251,15 @@ def descr2img(descr, n, height, width):
except KeyError:
return [128, 128, 128]
- d = descr.split("")
- d = d[n + 1] if len(d) > n + 1 else ""
- d = d.strip().split(" ")[: height * width]
- d = d + [""] * (height * width - len(d))
- d = [token2color(t) for t in d]
- img = torch.tensor(d).permute(1, 0)
- img = img.reshape(1, 3, height, width)
+ for d in descr:
+ d = d.split("")[1]
+ d = d.strip().split(" ")[: height * width]
+ d = d + [""] * (height * width - len(d))
+ d = [token2color(t) for t in d]
+ img = torch.tensor(d).permute(1, 0).reshape(1, 3, height, width)
+ result.append(img)
- return img
+ return torch.cat(result, 0)
######################################################################
@@ -353,7 +347,7 @@ if __name__ == "__main__":
for d in descr:
f.write(f"{d}\n\n")
- img = descr2img(descr, n=0, height=12, width=16)
+ img = descr2img(descr, height=12, width=16)
if img.size(0) == 1:
img = F.pad(img, (1, 1, 1, 1), value=64)