name changed

Signed-off-by: ftgreat <[email protected]>
soon14 · Apr 12, 2023 · 8253a8e · 8253a8e
1 parent e38ad79
commit 8253a8e
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 1,307 deletions.
diff --git a/examples/AltCLIP/altclip_inference.py b/examples/AltCLIP/altclip_inference.py
@@ -19,7 +19,7 @@
 tokenizer = loader.get_tokenizer()
 
 def inference():
-    image = Image.open("./dog.jpeg")
+    image = Image.open("./examples/AltCLIP/dog.jpeg")
     image = transform(image)
     image = torch.tensor(image["pixel_values"]).to(device)
     tokenizer_out = tokenizer(["a rat", "a dog", "a cat"], 

diff --git a/flagai/auto_model/auto_loader.py b/flagai/auto_model/auto_loader.py
@@ -65,7 +65,7 @@ def __getattr__(self, name):
     "cpm3_lm": ("flagai.model.cpm3_model", "CPM3"),
     "cpm3_train": ("flagai.model.cpm3_train_model", "CPM3"),
     "diffusion_text2img": ("flagai.model.mm.AltDiffusion", "LatentDiffusion"),
-    "diffusion2_text2img": ("flagai.model.mm.AltDiffusionM18", "LatentDiffusion"),
+    "diffusion_m18_text2img": ("flagai.model.mm.AltDiffusionM18", "LatentDiffusion"),
     "altclip_txt_img_matching": ("flagai.model.mm.AltCLIP", "AltCLIP"),
     "evaclip_txt_img_matching": ("flagai.model.mm.eva_clip_model", "EVA_CLIP"),
 }
@@ -122,9 +122,9 @@ def __getattr__(self, name):
     "altdiffusion":
     ["flagai.model.mm.diffusion", "LatentDiffusion", "diffusion", "mm","flagai.model.mm.AltCLIP", "AltCLIPProcess"],
     "altdiffusion-m9":
-    ["flagai.model.mm.diffusion2", "LatentDiffusion", "diffusion", "mm","flagai.model.mm.AltCLIP", "AltCLIPProcess"],
+    ["flagai.model.mm.diffusionM18", "LatentDiffusion", "diffusion", "mm","flagai.model.mm.AltCLIP", "AltCLIPProcess"],
     "altdiffusion-m18":
-    ["flagai.model.mm.Altdiffusion2", "LatentDiffusion", "diffusion2", "mm","flagai.model.mm.AltCLIP", "AltCLIPProcess"],
+    ["flagai.model.mm.AltdiffusionM18", "LatentDiffusion", "diffusion_m18", "mm","flagai.model.mm.AltCLIP", "AltCLIPProcess"],
     "swinv1-base-patch4-window7-224":
         ["flagai.model.vision.swinv1", "SwinTransformer", "swinv1", "vision"],
     "swinv2-base-patch4-window8-256":

diff --git a/flagai/model/base_model.py b/flagai/model/base_model.py
@@ -228,6 +228,4 @@ def download(cls,
                 if not file_name.endswith("bin"):
                     _get_vocab_path(os.path.join(download_path, model_name), file_name, model_id)
                 else :
-                    if only_download_config:
-                        continue
                     _get_checkpoint_path(os.path.join(download_path, model_name), file_name, model_id)
diff --git a/flagai/model/mm/autoencoder2.py → flagai/model/mm/autoencoder_m18.py b/flagai/model/mm/autoencoder2.py → flagai/model/mm/autoencoder_m18.py
diff --git a/flagai/model/mm/modules/diffusionmodules/openaimodel.py b/flagai/model/mm/modules/diffusionmodules/openaimodel.py
@@ -1,13 +1,14 @@
 from abc import abstractmethod
 import math
 import inspect
+
 import numpy as np
 import torch as th
 import torch.nn as nn
 import torch.nn.functional as F
 from torch.nn.init import normal_, xavier_normal_, xavier_uniform_, kaiming_normal_, kaiming_uniform_, zeros_
 
-from ldm.modules.diffusionmodules.util import (
+from flagai.model.mm.modules.diffusionmodules.util import (
     checkpoint,
     conv_nd,
     linear,
@@ -16,8 +17,8 @@
     normalization,
     timestep_embedding,
 )
-from ldm.modules.attention import SpatialTransformer
-from ldm.util import exists
+from flagai.model.mm.modules.attention import SpatialTransformer
+from flagai.model.mm.utils import exists
 
 
 # dummy replace

diff --git a/flagai/model/mm/modules/diffusionmodules/upscaling.py b/flagai/model/mm/modules/diffusionmodules/upscaling.py
diff --git a/flagai/model/mm/modules/encoders/__init__.py b/flagai/model/mm/modules/encoders/__init__.py