VictorMylle/Kohya-ss-sd-scripts
1
0
Fork 1
mirror of https://github.com/kohya-ss/sd-scripts.git synced 2026-04-09 06:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

extension of src image could be different than target image

Browse Source
This commit is contained in:
Kohya S
2024-03-17 18:09:15 +09:00
parent 0ef4fe70f0
commit 7081a0cf0f
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/train_util.py
View File

@@ -1863,7 +1863,7 @@ class ControlNetDataset(BaseDataset):
# assert all conditioning data exists # assert all conditioning data exists
missing_imgs = [] missing_imgs = []
cond_imgs_with_img = set() cond_imgs_with_pair = set()
for image_key, info in self.dreambooth_dataset_delegate.image_data.items(): for image_key, info in self.dreambooth_dataset_delegate.image_data.items():
db_subset = self.dreambooth_dataset_delegate.image_to_subset[image_key] db_subset = self.dreambooth_dataset_delegate.image_to_subset[image_key]
subset = None subset = None
@@ -1877,23 +1877,29 @@ class ControlNetDataset(BaseDataset):
logger.warning(f"not directory: {subset.conditioning_data_dir}") logger.warning(f"not directory: {subset.conditioning_data_dir}")
continue continue
img_basename = os.path.basename(info.absolute_path) img_basename = os.path.splitext(os.path.basename(info.absolute_path))[0]
ctrl_img_path = os.path.join(subset.conditioning_data_dir, img_basename) ctrl_img_path = glob_images(subset.conditioning_data_dir, img_basename)
if not os.path.exists(ctrl_img_path): if len(ctrl_img_path) < 1:
missing_imgs.append(img_basename) missing_imgs.append(img_basename)
continue
ctrl_img_path = ctrl_img_path[0]
ctrl_img_path = os.path.abspath(ctrl_img_path) # normalize path
info.cond_img_path = ctrl_img_path info.cond_img_path = ctrl_img_path
cond_imgs_with_img.add(ctrl_img_path) cond_imgs_with_pair.add(os.path.splitext(ctrl_img_path)[0]) # remove extension because Windows is case insensitive
extra_imgs = [] extra_imgs = []
for subset in subsets: for subset in subsets:
conditioning_img_paths = glob_images(subset.conditioning_data_dir, "*") conditioning_img_paths = glob_images(subset.conditioning_data_dir, "*")
extra_imgs.extend( conditioning_img_paths = [os.path.abspath(p) for p in conditioning_img_paths] # normalize path
[cond_img_path for cond_img_path in conditioning_img_paths if cond_img_path not in cond_imgs_with_img] extra_imgs.extend([p for p in conditioning_img_paths if os.path.splitext(p)[0] not in cond_imgs_with_pair])
)
assert len(missing_imgs) == 0, f"missing conditioning data for {len(missing_imgs)} images: {missing_imgs}" assert (
assert len(extra_imgs) == 0, f"extra conditioning data for {len(extra_imgs)} images: {extra_imgs}" len(missing_imgs) == 0
), f"missing conditioning data for {len(missing_imgs)} images / 制御用画像が見つかりませんでした: {missing_imgs}"
assert (
len(extra_imgs) == 0
), f"extra conditioning data for {len(extra_imgs)} images / 余分な制御用画像があります: {extra_imgs}"
self.conditioning_image_transforms = IMAGE_TRANSFORMS self.conditioning_image_transforms = IMAGE_TRANSFORMS