Skip to content

Commit 1262d19

Browse files
DN6DN6
committed
update
1 parent 201da97 commit 1262d19

File tree

9 files changed

+39
-60
lines changed

9 files changed

+39
-60
lines changed

‎src/diffusers/modular_pipelines/modular_pipeline.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,6 @@ def expected_components(self) -> List[ComponentSpec]:
344344
def expected_configs(self) -> List[ConfigSpec]:
345345
return []
346346

347-
@property
348-
def intermediate_inputs(self) -> List[OutputParam]:
349-
"""List of intermediate output parameters. Must be implemented by subclasses."""
350-
return []
351-
352347
@property
353348
def intermediate_outputs(self) -> List[OutputParam]:
354349
"""List of intermediate output parameters. Must be implemented by subclasses."""
@@ -1458,11 +1453,6 @@ def loop_inputs(self) -> List[InputParam]:
14581453
"""List of input parameters. Must be implemented by subclasses."""
14591454
return []
14601455

1461-
@property
1462-
def loop_intermediate_inputs(self) -> List[InputParam]:
1463-
"""List of intermediate input parameters. Must be implemented by subclasses."""
1464-
return []
1465-
14661456
@property
14671457
def loop_intermediate_outputs(self) -> List[OutputParam]:
14681458
"""List of intermediate output parameters. Must be implemented by subclasses."""
@@ -1476,14 +1466,6 @@ def loop_required_inputs(self) -> List[str]:
14761466
input_names.append(input_param.name)
14771467
return input_names
14781468

1479-
@property
1480-
def loop_required_intermediate_inputs(self) -> List[str]:
1481-
input_names = []
1482-
for input_param in self.loop_intermediate_inputs:
1483-
if input_param.required:
1484-
input_names.append(input_param.name)
1485-
return input_names
1486-
14871469
# modified from SequentialPipelineBlocks to include loop_expected_components
14881470
@property
14891471
def expected_components(self):

