Fixed missed merge conflice and locked diffusers version
This commit is contained in:
@@ -1461,19 +1461,13 @@ class BaseSDTrainProcess(BaseTrainProcess):
|
|||||||
# print_acc("sage attention is not installed. Using SDP instead")
|
# print_acc("sage attention is not installed. Using SDP instead")
|
||||||
|
|
||||||
if self.train_config.gradient_checkpointing:
|
if self.train_config.gradient_checkpointing:
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# if has method enable_gradient_checkpointing
|
# if has method enable_gradient_checkpointing
|
||||||
>>>>>>> lumina2
|
|
||||||
if hasattr(unet, 'enable_gradient_checkpointing'):
|
if hasattr(unet, 'enable_gradient_checkpointing'):
|
||||||
unet.enable_gradient_checkpointing()
|
unet.enable_gradient_checkpointing()
|
||||||
elif hasattr(unet, 'gradient_checkpointing'):
|
elif hasattr(unet, 'gradient_checkpointing'):
|
||||||
unet.gradient_checkpointing = True
|
unet.gradient_checkpointing = True
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
else:
|
else:
|
||||||
print("Gradient checkpointing not supported on this model")
|
print("Gradient checkpointing not supported on this model")
|
||||||
>>>>>>> lumina2
|
|
||||||
if isinstance(text_encoder, list):
|
if isinstance(text_encoder, list):
|
||||||
for te in text_encoder:
|
for te in text_encoder:
|
||||||
if hasattr(te, 'enable_gradient_checkpointing'):
|
if hasattr(te, 'enable_gradient_checkpointing'):
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
torch==2.5.1
|
torch==2.5.1
|
||||||
torchvision==0.20.1
|
torchvision==0.20.1
|
||||||
safetensors
|
safetensors
|
||||||
git+https://github.com/zhuole1025/diffusers@lumina2
|
git+https://github.com/huggingface/diffusers@28f48f4051e80082cbe97f2d62b365dbb01040ec
|
||||||
transformers
|
transformers
|
||||||
lycoris-lora==1.8.3
|
lycoris-lora==1.8.3
|
||||||
flatten_json
|
flatten_json
|
||||||
|
|||||||
Reference in New Issue
Block a user