Merge pull request #2130 from bmaltais/dev

v23.0.14
bmaltais · Mar 19, 2024 · 55386bb · 55386bb
2 parents 95112e9 + 0afc9c8
commit 55386bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.release b/.release
@@ -1 +1 @@
-v23.0.13
+v23.0.14
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ The GUI allows you to set the training parameters and generate and run the requi
     - [No module called tkinter](#no-module-called-tkinter)
   - [SDXL training](#sdxl-training)
   - [Change History](#change-history)
+    - [2024/03/13 (v23.0.14)](#20240313-v23014)
     - [2024/03/13 (v23.0.13)](#20240313-v23013)
     - [2024/03/16 (v23.0.12)](#20240316-v23012)
       - [New Features \& Improvements](#new-features--improvements)
@@ -380,6 +381,10 @@ The documentation in this section will be moved to a separate document later.
 
 ## Change History
 
+### 2024/03/13 (v23.0.14)
+
+- Fix blip caption issue
+- 
 ### 2024/03/13 (v23.0.13)
 
 - Fix issue with image samples.

diff --git a/kohya_gui/blip_caption_gui.py b/kohya_gui/blip_caption_gui.py
@@ -58,11 +58,11 @@ def caption_images(
 
     # Construct the command to run
     run_cmd = rf'"{PYTHON}" "{scriptdir}/sd-scripts/finetune/make_captions.py"'
-    run_cmd += f' --batch_size="{batch_size}"'
-    run_cmd += f' --num_beams="{num_beams}"'
+    run_cmd += f' --batch_size="{int(batch_size)}"'
+    run_cmd += f' --num_beams="{int(num_beams)}"'
     run_cmd += f' --top_p="{top_p}"'
-    run_cmd += f' --max_length="{max_length}"'
-    run_cmd += f' --min_length="{min_length}"'
+    run_cmd += f' --max_length="{int(max_length)}"'
+    run_cmd += f' --min_length="{int(min_length)}"'
     if beam_search:
         run_cmd += f" --beam_search"
     if caption_file_ext:

diff --git a/kohya_gui/lora_gui.py b/kohya_gui/lora_gui.py
@@ -719,7 +719,7 @@ def train_model(
 
     if LoRA_type == "LyCORIS/Diag-OFT":
         network_module = "lycoris.kohya"
-        network_args = f' "preset={LyCORIS_preset}" "conv_dim={conv_dim}" "conv_alpha={conv_alpha}" "module_dropout={module_dropout}" "use_tucker={use_tucker}" "use_scalar={use_scalar}" "rank_dropout_scale={rank_dropout_scale}" "constrain={constrain}" "rescaled={rescaled}" "algo=diag-oft" '
+        network_args = f' "preset={LyCORIS_preset}" "conv_dim={conv_dim}" "conv_alpha={conv_alpha}" "module_dropout={module_dropout}" "use_tucker={use_tucker}" "use_scalar={use_scalar}" "rank_dropout_scale={rank_dropout_scale}" "constrain={constrain}" "rescaled={rescaled}" "algo=diag-oft"  "train_norm={train_norm}"'
 
     if LoRA_type == "LyCORIS/DyLoRA":
         network_module = "lycoris.kohya"

diff --git a/setup/setup_windows.py b/setup/setup_windows.py
@@ -148,7 +148,7 @@ def install_bitsandbytes_0_41_1():
     )
 
 def install_bitsandbytes_0_41_2():
-    log.info("Installing bitsandbytes 0.41.1...")
+    log.info("Installing bitsandbytes 0.41.2...")
     setup_common.install(
         "--upgrade https://github.com/jllllll/bitsandbytes-windows-webui/releases/download/wheels/bitsandbytes-0.41.2.post2-py3-none-win_amd64.whl",
         "bitsandbytes 0.41.2",
@@ -204,7 +204,7 @@ def main_menu(headless: bool = False):
                     elif choice_torch == "3":
                         install_bitsandbytes_0_41_1()
                         break
-                    elif choice_torch == "3":
+                    elif choice_torch == "4":
                         install_bitsandbytes_0_41_2()
                         break
                     elif choice_torch == "5":