‎src/diffusers/modular_pipelines/stable_diffusion_xl/before_denoise.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from ...utils import logging
2828
from ...utils.torch_utils import randn_tensor, unwrap_module
2929
from ..modular_pipeline import (
30-
PipelineBlock,
30+
ModularPipelineBlocks,
3131
PipelineState,
3232
)
3333
from ..modular_pipeline_utils import ComponentSpec, ConfigSpec, InputParam, OutputParam
@@ -195,7 +195,7 @@ def prepare_latents_img2img(
195195
return latents
196196

197197

198-
class StableDiffusionXLInputStep(PipelineBlock):
198+
class StableDiffusionXLInputStep(ModularPipelineBlocks):
199199
model_name = "stable-diffusion-xl"
200200

201201
@property
@@ -394,7 +394,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
394394
return components, state
395395

396396

397-
class StableDiffusionXLImg2ImgSetTimestepsStep(PipelineBlock):
397+
class StableDiffusionXLImg2ImgSetTimestepsStep(ModularPipelineBlocks):
398398
model_name = "stable-diffusion-xl"
399399

400400
@property
@@ -543,7 +543,7 @@ def denoising_value_valid(dnv):
543543
return components, state
544544

545545

546-
class StableDiffusionXLSetTimestepsStep(PipelineBlock):
546+
class StableDiffusionXLSetTimestepsStep(ModularPipelineBlocks):
547547
model_name = "stable-diffusion-xl"
548548

549549
@property
@@ -611,7 +611,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
611611
return components, state
612612

613613

614-
class StableDiffusionXLInpaintPrepareLatentsStep(PipelineBlock):
614+
class StableDiffusionXLInpaintPrepareLatentsStep(ModularPipelineBlocks):
615615
model_name = "stable-diffusion-xl"
616616

617617
@property
@@ -900,7 +900,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
900900
return components, state
901901

902902

903-
class StableDiffusionXLImg2ImgPrepareLatentsStep(PipelineBlock):
903+
class StableDiffusionXLImg2ImgPrepareLatentsStep(ModularPipelineBlocks):
904904
model_name = "stable-diffusion-xl"
905905

906906
@property
@@ -981,7 +981,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
981981
return components, state
982982

983983

984-
class StableDiffusionXLPrepareLatentsStep(PipelineBlock):
984+
class StableDiffusionXLPrepareLatentsStep(ModularPipelineBlocks):
985985
model_name = "stable-diffusion-xl"
986986

987987
@property
@@ -1092,7 +1092,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
10921092
return components, state
10931093

10941094

1095-
class StableDiffusionXLImg2ImgPrepareAdditionalConditioningStep(PipelineBlock):
1095+
class StableDiffusionXLImg2ImgPrepareAdditionalConditioningStep(ModularPipelineBlocks):
10961096
model_name = "stable-diffusion-xl"
10971097

10981098
@property
@@ -1316,7 +1316,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
13161316
return components, state
13171317

13181318

1319-
class StableDiffusionXLPrepareAdditionalConditioningStep(PipelineBlock):
1319+
class StableDiffusionXLPrepareAdditionalConditioningStep(ModularPipelineBlocks):
13201320
model_name = "stable-diffusion-xl"
13211321

13221322
@property
@@ -1499,7 +1499,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
14991499
return components, state
15001500

15011501

1502-
class StableDiffusionXLControlNetInputStep(PipelineBlock):
1502+
class StableDiffusionXLControlNetInputStep(ModularPipelineBlocks):
15031503
model_name = "stable-diffusion-xl"
15041504

15051505
@property
@@ -1718,7 +1718,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
17181718
return components, state
17191719

17201720

1721-
class StableDiffusionXLControlNetUnionInputStep(PipelineBlock):
1721+
class StableDiffusionXLControlNetUnionInputStep(ModularPipelineBlocks):
17221722
model_name = "stable-diffusion-xl"
17231723

17241724
@property

‎src/diffusers/modular_pipelines/stable_diffusion_xl/decoders.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@
2323
from ...models import AutoencoderKL
2424
from ...models.attention_processor import AttnProcessor2_0, XFormersAttnProcessor
2525
from ...utils import logging
26-
from ..modular_pipeline import (
27-
PipelineBlock,
28-
PipelineState,
29-
)
26+
from ..modular_pipeline import ModularPipelineBlocks, PipelineState
3027
from ..modular_pipeline_utils import ComponentSpec, InputParam, OutputParam
3128

3229

3330
logger = logging.get_logger(__name__) # pylint: disable=invalid-name
3431

3532

36-
class StableDiffusionXLDecodeStep(PipelineBlock):
33+
class StableDiffusionXLDecodeStep(ModularPipelineBlocks):
3734
model_name = "stable-diffusion-xl"
3835

3936
@property
@@ -157,7 +154,7 @@ def __call__(self, components, state: PipelineState) -> PipelineState:
157154
return components, state
158155

159156

160-
class StableDiffusionXLInpaintOverlayMaskStep(PipelineBlock):
157+
class StableDiffusionXLInpaintOverlayMaskStep(ModularPipelineBlocks):
161158
model_name = "stable-diffusion-xl"
162159

163160
@property

‎src/diffusers/modular_pipelines/stable_diffusion_xl/denoise.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from ..modular_pipeline import (
2626
BlockState,
2727
LoopSequentialPipelineBlocks,
28-
PipelineBlock,
28+
ModularPipelineBlocks,
2929
PipelineState,
3030
)
3131
from ..modular_pipeline_utils import ComponentSpec, InputParam, OutputParam
@@ -37,7 +37,7 @@
3737

3838
# YiYi experimenting composible denoise loop
3939
# loop step (1): prepare latent input for denoiser
40-
class StableDiffusionXLLoopBeforeDenoiser(PipelineBlock):
40+
class StableDiffusionXLLoopBeforeDenoiser(ModularPipelineBlocks):
4141
model_name = "stable-diffusion-xl"
4242

4343
@property
@@ -55,7 +55,7 @@ def description(self) -> str:
5555
)
5656

