Merge 96e4c7b into e518dbc

open-mmlab · Feb 28, 2023 · 5bf5862 · 5bf5862
2 parents e518dbc + 96e4c7b
commit 5bf5862
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/configs/disco_diffusion/README.md b/configs/disco_diffusion/README.md
@@ -2,7 +2,7 @@
 
 > [Disco Diffusion](https://github.com/alembics/disco-diffusion)
 
-> **Task**: Text2Image, Image2Image, diffusion
+> **Task**: Text2Image, Image2Image
 
 <!-- [ALGORITHM] -->
 

diff --git a/configs/disco_diffusion/metafile.yml b/configs/disco_diffusion/metafile.yml
@@ -7,7 +7,6 @@ Collections:
   Task:
   - text2image
   - image2image
-  - diffusion
   Year: 2022
 Models:
 - Config: configs/disco_diffusion/disco-diffusion_adm-u-finetuned_imagenet-512x512.py
@@ -16,21 +15,21 @@ Models:
   Results:
   - Dataset: ImageNet
     Metrics: {}
-    Task: Text2Image, Image2Image, diffusion
+    Task: Text2Image, Image2Image
   Weights: https://download.openmmlab.com/mmediting/synthesizers/disco/adm-u_finetuned_imagenet-512x512-ab471d70.pth
 - Config: configs/disco_diffusion/disco-diffusion_adm-u-finetuned_imagenet-256x256.py
   In Collection: Disco Diffusion
   Name: disco-diffusion_adm-u-finetuned_imagenet-256x256
   Results:
   - Dataset: ImageNet
     Metrics: {}
-    Task: Text2Image, Image2Image, diffusion
+    Task: Text2Image, Image2Image
   Weights: <>
 - Config: configs/disco_diffusion/disco-diffusion_portrait-generator-v001.py
   In Collection: Disco Diffusion
   Name: disco-diffusion_portrait-generator-v001
   Results:
   - Dataset: unknown
     Metrics: {}
-    Task: Text2Image, Image2Image, diffusion
+    Task: Text2Image, Image2Image
   Weights: https://download.openmmlab.com/mmediting/synthesizers/disco/adm-u-cvt-rgb_portrait-v001-f4a3f3bc.pth
diff --git a/demo/mmediting_inference_tutorial.ipynb b/demo/mmediting_inference_tutorial.ipynb
diff --git a/mmedit/apis/inferencers/mmedit_inferencer.py b/mmedit/apis/inferencers/mmedit_inferencer.py
@@ -64,7 +64,9 @@ def __init__(self,
         elif self.task in ['video_interpolation', 'Video Interpolation']:
             self.inferencer = VideoInterpolationInferencer(
                 config, ckpt, device, extra_parameters)
-        elif self.task in ['text2image', 'Text2Image']:
+        elif self.task in [
+                'text2image', 'Text2Image', 'Text2Image, Image2Image'
+        ]:
             self.inferencer = Text2ImageInferencer(
                 config, ckpt, device, extra_parameters, seed=seed)
         elif self.task in ['3D_aware_generation', '3D-aware Generation']: