Skip to content

Commit f56ffb1

Browse files
committed
add
1 parent cd6ca9d commit f56ffb1

File tree

7 files changed

+970
-2
lines changed

7 files changed

+970
-2
lines changed

scripts/convert_flux_to_diffusers.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,17 @@ def main(args):
279279
num_single_layers = 38
280280
inner_dim = 3072
281281
mlp_ratio = 4.0
282+
283+
# dev has 64, dev-fill has 384
284+
in_channels = original_ckpt["img_in.weight"].shape[1]
285+
out_channels = 64
286+
282287
converted_transformer_state_dict = convert_flux_transformer_checkpoint_to_diffusers(
283288
original_ckpt, num_layers, num_single_layers, inner_dim, mlp_ratio=mlp_ratio
284289
)
285-
transformer = FluxTransformer2DModel(guidance_embeds=has_guidance)
290+
transformer = FluxTransformer2DModel(
291+
guidance_embeds=has_guidance, in_channels=in_channels, out_channels=out_channels
292+
)
286293
transformer.load_state_dict(converted_transformer_state_dict, strict=True)
287294

288295
print(

src/diffusers/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@
272272
"FluxControlNetImg2ImgPipeline",
273273
"FluxControlNetInpaintPipeline",
274274
"FluxControlNetPipeline",
275+
"FluxFillPipeline",
275276
"FluxImg2ImgPipeline",
276277
"FluxInpaintPipeline",
277278
"FluxPipeline",
@@ -737,6 +738,7 @@
737738
FluxControlNetImg2ImgPipeline,
738739
FluxControlNetInpaintPipeline,
739740
FluxControlNetPipeline,
741+
FluxFillPipeline,
740742
FluxImg2ImgPipeline,
741743
FluxInpaintPipeline,
742744
FluxPipeline,

src/diffusers/models/transformers/transformer_flux.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ def __init__(
238238
self,
239239
patch_size: int = 1,
240240
in_channels: int = 64,
241+
out_channels: int = None,
241242
num_layers: int = 19,
242243
num_single_layers: int = 38,
243244
attention_head_dim: int = 128,
@@ -248,7 +249,10 @@ def __init__(
248249
axes_dims_rope: Tuple[int] = (16, 56, 56),
249250
):
250251
super().__init__()
251-
self.out_channels = in_channels
252+
if out_channels is None:
253+
self.out_channels = in_channels
254+
else:
255+
self.out_channels = out_channels
252256
self.inner_dim = self.config.num_attention_heads * self.config.attention_head_dim
253257

254258
self.pos_embed = FluxPosEmbed(theta=10000, axes_dim=axes_dims_rope)

src/diffusers/pipelines/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
"FluxImg2ImgPipeline",
134134
"FluxInpaintPipeline",
135135
"FluxPipeline",
136+
"FluxFillPipeline",
136137
]
137138
_import_structure["audioldm"] = ["AudioLDMPipeline"]
138139
_import_structure["audioldm2"] = [
@@ -524,6 +525,7 @@
524525
FluxControlNetImg2ImgPipeline,
525526
FluxControlNetInpaintPipeline,
526527
FluxControlNetPipeline,
528+
FluxFillPipeline,
527529
FluxImg2ImgPipeline,
528530
FluxInpaintPipeline,
529531
FluxPipeline,

src/diffusers/pipelines/flux/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
_import_structure["pipeline_flux_controlnet"] = ["FluxControlNetPipeline"]
2727
_import_structure["pipeline_flux_controlnet_image_to_image"] = ["FluxControlNetImg2ImgPipeline"]
2828
_import_structure["pipeline_flux_controlnet_inpainting"] = ["FluxControlNetInpaintPipeline"]
29+
_import_structure["pipeline_flux_fill"] = ["FluxFillPipeline"]
2930
_import_structure["pipeline_flux_img2img"] = ["FluxImg2ImgPipeline"]
3031
_import_structure["pipeline_flux_inpaint"] = ["FluxInpaintPipeline"]
3132
if TYPE_CHECKING or DIFFUSERS_SLOW_IMPORT:
@@ -39,6 +40,7 @@
3940
from .pipeline_flux_controlnet import FluxControlNetPipeline
4041
from .pipeline_flux_controlnet_image_to_image import FluxControlNetImg2ImgPipeline
4142
from .pipeline_flux_controlnet_inpainting import FluxControlNetInpaintPipeline
43+
from .pipeline_flux_fill import FluxFillPipeline
4244
from .pipeline_flux_img2img import FluxImg2ImgPipeline
4345
from .pipeline_flux_inpaint import FluxInpaintPipeline
4446
else:

0 commit comments

Comments
 (0)