5757
@property
58-
def intermediate_inputs(self) -> List[str]:
58+
def inputs(self) -> List[str]:
5959
return [
6060
InputParam(
6161
"latents",
@@ -73,7 +73,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, block_state: Bl
7373

7474

7575
# loop step (1): prepare latent input for denoiser (with inpainting)
76-
class StableDiffusionXLInpaintLoopBeforeDenoiser(PipelineBlock):
76+
class StableDiffusionXLInpaintLoopBeforeDenoiser(ModularPipelineBlocks):
7777
model_name = "stable-diffusion-xl"
7878

7979
@property
@@ -144,7 +144,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, block_state: Bl
144144

145145

146146
# loop step (2): denoise the latents with guidance
147-
class StableDiffusionXLLoopDenoiser(PipelineBlock):
147+
class StableDiffusionXLLoopDenoiser(ModularPipelineBlocks):
148148
model_name = "stable-diffusion-xl"
149149

150150
@property
@@ -249,7 +249,7 @@ def __call__(
249249

250250

251251
# loop step (2): denoise the latents with guidance (with controlnet)
252-
class StableDiffusionXLControlNetLoopDenoiser(PipelineBlock):
252+
class StableDiffusionXLControlNetLoopDenoiser(ModularPipelineBlocks):
253253
model_name = "stable-diffusion-xl"
254254

255255
@property
@@ -449,7 +449,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, block_state: Bl
449449

450450

451451
# loop step (3): scheduler step to update latents
452-
class StableDiffusionXLLoopAfterDenoiser(PipelineBlock):
452+
class StableDiffusionXLLoopAfterDenoiser(ModularPipelineBlocks):
453453
model_name = "stable-diffusion-xl"
454454

455455
@property
@@ -520,7 +520,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, block_state: Bl
520520

521521

522522
# loop step (3): scheduler step to update latents (with inpainting)
523-
class StableDiffusionXLInpaintLoopAfterDenoiser(PipelineBlock):
523+
class StableDiffusionXLInpaintLoopAfterDenoiser(ModularPipelineBlocks):
524524
model_name = "stable-diffusion-xl"
525525

526526
@property
@@ -660,7 +660,7 @@ def loop_expected_components(self) -> List[ComponentSpec]:
660660
]
661661

662662
@property
663-
def loop_intermediate_inputs(self) -> List[InputParam]:
663+
def loop_inputs(self) -> List[InputParam]:
664664
return [
665665
InputParam(
666666
"timesteps",

‎src/diffusers/modular_pipelines/stable_diffusion_xl/encoders.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
scale_lora_layers,
3636
unscale_lora_layers,
3737
)
38-
from ..modular_pipeline import PipelineBlock, PipelineState
38+
from ..modular_pipeline import ModularPipelineBlocks, PipelineState
3939
from ..modular_pipeline_utils import ComponentSpec, ConfigSpec, InputParam, OutputParam
4040
from .modular_pipeline import StableDiffusionXLModularPipeline
4141

@@ -57,7 +57,7 @@ def retrieve_latents(
5757
raise AttributeError("Could not access latents of provided encoder_output")
5858

5959

60-
class StableDiffusionXLIPAdapterStep(PipelineBlock):
60+
class StableDiffusionXLIPAdapterStep(ModularPipelineBlocks):
6161
model_name = "stable-diffusion-xl"
6262

6363
@property
@@ -215,7 +215,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
215215
return components, state
216216

217217

218-
class StableDiffusionXLTextEncoderStep(PipelineBlock):
218+
class StableDiffusionXLTextEncoderStep(ModularPipelineBlocks):
219219
model_name = "stable-diffusion-xl"
220220

221221
@property
@@ -576,7 +576,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
576576
return components, state
577577

578578

579-
class StableDiffusionXLVaeEncoderStep(PipelineBlock):
579+
class StableDiffusionXLVaeEncoderStep(ModularPipelineBlocks):
580580
model_name = "stable-diffusion-xl"
581581

582582
@property
@@ -691,7 +691,7 @@ def __call__(self, components: StableDiffusionXLModularPipeline, state: Pipeline
691691
return components, state
692692

693693

694-
class StableDiffusionXLInpaintVaeEncoderStep(PipelineBlock):
694+
class StableDiffusionXLInpaintVaeEncoderStep(ModularPipelineBlocks):
695695
model_name = "stable-diffusion-xl"
696696

697697
@property

‎src/diffusers/modular_pipelines/wan/before_denoise.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from ...schedulers import UniPCMultistepScheduler
2121
from ...utils import logging
2222
from ...utils.torch_utils import randn_tensor
23-
from ..modular_pipeline import PipelineBlock, PipelineState
23+
from ..modular_pipeline import ModularPipelineBlocks, PipelineState
2424
from ..modular_pipeline_utils import ComponentSpec, InputParam, OutputParam
2525
from .modular_pipeline import WanModularPipeline
2626

@@ -94,7 +94,7 @@ def retrieve_timesteps(
9494
return timesteps, num_inference_steps
9595

9696

97-
class WanInputStep(PipelineBlock):
97+
class WanInputStep(ModularPipelineBlocks):
9898
model_name = "wan"
9999

100100
@property
@@ -194,7 +194,7 @@ def __call__(self, components: WanModularPipeline, state: PipelineState) -> Pipe
194194
return components, state
195195

196196

197-
class WanSetTimestepsStep(PipelineBlock):
197+
class WanSetTimestepsStep(ModularPipelineBlocks):
198198
model_name = "wan"
199199

200200
@property
@@ -243,7 +243,7 @@ def __call__(self, components: WanModularPipeline, state: PipelineState) -> Pipe
243243
return components, state
244244

245245

246-
class WanPrepareLatentsStep(PipelineBlock):
246+
class WanPrepareLatentsStep(ModularPipelineBlocks):
247247
model_name = "wan"
248248

249249
@property

‎src/diffusers/modular_pipelines/wan/decoders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
from ...models import AutoencoderKLWan
2323
from ...utils import logging
2424
from ...video_processor import VideoProcessor
25-
from ..modular_pipeline import PipelineBlock, PipelineState
25+
from ..modular_pipeline import ModularPipelineBlocks, PipelineState
2626
from ..modular_pipeline_utils import ComponentSpec, InputParam, OutputParam
2727

2828

2929
logger = logging.get_logger(__name__) # pylint: disable=invalid-name
3030

3131

32-
class WanDecodeStep(PipelineBlock):
32+
class WanDecodeStep(ModularPipelineBlocks):
3333
model_name = "wan"
3434

3535
@property

‎src/diffusers/modular_pipelines/wan/denoise.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from ..modular_pipeline import (
2525
BlockState,
2626
LoopSequentialPipelineBlocks,
27-
PipelineBlock,
27+
ModularPipelineBlocks,
2828
PipelineState,
2929
)
3030
from ..modular_pipeline_utils import ComponentSpec, InputParam, OutputParam
@@ -34,7 +34,7 @@
3434
logger = logging.get_logger(__name__) # pylint: disable=invalid-name
3535

3636

37-
class WanLoopDenoiser(PipelineBlock):
37+
class WanLoopDenoiser(ModularPipelineBlocks):
3838
model_name = "wan"
3939

4040
@property
@@ -132,7 +132,7 @@ def __call__(
132132
return components, block_state
133133

134134

135-
class WanLoopAfterDenoiser(PipelineBlock):
135+
class WanLoopAfterDenoiser(ModularPipelineBlocks):
136136
model_name = "wan"
137137

138138
@property

‎src/diffusers/modular_pipelines/wan/encoders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from ...configuration_utils import FrozenDict
2323
from ...guiders import ClassifierFreeGuidance
2424
from ...utils import is_ftfy_available, logging
25-
from ..modular_pipeline import PipelineBlock, PipelineState
25+
from ..modular_pipeline import ModularPipelineBlocks, PipelineState
2626
from ..modular_pipeline_utils import ComponentSpec, ConfigSpec, InputParam, OutputParam
2727
from .modular_pipeline import WanModularPipeline
2828

@@ -51,7 +51,7 @@ def prompt_clean(text):
5151
return text
5252

5353

54-
class WanTextEncoderStep(PipelineBlock):
54+
class WanTextEncoderStep(ModularPipelineBlocks):
5555
model_name = "wan"
5656

5757
@property

0 commit comments

Comments
 (0)