From d5be8125b0b007eb702a33822147e986ea449071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E9=BE=8D=E8=81=96=E8=80=85=40bdsqlsz?=
 <865105819@qq.com>
Date: Sun, 24 Sep 2023 09:51:47 +0800
Subject: [PATCH] update bitsandbytes for 0.41.1 and fixed bugs with
 generate_controlnet_subsets_config for training (#823)

* update for bnb 0.41.1

* fixed generate_controlnet_subsets_config for training

* Revert "update for bnb 0.41.1"

This reverts commit 70bd3612d84778d491fc8006b8b9f9e21c4d2eb8.
---
 library/config_util.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/library/config_util.py b/library/config_util.py
index 813483e7..e8e0fda7 100644
--- a/library/config_util.py
+++ b/library/config_util.py
@@ -547,17 +547,13 @@ def generate_controlnet_subsets_config_by_subdirs(train_data_dir: Optional[str]
       return []
 
     subsets_config = []
-    for subdir in base_dir.iterdir():
-      if not subdir.is_dir():
-        continue
-
-      subset_config = {"image_dir": str(subdir), "conditioning_data_dir": conditioning_data_dir, "caption_extension": caption_extension, "num_repeats": 1}
-      subsets_config.append(subset_config)
+    subset_config = {"image_dir": train_data_dir, "conditioning_data_dir": conditioning_data_dir, "caption_extension": caption_extension, "num_repeats": 1}
+    subsets_config.append(subset_config)
 
     return subsets_config
 
   subsets_config = []
-  subsets_config += generate(train_data_dir, False)
+  subsets_config += generate(train_data_dir)
 
   return subsets_config