From 8450aca10e6a14f9af09324ebe6523d1f81d03f9 Mon Sep 17 00:00:00 2001
From: Jaret Burkett <jaretburkett@gmail.com>
Date: Wed, 12 Feb 2025 09:40:02 -0700
Subject: [PATCH] Fixed missed merge conflice and locked diffusers version

---
 jobs/process/BaseSDTrainProcess.py | 6 ------
 requirements.txt                   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/jobs/process/BaseSDTrainProcess.py b/jobs/process/BaseSDTrainProcess.py
index e81ee721..e30ddae0 100644
--- a/jobs/process/BaseSDTrainProcess.py
+++ b/jobs/process/BaseSDTrainProcess.py
@@ -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'):
diff --git a/requirements.txt b/requirements.txt
index b8620b4c..4040e760 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 torch==2.5.1
 torchvision==0.20.1
 safetensors
-git+https://github.com/zhuole1025/diffusers@lumina2
+git+https://github.com/huggingface/diffusers@28f48f4051e80082cbe97f2d62b365dbb01040ec
 transformers
 lycoris-lora==1.8.3
 flatten_json