diff --git a/python/sglang/multimodal_gen/runtime/loader/adapter_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/adapter_loader.py similarity index 95% rename from python/sglang/multimodal_gen/runtime/loader/adapter_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/adapter_loader.py index 22b26dca2..b339a005d 100644 --- a/python/sglang/multimodal_gen/runtime/loader/adapter_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/adapter_loader.py @@ -1,7 +1,9 @@ from safetensors.torch import load_file as safetensors_load_file from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.utils import ( _list_safetensors_files, set_default_torch_dtype, diff --git a/python/sglang/multimodal_gen/runtime/loader/bridge_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/bridge_loader.py similarity index 97% rename from python/sglang/multimodal_gen/runtime/loader/bridge_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/bridge_loader.py index 3d580851b..da084ec19 100644 --- a/python/sglang/multimodal_gen/runtime/loader/bridge_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/bridge_loader.py @@ -3,7 +3,9 @@ from copy import deepcopy import torch from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.fsdp_load import maybe_load_fsdp_model from sglang.multimodal_gen.runtime.loader.utils import _list_safetensors_files from sglang.multimodal_gen.runtime.models.registry import ModelRegistry diff --git a/python/sglang/multimodal_gen/runtime/loader/component_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/component_loader.py similarity index 98% rename from python/sglang/multimodal_gen/runtime/loader/component_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/component_loader.py index b16966f7a..25efaa515 100644 --- a/python/sglang/multimodal_gen/runtime/loader/component_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/component_loader.py @@ -190,7 +190,10 @@ class ComponentLoader(ABC): return package_dir = os.path.dirname(__file__) - package_name = __package__ or "sglang.multimodal_gen.runtime.loader" + package_name = ( + __package__ + or "sglang.multimodal_gen.runtime.loader.component_loaders.component_loaders" + ) for _, name, _ in pkgutil.iter_modules([package_dir]): # skip importing self to avoid circular dependency issues diff --git a/python/sglang/multimodal_gen/runtime/loader/image_encoder_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/image_encoder_loader.py similarity index 95% rename from python/sglang/multimodal_gen/runtime/loader/image_encoder_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/image_encoder_loader.py index 260617302..e6f36976d 100644 --- a/python/sglang/multimodal_gen/runtime/loader/image_encoder_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/image_encoder_loader.py @@ -2,7 +2,9 @@ import json import os from sglang.multimodal_gen.configs.models import ModelConfig -from sglang.multimodal_gen.runtime.loader.text_encoder_loader import TextEncoderLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.text_encoder_loader import ( + TextEncoderLoader, +) from sglang.multimodal_gen.runtime.loader.utils import _clean_hf_config_inplace from sglang.multimodal_gen.runtime.server_args import ServerArgs from sglang.multimodal_gen.runtime.utils.logging_utils import init_logger diff --git a/python/sglang/multimodal_gen/runtime/loader/scheduler_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/scheduler_loader.py similarity index 91% rename from python/sglang/multimodal_gen/runtime/loader/scheduler_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/scheduler_loader.py index eafe27d58..310540fc7 100644 --- a/python/sglang/multimodal_gen/runtime/loader/scheduler_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/scheduler_loader.py @@ -1,4 +1,6 @@ -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.models.registry import ModelRegistry from sglang.multimodal_gen.runtime.server_args import ServerArgs from sglang.multimodal_gen.runtime.utils.hf_diffusers_utils import ( diff --git a/python/sglang/multimodal_gen/runtime/loader/text_encoder_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/text_encoder_loader.py similarity index 99% rename from python/sglang/multimodal_gen/runtime/loader/text_encoder_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/text_encoder_loader.py index c52917eb3..4e275d86b 100644 --- a/python/sglang/multimodal_gen/runtime/loader/text_encoder_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/text_encoder_loader.py @@ -16,7 +16,9 @@ from sglang.multimodal_gen.configs.pipeline_configs.qwen_image import ( QwenImageEditPipelineConfig, ) from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.fsdp_load import shard_model from sglang.multimodal_gen.runtime.loader.utils import ( _clean_hf_config_inplace, diff --git a/python/sglang/multimodal_gen/runtime/loader/transformer_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/transformer_loader.py similarity index 97% rename from python/sglang/multimodal_gen/runtime/loader/transformer_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/transformer_loader.py index ddfe3b288..ee7b33424 100644 --- a/python/sglang/multimodal_gen/runtime/loader/transformer_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/transformer_loader.py @@ -4,7 +4,9 @@ from copy import deepcopy import torch from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.fsdp_load import maybe_load_fsdp_model from sglang.multimodal_gen.runtime.loader.utils import ( _list_safetensors_files, diff --git a/python/sglang/multimodal_gen/runtime/loader/vae_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vae_loader.py similarity index 97% rename from python/sglang/multimodal_gen/runtime/loader/vae_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/vae_loader.py index 8b8bccd69..9c32f143c 100644 --- a/python/sglang/multimodal_gen/runtime/loader/vae_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vae_loader.py @@ -4,7 +4,9 @@ import os from safetensors.torch import load_file as safetensors_load_file from sglang.multimodal_gen.configs.models import ModelConfig -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.utils import ( _list_safetensors_files, set_default_torch_dtype, diff --git a/python/sglang/multimodal_gen/runtime/loader/vl_encoder_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vl_encoder_loader.py similarity index 93% rename from python/sglang/multimodal_gen/runtime/loader/vl_encoder_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/vl_encoder_loader.py index a962682d2..8d60bfdae 100644 --- a/python/sglang/multimodal_gen/runtime/loader/vl_encoder_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vl_encoder_loader.py @@ -1,7 +1,9 @@ from typing import Any from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.server_args import ServerArgs from sglang.multimodal_gen.runtime.utils.hf_diffusers_utils import get_hf_config diff --git a/python/sglang/multimodal_gen/runtime/loader/vocoder_loader.py b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vocoder_loader.py similarity index 96% rename from python/sglang/multimodal_gen/runtime/loader/vocoder_loader.py rename to python/sglang/multimodal_gen/runtime/loader/component_loaders/vocoder_loader.py index f9ab73df6..40c6dbbf3 100644 --- a/python/sglang/multimodal_gen/runtime/loader/vocoder_loader.py +++ b/python/sglang/multimodal_gen/runtime/loader/component_loaders/vocoder_loader.py @@ -1,7 +1,9 @@ from safetensors.torch import load_file as safetensors_load_file from sglang.multimodal_gen.configs.models import ModelConfig -from sglang.multimodal_gen.runtime.loader.component_loader import ComponentLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( + ComponentLoader, +) from sglang.multimodal_gen.runtime.loader.utils import ( _list_safetensors_files, set_default_torch_dtype, diff --git a/python/sglang/multimodal_gen/runtime/pipelines_core/composed_pipeline_base.py b/python/sglang/multimodal_gen/runtime/pipelines_core/composed_pipeline_base.py index 0b3004ad6..82e01de79 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines_core/composed_pipeline_base.py +++ b/python/sglang/multimodal_gen/runtime/pipelines_core/composed_pipeline_base.py @@ -14,7 +14,7 @@ from typing import Any, cast import torch from tqdm import tqdm -from sglang.multimodal_gen.runtime.loader.component_loader import ( +from sglang.multimodal_gen.runtime.loader.component_loaders.component_loader import ( PipelineComponentLoader, ) from sglang.multimodal_gen.runtime.pipelines_core.executors.pipeline_executor import ( diff --git a/python/sglang/multimodal_gen/runtime/pipelines_core/stages/decoding.py b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/decoding.py index 7b51e8173..ed676d79b 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines_core/stages/decoding.py +++ b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/decoding.py @@ -10,7 +10,7 @@ import weakref import torch from sglang.multimodal_gen.runtime.distributed import get_local_torch_device -from sglang.multimodal_gen.runtime.loader.vae_loader import VAELoader +from sglang.multimodal_gen.runtime.loader.component_loaders.vae_loader import VAELoader from sglang.multimodal_gen.runtime.models.vaes.common import ParallelTiledVAE from sglang.multimodal_gen.runtime.pipelines_core.schedule_batch import OutputBatch, Req from sglang.multimodal_gen.runtime.pipelines_core.stages.base import ( diff --git a/python/sglang/multimodal_gen/runtime/pipelines_core/stages/denoising.py b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/denoising.py index c5dabf507..e58040b60 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines_core/stages/denoising.py +++ b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/denoising.py @@ -55,7 +55,9 @@ from sglang.multimodal_gen.runtime.layers.attention.STA_configuration import ( configure_sta, save_mask_search_results, ) -from sglang.multimodal_gen.runtime.loader.transformer_loader import TransformerLoader +from sglang.multimodal_gen.runtime.loader.component_loaders.transformer_loader import ( + TransformerLoader, +) from sglang.multimodal_gen.runtime.managers.forward_context import set_forward_context from sglang.multimodal_gen.runtime.pipelines_core.schedule_batch import Req from sglang.multimodal_gen.runtime.pipelines_core.stages.base import (