mirror of
https://github.com/storytold/FineTrainers-Conditioning.git
synced 2026-10-28 08:57:10 +00:00
[core] Fix loading of precomputed conditions and latents (#199)
* support precomputation. * fixes
This commit is contained in:
@@ -353,13 +353,18 @@ class ImageOrVideoDatasetWithResizeAndRectangleCrop(ImageOrVideoDataset):
|
|||||||
|
|
||||||
|
|
||||||
class PrecomputedDataset(Dataset):
|
class PrecomputedDataset(Dataset):
|
||||||
def __init__(self, data_root: str) -> None:
|
def __init__(self, data_root: str, model_name: str = None, cleaned_model_id: str = None) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
self.data_root = Path(data_root)
|
self.data_root = Path(data_root)
|
||||||
|
|
||||||
self.latents_path = self.data_root / PRECOMPUTED_DIR_NAME / PRECOMPUTED_LATENTS_DIR_NAME
|
if model_name and cleaned_model_id:
|
||||||
self.conditions_path = self.data_root / PRECOMPUTED_DIR_NAME / PRECOMPUTED_CONDITIONS_DIR_NAME
|
precomputation_dir = self.data_root / f"{model_name}_{cleaned_model_id}_{PRECOMPUTED_DIR_NAME}"
|
||||||
|
self.latents_path = precomputation_dir / PRECOMPUTED_LATENTS_DIR_NAME
|
||||||
|
self.conditions_path = precomputation_dir / PRECOMPUTED_CONDITIONS_DIR_NAME
|
||||||
|
else:
|
||||||
|
self.latents_path = self.data_root / PRECOMPUTED_DIR_NAME / PRECOMPUTED_LATENTS_DIR_NAME
|
||||||
|
self.conditions_path = self.data_root / PRECOMPUTED_DIR_NAME / PRECOMPUTED_CONDITIONS_DIR_NAME
|
||||||
|
|
||||||
self.latent_conditions = sorted(os.listdir(self.latents_path))
|
self.latent_conditions = sorted(os.listdir(self.latents_path))
|
||||||
self.text_conditions = sorted(os.listdir(self.conditions_path))
|
self.text_conditions = sorted(os.listdir(self.conditions_path))
|
||||||
|
|||||||
@@ -225,7 +225,9 @@ class Trainer:
|
|||||||
if not should_precompute:
|
if not should_precompute:
|
||||||
logger.info("Precomputed conditions and latents found. Loading precomputed data.")
|
logger.info("Precomputed conditions and latents found. Loading precomputed data.")
|
||||||
self.dataloader = torch.utils.data.DataLoader(
|
self.dataloader = torch.utils.data.DataLoader(
|
||||||
PrecomputedDataset(self.args.data_root),
|
PrecomputedDataset(
|
||||||
|
data_root=self.args.data_root, model_name=self.args.model_name, cleaned_model_id=cleaned_model_id
|
||||||
|
),
|
||||||
batch_size=self.args.batch_size,
|
batch_size=self.args.batch_size,
|
||||||
shuffle=True,
|
shuffle=True,
|
||||||
collate_fn=collate_fn,
|
collate_fn=collate_fn,
|
||||||
@@ -353,7 +355,9 @@ class Trainer:
|
|||||||
|
|
||||||
# Update dataloader to use precomputed conditions and latents
|
# Update dataloader to use precomputed conditions and latents
|
||||||
self.dataloader = torch.utils.data.DataLoader(
|
self.dataloader = torch.utils.data.DataLoader(
|
||||||
PrecomputedDataset(self.args.data_root),
|
PrecomputedDataset(
|
||||||
|
data_root=self.args.data_root, model_name=self.args.model_name, cleaned_model_id=cleaned_model_id
|
||||||
|
),
|
||||||
batch_size=self.args.batch_size,
|
batch_size=self.args.batch_size,
|
||||||
shuffle=True,
|
shuffle=True,
|
||||||
collate_fn=collate_fn,
|
collate_fn=collate_fn,
|
||||||
|
|||||||
Reference in New Issue
Block a user