Merge branch 'sd3' into faster-block-swap

This commit is contained in:
Kohya S
2024-11-12 08:49:15 +09:00

View File

@@ -1404,12 +1404,12 @@ class BaseDataset(torch.utils.data.Dataset):
# return imagesize.get(image_path) # return imagesize.get(image_path)
image_size = imagesize.get(image_path) image_size = imagesize.get(image_path)
if image_size[0] <= 0: if image_size[0] <= 0:
# imagesize doesn't work for some images, so use cv2 # imagesize doesn't work for some images, so use PIL as a fallback
img = cv2.imread(image_path) try:
if img is not None: with Image.open(image_path) as img:
image_size = (img.shape[1], img.shape[0]) image_size = img.size
else: except Exception as e:
logger.warning(f"failed to get image size: {image_path}") logger.warning(f"failed to get image size: {image_path}, error: {e}")
image_size = (0, 0) image_size = (0, 0)
return image_size return image_size