Merge branch 'dev' of https://github.com/bmaltais/kohya_ss into dev

jstayco · May 7, 2023 · ac81ead · ac81ead
2 parents dcab64e + 7daa164
commit ac81ead
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -347,6 +347,7 @@ This will store a backup file with your current locally installed pip packages a
     - Removed --no-cache again as pip cache is not enabled anyway
   - While overwriting .txt files with prefix and postfix including different encodings you might encounter this decoder error. This small fix gets rid of it... @ertugrul-dmr
   - Docker Add --no-cache-dir to reduce image size @chiragjn
+  - Reverting bitsandbytes version to 0.35.0 due to issues with 0.38.1 on some systems
 * 2023/04/05 (v21.5.8)
   - Add `Cache latents to disk` option to the gui.
   - When saving v2 models in Diffusers format in training scripts and conversion scripts, it was found that the U-Net configuration is different from those of Hugging Face's stabilityai models (this repository is `"use_linear_projection": false`, stabilityai is `true`). Please note that the weight shapes are different, so please be careful when using the weight files directly. We apologize for the inconvenience.

diff --git a/...andbytes_windows_deprecated/cextension.py → bitsandbytes_windows/cextension.py b/...andbytes_windows_deprecated/cextension.py → bitsandbytes_windows/cextension.py
diff --git a/...indows_deprecated/libbitsandbytes_cpu.dll → bitsandbytes_windows/libbitsandbytes_cpu.dll b/...indows_deprecated/libbitsandbytes_cpu.dll → bitsandbytes_windows/libbitsandbytes_cpu.dll
diff --git a/...ws_deprecated/libbitsandbytes_cuda116.dll → ...bytes_windows/libbitsandbytes_cuda116.dll b/...ws_deprecated/libbitsandbytes_cuda116.dll → ...bytes_windows/libbitsandbytes_cuda116.dll
diff --git a/bitsandbytes_windows_deprecated/main.py → bitsandbytes_windows/main.py b/bitsandbytes_windows_deprecated/main.py → bitsandbytes_windows/main.py
diff --git a/requirements.txt b/requirements.txt
@@ -2,9 +2,9 @@
 accelerate==0.18.0
 albumentations==1.3.0
 altair==4.2.2
-https://github.com/bmaltais/bitsandbytes-windows-webui/raw/main/bitsandbytes-0.38.1-py3-none-any.whl; sys_platform == 'win32'
+# https://github.com/bmaltais/bitsandbytes-windows-webui/raw/main/bitsandbytes-0.38.1-py3-none-any.whl; sys_platform == 'win32'
 # This next line is not an error but rather there to properly catch if the url based bitsandbytes was properly installed by the line above...
-bitsandbytes==0.38.1; sys_platform == 'win32'
+bitsandbytes==0.35.0; sys_platform == 'win32'
 bitsandbytes==0.38.1; (sys_platform == "darwin" or sys_platform == "linux")
 dadaptation==1.5
 diffusers[torch]==0.10.2

diff --git a/setup.bat b/setup.bat
@@ -49,8 +49,8 @@ if %choice%==1 (
     pip install https://huggingface.co/r4ziel/xformers_pre_built/resolve/main/triton-2.0.0-cp310-cp310-win_amd64.whl
 )
 
-@REM copy /y .\bitsandbytes_windows\*.dll .\venv\Lib\site-packages\bitsandbytes\
-@REM copy /y .\bitsandbytes_windows\cextension.py .\venv\Lib\site-packages\bitsandbytes\cextension.py
-@REM copy /y .\bitsandbytes_windows\main.py .\venv\Lib\site-packages\bitsandbytes\cuda_setup\main.py
+copy /y .\bitsandbytes_windows\*.dll .\venv\Lib\site-packages\bitsandbytes\
+copy /y .\bitsandbytes_windows\cextension.py .\venv\Lib\site-packages\bitsandbytes\cextension.py
+copy /y .\bitsandbytes_windows\main.py .\venv\Lib\site-packages\bitsandbytes\cuda_setup\main.py
 
 accelerate config