Initialize is_undersized to False, fix bug in directory resolver

This commit is contained in:
Joel Holdbrooks 2023-01-23 12:44:48 -08:00
parent 685bada570
commit 9491ae430c
2 changed files with 3 additions and 4 deletions

View File

@ -271,6 +271,7 @@ class ImageTrainItem:
else: else:
self.image = image self.image = image
self.is_undersized = False
self.error = None self.error = None
self.__compute_target_width_height() self.__compute_target_width_height()

View File

@ -13,6 +13,7 @@ from data.image_train_item import ImageCaption, ImageTrainItem
class DataResolver: class DataResolver:
def __init__(self, aspects: list[typing.Tuple[int, int]], flip_p=0.0, seed=555): def __init__(self, aspects: list[typing.Tuple[int, int]], flip_p=0.0, seed=555):
self.seed = seed
self.aspects = aspects self.aspects = aspects
self.flip_p = flip_p self.flip_p = flip_p
@ -146,9 +147,6 @@ class DirectoryResolver(DataResolver):
if cur_file_multiplier > 0: if cur_file_multiplier > 0:
if randomizer.random() < cur_file_multiplier: if randomizer.random() < cur_file_multiplier:
items.append(item) items.append(item)
if item:
items.append(item)
return items return items
@staticmethod @staticmethod
@ -230,7 +228,7 @@ def resolve(value: typing.Union[dict, str], aspects: list[float], flip_p: float=
case 'multi': case 'multi':
items = [] items = []
for resolver in value.get('resolvers', []): for resolver in value.get('resolvers', []):
items.extend(resolve(resolver, aspects, flip_p, seed)) items += resolve(resolver, aspects, flip_p, seed)
return items return items
case _: case _:
raise ValueError(f"Cannot resolve training data for resolver value '{resolver}'") raise ValueError(f"Cannot resolve training data for resolver value '{resolver}'")