Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/dataLoader/ChromaBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.CHROMA_1)
class ChromaBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -154,5 +155,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)

factory.register(BaseDataLoader, ChromaBaseDataLoader, ModelType.CHROMA_1)
4 changes: 1 addition & 3 deletions modules/dataLoader/ErnieBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.ERNIE)
class ErnieBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -133,6 +134,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)


factory.register(BaseDataLoader, ErnieBaseDataLoader, ModelType.ERNIE)
4 changes: 1 addition & 3 deletions modules/dataLoader/Flux2BaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.FLUX_2)
class Flux2BaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -161,6 +162,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)


factory.register(BaseDataLoader, Flux2BaseDataLoader, ModelType.FLUX_2)
5 changes: 2 additions & 3 deletions modules/dataLoader/FluxBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.FLUX_DEV_1)
@factory.register(BaseDataLoader, ModelType.FLUX_FILL_DEV_1)
class FluxBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -181,6 +183,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)

factory.register(BaseDataLoader, FluxBaseDataLoader, ModelType.FLUX_DEV_1)
factory.register(BaseDataLoader, FluxBaseDataLoader, ModelType.FLUX_FILL_DEV_1)
3 changes: 1 addition & 2 deletions modules/dataLoader/HiDreamBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.HI_DREAM_FULL)
class HiDreamBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -219,5 +220,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)

factory.register(BaseDataLoader, HiDreamBaseDataLoader, ModelType.HI_DREAM_FULL)
3 changes: 1 addition & 2 deletions modules/dataLoader/HunyuanVideoBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.HUNYUAN_VIDEO)
class HunyuanVideoBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -183,5 +184,3 @@ def _create_dataset(
allow_video_files=True,
vae_frame_dim=True,
)

factory.register(BaseDataLoader, HunyuanVideoBaseDataLoader, ModelType.HUNYUAN_VIDEO)
5 changes: 2 additions & 3 deletions modules/dataLoader/PixArtAlphaBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.PIXART_ALPHA)
@factory.register(BaseDataLoader, ModelType.PIXART_SIGMA)
class PixArtAlphaBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -159,6 +161,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=16,
)

factory.register(BaseDataLoader, PixArtAlphaBaseDataLoader, ModelType.PIXART_ALPHA)
factory.register(BaseDataLoader, PixArtAlphaBaseDataLoader, ModelType.PIXART_SIGMA)
3 changes: 1 addition & 2 deletions modules/dataLoader/QwenBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.QWEN)
class QwenBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -166,5 +167,3 @@ def _create_dataset(
allow_video_files=False, #don't allow video files, but...
vae_frame_dim=True, #...Qwen has a video-capable VAE. convert images to video dimensions
)

factory.register(BaseDataLoader, QwenBaseDataLoader, ModelType.QWEN)
3 changes: 1 addition & 2 deletions modules/dataLoader/SanaBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.SANA)
class SanaBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -152,5 +153,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=32,
)

factory.register(BaseDataLoader, SanaBaseDataLoader, ModelType.SANA)
3 changes: 1 addition & 2 deletions modules/dataLoader/StableDiffusion3BaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_35)
class StableDiffusion3BaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -198,5 +199,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)

factory.register(BaseDataLoader, StableDiffusion3BaseDataLoader, ModelType.STABLE_DIFFUSION_35)
17 changes: 8 additions & 9 deletions modules/dataLoader/StableDiffusionBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_15)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_15_INPAINTING)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_BASE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_INPAINTING)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_DEPTH)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_21)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_21_BASE)
class StableDiffusionBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -164,12 +172,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=8,
)

factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_15)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_15_INPAINTING)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_20)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_20_BASE)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_20_INPAINTING)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_20_DEPTH)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_21)
factory.register(BaseDataLoader, StableDiffusionBaseDataLoader, ModelType.STABLE_DIFFUSION_21_BASE)
17 changes: 8 additions & 9 deletions modules/dataLoader/StableDiffusionFineTuneVaeDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@
import torch


@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_15, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_15_INPAINTING, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_BASE, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_INPAINTING, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_20_DEPTH, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_21, TrainingMethod.FINE_TUNE_VAE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_21_BASE, TrainingMethod.FINE_TUNE_VAE)
class StableDiffusionFineTuneVaeDataLoader(BaseDataLoader):
def _setup_cache_device(
self,
Expand Down Expand Up @@ -293,12 +301,3 @@ def _create_dataset(
train_progress,
is_validation,
)

factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_15, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_15_INPAINTING, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_20, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_20_BASE, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_20_INPAINTING, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_20_DEPTH, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_21, TrainingMethod.FINE_TUNE_VAE)
factory.register(BaseDataLoader, StableDiffusionFineTuneVaeDataLoader, ModelType.STABLE_DIFFUSION_21_BASE, TrainingMethod.FINE_TUNE_VAE)
4 changes: 2 additions & 2 deletions modules/dataLoader/StableDiffusionXLBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_XL_10_BASE)
@factory.register(BaseDataLoader, ModelType.STABLE_DIFFUSION_XL_10_BASE_INPAINTING)
class StableDiffusionXLBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -176,5 +178,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)
factory.register(BaseDataLoader, StableDiffusionXLBaseDataLoader, ModelType.STABLE_DIFFUSION_XL_10_BASE)
factory.register(BaseDataLoader, StableDiffusionXLBaseDataLoader, ModelType.STABLE_DIFFUSION_XL_10_BASE_INPAINTING)
5 changes: 2 additions & 3 deletions modules/dataLoader/WuerstchenBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.WUERSTCHEN_2)
@factory.register(BaseDataLoader, ModelType.STABLE_CASCADE_1)
class WuerstchenBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -156,6 +158,3 @@ def _create_dataset(
aspect_bucketing_quantization=128,
supports_inpainting=False,
)

