From 36a3e78af93b93bfa8e6a7c654c935e5f90a63f1 Mon Sep 17 00:00:00 2001 From: Mick Date: Thu, 5 Feb 2026 00:23:31 +0800 Subject: [PATCH] [diffusion] refactor: move model_stages into stages folder (#18248) --- .../multimodal_gen/runtime/pipelines/glm_image.py | 6 +++--- .../runtime/pipelines/mova_pipeline.py | 12 ++++++------ .../multimodal_gen/runtime/pipelines/qwen_image.py | 6 +++--- .../stages/model_specific_stages}/glm_image.py | 0 .../stages/model_specific_stages}/mova.py | 0 .../model_specific_stages}/qwen_image_layered.py | 0 6 files changed, 12 insertions(+), 12 deletions(-) rename python/sglang/multimodal_gen/runtime/{models/model_stages => pipelines_core/stages/model_specific_stages}/glm_image.py (100%) rename python/sglang/multimodal_gen/runtime/{models/model_stages => pipelines_core/stages/model_specific_stages}/mova.py (100%) rename python/sglang/multimodal_gen/runtime/{models/model_stages => pipelines_core/stages/model_specific_stages}/qwen_image_layered.py (100%) diff --git a/python/sglang/multimodal_gen/runtime/pipelines/glm_image.py b/python/sglang/multimodal_gen/runtime/pipelines/glm_image.py index 9e74a197a..4668eaf8b 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines/glm_image.py +++ b/python/sglang/multimodal_gen/runtime/pipelines/glm_image.py @@ -1,6 +1,3 @@ -from sglang.multimodal_gen.runtime.models.model_stages.glm_image import ( - GlmImageBeforeDenoisingStage, -) from sglang.multimodal_gen.runtime.pipelines_core import LoRAPipeline from sglang.multimodal_gen.runtime.pipelines_core.composed_pipeline_base import ( ComposedPipelineBase, @@ -9,6 +6,9 @@ from sglang.multimodal_gen.runtime.pipelines_core.stages import ( DecodingStage, DenoisingStage, ) +from sglang.multimodal_gen.runtime.pipelines_core.stages.model_specific_stages.glm_image import ( + GlmImageBeforeDenoisingStage, +) 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/pipelines/mova_pipeline.py b/python/sglang/multimodal_gen/runtime/pipelines/mova_pipeline.py index 2a8ed13b3..e41353fcc 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines/mova_pipeline.py +++ b/python/sglang/multimodal_gen/runtime/pipelines/mova_pipeline.py @@ -7,12 +7,6 @@ from __future__ import annotations from sglang.multimodal_gen.configs.pipeline_configs.mova import MOVAPipelineConfig from sglang.multimodal_gen.configs.sample.mova import MOVASamplingParams -from sglang.multimodal_gen.runtime.models.model_stages.mova import ( - MOVADecodingStage, - MOVADenoisingStage, - MOVALatentPreparationStage, - MOVATimestepPreparationStage, -) from sglang.multimodal_gen.runtime.pipelines_core.composed_pipeline_base import ( ComposedPipelineBase, ) @@ -22,6 +16,12 @@ from sglang.multimodal_gen.runtime.pipelines_core.stages import ( InputValidationStage, TextEncodingStage, ) +from sglang.multimodal_gen.runtime.pipelines_core.stages.model_specific_stages.mova import ( + MOVADecodingStage, + MOVADenoisingStage, + MOVALatentPreparationStage, + MOVATimestepPreparationStage, +) 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/pipelines/qwen_image.py b/python/sglang/multimodal_gen/runtime/pipelines/qwen_image.py index 2f1dd2913..b69944f14 100644 --- a/python/sglang/multimodal_gen/runtime/pipelines/qwen_image.py +++ b/python/sglang/multimodal_gen/runtime/pipelines/qwen_image.py @@ -3,9 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 from diffusers.image_processor import VaeImageProcessor -from sglang.multimodal_gen.runtime.models.model_stages.qwen_image_layered import ( - QwenImageLayeredBeforeDenoisingStage, -) from sglang.multimodal_gen.runtime.pipelines_core import LoRAPipeline from sglang.multimodal_gen.runtime.pipelines_core.composed_pipeline_base import ( ComposedPipelineBase, @@ -24,6 +21,9 @@ from sglang.multimodal_gen.runtime.pipelines_core.stages import ( from sglang.multimodal_gen.runtime.pipelines_core.stages.conditioning import ( ConditioningStage, ) +from sglang.multimodal_gen.runtime.pipelines_core.stages.model_specific_stages.qwen_image_layered import ( + QwenImageLayeredBeforeDenoisingStage, +) 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/models/model_stages/glm_image.py b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/glm_image.py similarity index 100% rename from python/sglang/multimodal_gen/runtime/models/model_stages/glm_image.py rename to python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/glm_image.py diff --git a/python/sglang/multimodal_gen/runtime/models/model_stages/mova.py b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/mova.py similarity index 100% rename from python/sglang/multimodal_gen/runtime/models/model_stages/mova.py rename to python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/mova.py diff --git a/python/sglang/multimodal_gen/runtime/models/model_stages/qwen_image_layered.py b/python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/qwen_image_layered.py similarity index 100% rename from python/sglang/multimodal_gen/runtime/models/model_stages/qwen_image_layered.py rename to python/sglang/multimodal_gen/runtime/pipelines_core/stages/model_specific_stages/qwen_image_layered.py