Skip to content

Commit 5687ba1

Browse files
committed
change the ae related code due to the latest update of DCAE branch;
1 parent 7602dd5 commit 5687ba1

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

scripts/convert_sana_pag_to_diffusers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from transformers import AutoModelForCausalLM, AutoTokenizer
1212

1313
from diffusers import (
14-
DCAE,
14+
AutoencoderDC,
1515
DPMSolverMultistepScheduler,
1616
FlowMatchEulerDiscreteScheduler,
1717
SanaPAGPipeline,
@@ -187,7 +187,7 @@ def main(args):
187187
else:
188188
print(colored(f"Saving the whole SanaPAGPipeline containing {args.model_type}", "green", attrs=["bold"]))
189189
# VAE
190-
dc_ae = DCAE.from_pretrained(
190+
ae = AutoencoderDC.from_pretrained(
191191
"Efficient-Large-Model/dc_ae_f32c32_sana_1.0_diffusers",
192192
torch_dtype=torch.float32,
193193
).to(device)
@@ -221,7 +221,7 @@ def main(args):
221221
tokenizer=tokenizer,
222222
text_encoder=text_encoder,
223223
transformer=transformer,
224-
vae=dc_ae,
224+
vae=ae,
225225
scheduler=scheduler,
226226
pag_applied_layers="blocks.8",
227227
)

scripts/convert_sana_to_diffusers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from transformers import AutoModelForCausalLM, AutoTokenizer
1212

1313
from diffusers import (
14-
DCAE,
14+
AutoencoderDC,
1515
DPMSolverMultistepScheduler,
1616
FlowMatchEulerDiscreteScheduler,
1717
SanaPipeline,
@@ -187,7 +187,7 @@ def main(args):
187187
else:
188188
print(colored(f"Saving the whole SanaPipeline containing {args.model_type}", "green", attrs=["bold"]))
189189
# VAE
190-
dc_ae = DCAE.from_pretrained(
190+
ae = AutoencoderDC.from_pretrained(
191191
"Efficient-Large-Model/dc_ae_f32c32_sana_1.0_diffusers",
192192
torch_dtype=torch.float32,
193193
).to(device)
@@ -221,7 +221,7 @@ def main(args):
221221
tokenizer=tokenizer,
222222
text_encoder=text_encoder,
223223
transformer=transformer,
224-
vae=dc_ae,
224+
vae=ae,
225225
scheduler=scheduler,
226226
)
227227

src/diffusers/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
"UNetSpatioTemporalConditionModel",
131131
"UVit2DModel",
132132
"VQModel",
133-
"DCAE",
134133
]
135134
)
136135
_import_structure["optimization"] = [
@@ -576,7 +575,6 @@
576575
from .utils.dummy_pt_objects import * # noqa F403
577576
else:
578577
from .models import (
579-
DCAE,
580578
AllegroTransformer3DModel,
581579
AsymmetricAutoencoderKL,
582580
AuraFlowTransformer2DModel,

src/diffusers/models/transformers/sana_transformer_2d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
FusedAttnProcessor2_0,
2727
SanaLinearAttnProcessor2_0,
2828
)
29-
from ..autoencoders.dc_ae import GLUMBConv
29+
from ..autoencoders.autoencoder_dc import GLUMBConv
3030
from ..embeddings import PatchEmbed, PixArtAlphaTextProjection, SinusoidalPositionalEmbedding
3131
from ..modeling_outputs import Transformer2DModelOutput
3232
from ..modeling_utils import ModelMixin

src/diffusers/pipelines/pag/pipeline_pag_sana.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from transformers import AutoModelForCausalLM, AutoTokenizer
2323

2424
from ...image_processor import PixArtImageProcessor
25-
from ...models import DCAE, SanaTransformer2DModel
25+
from ...models import AutoencoderDC, SanaTransformer2DModel
2626
from ...models.attention_processor import PAGCFGSanaLinearAttnProcessor2_0, PAGIdentitySanaLinearAttnProcessor2_0
2727
from ...schedulers import FlowDPMSolverMultistepScheduler
2828
from ...utils import (
@@ -161,7 +161,7 @@ def __init__(
161161
self,
162162
tokenizer: AutoTokenizer,
163163
text_encoder: AutoModelForCausalLM,
164-
vae: DCAE,
164+
vae: AutoencoderDC,
165165
transformer: SanaTransformer2DModel,
166166
scheduler: FlowDPMSolverMultistepScheduler,
167167
pag_applied_layers: Union[str, List[str]] = "blocks.1", # 1st transformer block

src/diffusers/pipelines/sana/pipeline_sana.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from transformers import AutoModelForCausalLM, AutoTokenizer
2323

2424
from ...image_processor import PixArtImageProcessor
25-
from ...models import DCAE, SanaTransformer2DModel
25+
from ...models import AutoencoderDC, SanaTransformer2DModel
2626
from ...schedulers import FlowDPMSolverMultistepScheduler
2727
from ...utils import (
2828
BACKENDS_MAPPING,
@@ -157,7 +157,7 @@ def __init__(
157157
self,
158158
tokenizer: AutoTokenizer,
159159
text_encoder: AutoModelForCausalLM,
160-
vae: DCAE,
160+
vae: AutoencoderDC,
161161
transformer: SanaTransformer2DModel,
162162
scheduler: FlowDPMSolverMultistepScheduler,
163163
):

0 commit comments

Comments
 (0)