Rename pipelines (#115) · python273/diffusers@836f3f3 · GitHub
Skip to content

Commit 836f3f3

Browse files
patrickvonplatenpatrickvonplaten
authored
Rename pipelines (huggingface#115)
up
1 parent 9c3820d commit 836f3f3

10 files changed

Lines changed: 18 additions & 53 deletions

File tree

‎scripts/conversion_ldm_uncond.py‎

Lines changed: 2 additions & 2 deletions

‎scripts/convert_ldm_original_checkpoint_to_diffusers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import argparse
1818
import json
1919
import torch
20-
from diffusers import VQModel, DDPMScheduler, UNet2DModel, LatentDiffusionUncondPipeline
20+
from diffusers import VQModel, DDPMScheduler, UNet2DModel, LDMPipeline
2121

2222

2323
def shave_segments(path, n_shave_prefix_segments=1):
@@ -326,7 +326,7 @@ def convert_ldm_checkpoint(checkpoint, config):
326326
scheduler = DDPMScheduler.from_config("/".join(args.checkpoint_path.split("/")[:-1]))
327327
vqvae = VQModel.from_pretrained("/".join(args.checkpoint_path.split("/")[:-1]))
328328

329-
pipe = LatentDiffusionUncondPipeline(unet=model, scheduler=scheduler, vae=vqvae)
329+
pipe = LDMPipeline(unet=model, scheduler=scheduler, vae=vqvae)
330330
pipe.save_pretrained(args.dump_path)
331331
except:
332332
model.save_pretrained(args.dump_path)

‎src/diffusers/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
from .modeling_utils import ModelMixin
1010
from .models import AutoencoderKL, UNet2DConditionModel, UNet2DModel, VQModel
1111
from .pipeline_utils import DiffusionPipeline
12-
from .pipelines import DDIMPipeline, DDPMPipeline, LatentDiffusionUncondPipeline, PNDMPipeline, ScoreSdeVePipeline
12+
from .pipelines import DDIMPipeline, DDPMPipeline, LDMPipeline, PNDMPipeline, ScoreSdeVePipeline
1313
from .schedulers import DDIMScheduler, DDPMScheduler, PNDMScheduler, SchedulerMixin, ScoreSdeVeScheduler
1414

1515

1616
if is_transformers_available():
17-
from .pipelines import LatentDiffusionPipeline
17+
from .pipelines import LDMTextToImagePipeline
1818
else:
1919
from .utils.dummy_transformers_objects import *

‎src/diffusers/pipelines/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from ..utils import is_inflect_available, is_transformers_available, is_unidecode_available
22
from .ddim import DDIMPipeline
33
from .ddpm import DDPMPipeline
4-
from .latent_diffusion_uncond import LatentDiffusionUncondPipeline
4+
from .latent_diffusion_uncond import LDMPipeline
55
from .pndm import PNDMPipeline
66
from .score_sde_ve import ScoreSdeVePipeline
77

88

99
if is_transformers_available():
10-
from .latent_diffusion import LatentDiffusionPipeline
10+
from .latent_diffusion import LDMTextToImagePipeline

‎src/diffusers/pipelines/latent_diffusion/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
if is_transformers_available():
5-
from .pipeline_latent_diffusion import LatentDiffusionPipeline, LDMBertModel
5+
from .pipeline_latent_diffusion import LDMBertModel, LDMTextToImagePipeline

‎src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ...pipeline_utils import DiffusionPipeline
1515

1616

17-
class LatentDiffusionPipeline(DiffusionPipeline):
17+
class LDMTextToImagePipeline(DiffusionPipeline):
1818
def __init__(self, vqvae, bert, tokenizer, unet, scheduler):
1919
super().__init__()
2020
scheduler = scheduler.set_format("pt")

‎src/diffusers/pipelines/latent_diffusion_uncond/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .pipeline_latent_diffusion_uncond import LatentDiffusionUncondPipeline
1+
from .pipeline_latent_diffusion_uncond import LDMPipeline

‎src/diffusers/pipelines/latent_diffusion_uncond/pipeline_latent_diffusion_uncond.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ...pipeline_utils import DiffusionPipeline
66

77

8-
class LatentDiffusionUncondPipeline(DiffusionPipeline):
8+
class LDMPipeline(DiffusionPipeline):
99
def __init__(self, vqvae, unet, scheduler):
1010
super().__init__()
1111
scheduler = scheduler.set_format("pt")

‎src/diffusers/utils/dummy_transformers_objects.py‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,7 @@
33
from ..utils import DummyObject, requires_backends
44

55

6-
class GlideSuperResUNetModel(metaclass=DummyObject):
7-
_backends = ["transformers"]
8-
9-
def __init__(self, *args, **kwargs):
10-
requires_backends(self, ["transformers"])
11-
12-
13-
class GlideTextToImageUNetModel(metaclass=DummyObject):
14-
_backends = ["transformers"]
15-
16-
def __init__(self, *args, **kwargs):
17-
requires_backends(self, ["transformers"])
18-
19-
20-
class GlideUNetModel(metaclass=DummyObject):
21-
_backends = ["transformers"]
22-
23-
def __init__(self, *args, **kwargs):
24-
requires_backends(self, ["transformers"])
25-
26-
27-
class UNetGradTTSModel(metaclass=DummyObject):
28-
_backends = ["transformers"]
29-
30-
def __init__(self, *args, **kwargs):
31-
requires_backends(self, ["transformers"])
32-
33-
34-
class GlidePipeline(metaclass=DummyObject):
35-
_backends = ["transformers"]
36-
37-
def __init__(self, *args, **kwargs):
38-
requires_backends(self, ["transformers"])
39-
40-
41-
class LatentDiffusionPipeline(metaclass=DummyObject):
6+
class LDMTextToImagePipeline(metaclass=DummyObject):
427
_backends = ["transformers"]
438

449
def __init__(self, *args, **kwargs):

‎tests/test_modeling_utils.py‎

Lines changed: 5 additions & 5 deletions

0 commit comments

Comments
 (0)