Fixed missed merge conflice and locked diffusers version

This commit is contained in:
Jaret Burkett committed 2025-02-12 09:40:02 -07:00
1 parent 0b8a32def7
commit 8450aca10e
2 files changed
+1 -7

No files matched your search

-6
View File
@@ -1461,19 +1461,13 @@ class BaseSDTrainProcess(BaseTrainProcess):
# print_acc("sage attention is not installed. Using SDP instead")
if self.train_config.gradient_checkpointing:
<<<<<<< HEAD
=======
# if has method enable_gradient_checkpointing
>>>>>>> lumina2
if hasattr(unet, 'enable_gradient_checkpointing'):
unet.enable_gradient_checkpointing()
elif hasattr(unet, 'gradient_checkpointing'):
unet.gradient_checkpointing = True
<<<<<<< HEAD
=======
else:
print("Gradient checkpointing not supported on this model")
>>>>>>> lumina2
if isinstance(text_encoder, list):
for te in text_encoder:
if hasattr(te, 'enable_gradient_checkpointing'):