Update app.py

app.py

@@ -13,7 +13,6 @@ from torch.nn import functional as F
 from torchvision import transforms
 from torchvision.transforms import functional as TF
 from tqdm import trange
-from CLIP import clip
 from cloob_training import model_pt, pretrained
 import ldm.models.autoencoder
 from diffusion import sampling, utils
@@ -115,8 +114,8 @@ def generate(n=1, prompts=['a red circle'], images=[], seed=42, steps=15, method
         n_conds = len(target_embeds)
         x_in = x.repeat([n_conds, 1, 1, 1])
         t_in = t.repeat([n_conds])
-        clip_embed_in = torch.cat([*target_embeds]).repeat_interleave(n, 0)
-        vs = model(x_in, t_in, clip_embed_in).view([n_conds, n, *x.shape[1:]])
+        embed_in = torch.cat([*target_embeds]).repeat_interleave(n, 0)
+        vs = model(x_in, t_in, embed_in).view([n_conds, n, *x.shape[1:]])
         v = vs.mul(weights[:, None, None, None, None]).sum(0)
         return v
 
@@ -192,32 +191,31 @@ iface = gr.Interface(
     ["self-portrait"],
     ["Impressionism, oil on canvas"],
     ["Katsushika Hokusai, The Dragon of Smoke Escaping from Mount Fuji"],
-  ["Moon Light Sonata by Basuki Abdullah"],
-  ["Twon Tree by M.C. Escher"],
-  ["Futurism, in the style of Wassily Kandinsky"], 
-  ["Surrealism, in the style of Edgar Degas"], 
-  ["Expressionism, in the style of Wassily Kandinsky"], 
-  ["Futurism, in the style of Egon Schiele"], 
-  ["Cubism, in the style of Gustav Klimt"], 
-  ["Op Art, in the style of Marc Chagall"], 
-  ["Romanticism, in the style of M.C. Escher"], 
-  ["Futurism, in the style of M.C. Escher"], 
-  ["Mannerism, in the style of Paul Klee"], 
-  ["High Renaissance, in the style of Rembrandt"], 
-  ["Magic Realism, in the style of Gustave Dore"], 
-  ["Realism, in the style of Jean-Michel Basquiat"], 
-  ["Art Nouveau, in the style of Paul Gauguin"], 
-  ["Avant-garde, in the style of Pierre-Auguste Renoir"], 
-  ["Baroque, in the style of Edward Hopper"], 
-  ["Post-Impressionism, in the style of Wassily Kandinsky"], 
-  ["Naturalism, in the style of Rene Magritte"], 
-  ["Constructivism, in the style of Paul Cezanne"], 
-  ["Abstract Expressionism, in the style of Henri Matisse"], 
-  ["Pop Art, in the style of Vincent van Gogh"], 
-  ["Futurism, in the style of Wassily Kandinsky"], 
-  ["Futurism, in the style of Zdzislaw Beksinski"], 
-  ["Aaron Wacker, oil on canvas"],
-  ],
+    ["Moon Light Sonata by Basuki Abdullah"],
+    ["Two Trees by M.C. Escher"],
+    ["Futurism, in the style of Wassily Kandinsky"], 
+    ["Surrealism, in the style of Edgar Degas"], 
+    ["Expressionism, in the style of Wassily Kandinsky"], 
+    ["Futurism, in the style of Egon Schiele"], 
+    ["Cubism, in the style of Gustav Klimt"], 
+    ["Op Art, in the style of Marc Chagall"], 
+    ["Romanticism, in the style of M.C. Escher"], 
+    ["Futurism, in the style of M.C. Escher"], 
+    ["Mannerism, in the style of Paul Klee"], 
+    ["High Renaissance, in the style of Rembrandt"], 
+    ["Magic Realism, in the style of Gustave Dore"], 
+    ["Realism, in the style of Jean-Michel Basquiat"], 
+    ["Art Nouveau, in the style of Paul Gauguin"], 
+    ["Avant-garde, in the style of Pierre-Auguste Renoir"], 
+    ["Baroque, in the style of Edward Hopper"], 
+    ["Post-Impressionism, in the style of Wassily Kandinsky"], 
+    ["Naturalism, in the style of Rene Magritte"], 
+    ["Constructivism, in the style of Paul Cezanne"], 
+    ["Abstract Expressionism, in the style of Henri Matisse"], 
+    ["Pop Art, in the style of Vincent van Gogh"], 
+    ["Futurism, in the style of Zdzislaw Beksinski"], 
+    ["Aaron Wacker, oil on canvas"]
+    ],
     title='Art Generator and Style Mixer from 🧠 Cloob and 🎨 WikiArt - Visual Art Encyclopedia',
     description="Trained on images from the [WikiArt](https://www.wikiart.org/) dataset, comprised of visual arts",
     article='Model used is: [model card](https://huggingface.co/huggan/distill-ccld-wa).'