modular pipeline builder -> ModularPipeline

Author: yiyixuxu

src/diffusers/__init__.py

@@ -162,7 +162,7 @@
             "KarrasVePipeline",
             "LDMPipeline",
             "LDMSuperResolutionPipeline",
-            "ModularPipelineBuilder",
+            "ModularPipeline",
             "PNDMPipeline",
             "RePaintPipeline",
             "ScoreSdeVePipeline",
@@ -674,7 +674,7 @@
             KarrasVePipeline,
             LDMPipeline,
             LDMSuperResolutionPipeline,
-            ModularPipelineBuilder,
+            ModularPipeline,
             PNDMPipeline,
             RePaintPipeline,
             ScoreSdeVePipeline,

src/diffusers/pipelines/__init__.py

@@ -46,7 +46,7 @@
         "AutoPipelineForInpainting",
         "AutoPipelineForText2Image",
     ]
-    _import_structure["modular_pipeline_builder"] = ["ModularPipelineBuilder"]
+    _import_structure["modular_pipeline"] = ["ModularPipeline"]
     _import_structure["consistency_models"] = ["ConsistencyModelPipeline"]
     _import_structure["dance_diffusion"] = ["DanceDiffusionPipeline"]
     _import_structure["ddim"] = ["DDIMPipeline"]
@@ -452,7 +452,7 @@
         from .deprecated import KarrasVePipeline, LDMPipeline, PNDMPipeline, RePaintPipeline, ScoreSdeVePipeline
         from .dit import DiTPipeline
         from .latent_diffusion import LDMSuperResolutionPipeline
-        from .modular_pipeline_builder import ModularPipelineBuilder
+        from .modular_pipeline import ModularPipeline
         from .pipeline_utils import (
             AudioPipelineOutput,
             DiffusionPipeline,

src/diffusers/pipelines/modular_pipeline_builder.py renamed to src/diffusers/pipelines/modular_pipeline.py

@@ -187,7 +187,7 @@ def combine_inputs(*input_lists: List[Tuple[str, Any]]) -> List[Tuple[str, Any]]
 class MultiPipelineBlocks:
     """
     A class that combines multiple pipeline block classes into one. When used, it has same API and properties as
-    PipelineBlock. And it can be used in ModularPipelineBuilder as a single pipeline block.
+    PipelineBlock. And it can be used in ModularPipeline as a single pipeline block.
     """
 
     block_classes = []
@@ -583,7 +583,7 @@ def __repr__(self):
         )
 
 
-class ModularPipelineBuilder(ConfigMixin):
+class ModularPipeline(ConfigMixin):
     """
     Base class for all Modular pipelines.
 
@@ -694,7 +694,7 @@ def set_progress_bar_config(self, **kwargs):
         self._progress_bar_config = kwargs
 
     def __call__(self, *args, **kwargs):
-        raise NotImplementedError("__call__ is not implemented for ModularPipelineBuilder")
+        raise NotImplementedError("__call__ is not implemented for ModularPipeline")
 
     def run_blocks(self, state: PipelineState = None, output: Union[str, List[str]] = None, **kwargs):
         """

src/diffusers/pipelines/pipeline_loading_utils.py

@@ -376,7 +376,7 @@ def _get_pipeline_class(
             revision=revision,
         )
 
-    if class_obj.__name__ != "DiffusionPipeline" and class_obj.__name__ != "ModularPipelineBuilder":
+    if class_obj.__name__ != "DiffusionPipeline" and class_obj.__name__ != "ModularPipeline":
         return class_obj
 
     diffusers_module = importlib.import_module(class_obj.__module__.split(".")[0])

src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_modular.py

@@ -32,9 +32,9 @@
 )
 from ...utils.torch_utils import is_compiled_module, randn_tensor
 from ..controlnet.multicontrolnet import MultiControlNetModel
-from ..modular_pipeline_builder import (
+from ..modular_pipeline import (
     AutoPipelineBlocks,
-    ModularPipelineBuilder,
+    ModularPipeline,
     PipelineBlock,
     PipelineState,
     SequentialPipelineBlocks,
@@ -1433,7 +1433,7 @@ class StableDiffusionXLAllSteps(SequentialPipelineBlocks):
 
 
 class StableDiffusionXLModularPipeline(
-    ModularPipelineBuilder,
+    ModularPipeline,
     StableDiffusionMixin,
     TextualInversionLoaderMixin,
     StableDiffusionXLLoraLoaderMixin,

src/diffusers/utils/dummy_pt_objects.py

@@ -1140,7 +1140,7 @@ def from_pretrained(cls, *args, **kwargs):
         requires_backends(cls, ["torch"])
 
 
-class ModularPipelineBuilder(metaclass=DummyObject):
+class ModularPipeline(metaclass=DummyObject):
     _backends = ["torch"]
 
     def __init__(self, *args, **kwargs):