Merged two requirements.txt s

Dockerfile

@@ -16,8 +16,8 @@ ENV PIP_NO_CACHE_DIR=1
 COPY . /app/sxdl_train_captioner
 
 # pip 업그레이드 및 공통 유틸 설치
-RUN pip install --upgrade pip setuptools wheel \
- && pip install --no-cache-dir accelerate bitsandbytes xformers
+RUN pip install --upgrade pip setuptools wheel
+# && pip install --no-cache-dir accelerate bitsandbytes xformers
 
 # 두 requirements.txt 모두 설치
 WORKDIR /app/sxdl_train_captioner
@@ -26,10 +26,6 @@ RUN pip install --no-cache-dir -r requirements.txt
 # 모델 파일 복사 (미리 포함시킬 가중치)
 #COPY ./models /app/sxdl_train_captioner/models
 
-# (선택) BLIP/WD14 등 관련 종속 추가
-RUN pip install transformers==4.44.2 accelerate==0.33.0
-#    torch torchvision torchaudio
-
 # 모델 디렉토리 확인 로그
 RUN echo "✅ Copied models:" && ls -R /app/kohya_ss/models || echo "⚠️ No models found"
 

requirements-org-bak.txt

@@ -0,0 +1,37 @@
+accelerate>=1.7.0
+aiofiles==23.2.1
+altair==4.2.2
+dadaptation==3.2
+diffusers[torch]==0.32.2
+easygui==0.98.3
+einops==0.7.0
+fairscale==0.4.13
+ftfy==6.1.1
+gradio>=5.34.1
+huggingface-hub==0.29.3
+imagesize==1.4.1
+invisible-watermark==0.2.0
+lion-pytorch==0.0.6
+lycoris_lora==3.2.0.post2
+omegaconf==2.3.0
+prodigyopt==1.1.2
+protobuf==3.20.3
+open-clip-torch==2.20.0
+opencv-python==4.10.0.84
+prodigy-plus-schedule-free==1.8.0
+pytorch-lightning==1.9.0
+pytorch-optimizer==3.5.0
+rich>=13.7.1
+safetensors==0.4.4
+schedulefree==1.4
+scipy==1.11.4
+# for T5XXL tokenizer (SD3/FLUX)
+sentencepiece==0.2.0
+timm==1.0.15
+tk==0.1.0
+toml==0.10.2
+transformers==4.44.2
+voluptuous==0.13.1
+wandb==0.18.0
+# for kohya_ss sd-scripts library
+-e ./sd-scripts

requirements.txt

@@ -1,38 +1,52 @@
-accelerate>=1.7.0
-aiofiles==23.2.1
-altair==4.2.2
-dadaptation==3.2
-diffusers[torch]==0.32.2
-easygui==0.98.3
-einops==0.7.0
-fairscale==0.4.13
+# Core packages
+accelerate==0.33.0
+transformers==4.44.0
+diffusers[torch]==0.25.0
 ftfy==6.1.1
-gradio>=5.34.1
-huggingface-hub==0.29.3
-imagesize==1.4.1
-invisible-watermark==0.2.0
-lion-pytorch==0.0.6
-lycoris_lora==3.2.0.post2
-omegaconf==2.3.0
-onnx==1.16.1
-prodigyopt==1.1.2
-protobuf==3.20.3
-open-clip-torch==2.20.0
-opencv-python==4.10.0.84
-prodigy-plus-schedule-free==1.8.0
+einops==0.7.0
 pytorch-lightning==1.9.0
-pytorch-optimizer==3.5.0
-rich>=13.7.1
-safetensors==0.4.4
+lion-pytorch==0.0.6
 schedulefree==1.4
-scipy==1.11.4
-# for T5XXL tokenizer (SD3/FLUX)
-sentencepiece==0.2.0
-timm==1.0.15
-tk==0.1.0
+pytorch-optimizer==3.5.0
+prodigy-plus-schedule-free==1.9.0
+prodigyopt==1.1.2
+tensorboard
+safetensors==0.4.4
+altair==4.2.2
+easygui==0.98.3
 toml==0.10.2
-transformers==4.44.2
 voluptuous==0.13.1
-wandb==0.18.0
-# for kohya_ss sd-scripts library
--e ./sd-scripts
+huggingface-hub==0.24.5
+imagesize==1.4.1
+numpy<=2.0
+requests==2.28.2
+timm==0.4.12
+fairscale==0.4.4
+opencv-python==4.5.5.64
+opencv-python-headless==4.5.5.64
+
+# WD14 captioning (optional)
+# tensorflow==2.10.1
+onnx==1.15.0
+# onnxruntime-gpu==1.17.1
+# onnxruntime==1.17.1
+onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+
+# BLIP captioning
+blip==0.1.0
+# salesforce-lavis==1.0.2  # 필요 시 주석 해제
+
+# NLP utils
+nltk==3.9.2
+sentencepiece==0.2.0
+
+# OpenCLIP for SDXL
+open-clip-torch==2.20.0
+
+# Logging
+rich==13.7.0
+
+# Kohya_ss library
+xformers==0.0.26.post1 --index-url https://download.pytorch.org/whl/cu121
+triton==2.3.0
+-e .