factory.register(BaseDataLoader, WuerstchenBaseDataLoader, ModelType.WUERSTCHEN_2)
factory.register(BaseDataLoader, WuerstchenBaseDataLoader, ModelType.STABLE_CASCADE_1)
3 changes: 1 addition & 2 deletions modules/dataLoader/ZImageBaseDataLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from mgds.pipelineModules.Tokenize import Tokenize


@factory.register(BaseDataLoader, ModelType.Z_IMAGE)
class ZImageBaseDataLoader(
BaseDataLoader,
DataLoaderText2ImageMixin,
Expand Down Expand Up @@ -153,5 +154,3 @@ def _create_dataset(
config, model, model_setup, train_progress, is_validation,
aspect_bucketing_quantization=64,
)

factory.register(BaseDataLoader, ZImageBaseDataLoader, ModelType.Z_IMAGE)
3 changes: 1 addition & 2 deletions modules/modelSampler/ChromaSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.CHROMA_1)
class ChromaSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -189,5 +190,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, ChromaSampler, ModelType.CHROMA_1)
4 changes: 1 addition & 3 deletions modules/modelSampler/ErnieSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.ERNIE)
class ErnieSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -162,6 +163,3 @@ def sample(
)

on_sample(sampler_output)


factory.register(BaseModelSampler, ErnieSampler, ModelType.ERNIE)
3 changes: 1 addition & 2 deletions modules/modelSampler/Flux2Sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.FLUX_2)
class Flux2Sampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -190,5 +191,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, Flux2Sampler, ModelType.FLUX_2)
5 changes: 2 additions & 3 deletions modules/modelSampler/FluxSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.FLUX_DEV_1)
@factory.register(BaseModelSampler, ModelType.FLUX_FILL_DEV_1)
class FluxSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -450,6 +452,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, FluxSampler, ModelType.FLUX_DEV_1)
factory.register(BaseModelSampler, FluxSampler, ModelType.FLUX_FILL_DEV_1)
3 changes: 1 addition & 2 deletions modules/modelSampler/HiDreamSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.HI_DREAM_FULL)
class HiDreamSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -192,5 +193,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, HiDreamSampler, ModelType.HI_DREAM_FULL)
3 changes: 1 addition & 2 deletions modules/modelSampler/HunyuanVideoSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.HUNYUAN_VIDEO)
class HunyuanVideoSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -209,5 +210,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, HunyuanVideoSampler, ModelType.HUNYUAN_VIDEO)
5 changes: 2 additions & 3 deletions modules/modelSampler/PixArtAlphaSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.PIXART_ALPHA)
@factory.register(BaseModelSampler, ModelType.PIXART_SIGMA)
class PixArtAlphaSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -191,6 +193,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, PixArtAlphaSampler, ModelType.PIXART_ALPHA)
factory.register(BaseModelSampler, PixArtAlphaSampler, ModelType.PIXART_SIGMA)
3 changes: 1 addition & 2 deletions modules/modelSampler/QwenSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.QWEN)
class QwenSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -188,5 +189,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, QwenSampler, ModelType.QWEN)
3 changes: 1 addition & 2 deletions modules/modelSampler/SanaSampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.SANA)
class SanaSampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -177,5 +178,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, SanaSampler, ModelType.SANA)
5 changes: 2 additions & 3 deletions modules/modelSampler/StableDiffusion3Sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
from tqdm import tqdm


@factory.register(BaseModelSampler, ModelType.STABLE_DIFFUSION_3)
@factory.register(BaseModelSampler, ModelType.STABLE_DIFFUSION_35)
class StableDiffusion3Sampler(BaseModelSampler):
def __init__(
self,
Expand Down Expand Up @@ -191,6 +193,3 @@ def sample(
)

on_sample(sampler_output)

factory.register(BaseModelSampler, StableDiffusion3Sampler, ModelType.STABLE_DIFFUSION_3)
factory.register(BaseModelSampler, StableDiffusion3Sampler, ModelType.STABLE_DIFFUSION_35)
Loading