From 7d75095b842a352031528536b90d8c01b81e2e0a Mon Sep 17 00:00:00 2001 From: Yukim1 <121286183+zwhzzz0821@users.noreply.github.com> Date: Mon, 20 Jul 2026 22:34:42 +0800 Subject: [PATCH] [BugFix] Fix SoulX-Singer deploy pipeline registration (#5210) Signed-off-by: zwhzzz0821 <2831474076@qq.com> --- tests/test_config_factory.py | 10 +++++ vllm_omni/config/pipeline_registry.py | 6 +++ .../models/soulx_singer/__init__.py | 5 +++ .../models/soulx_singer/pipeline.py | 45 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 vllm_omni/model_executor/models/soulx_singer/__init__.py create mode 100644 vllm_omni/model_executor/models/soulx_singer/pipeline.py diff --git a/tests/test_config_factory.py b/tests/test_config_factory.py index b8777dcce..e08349140 100644 --- a/tests/test_config_factory.py +++ b/tests/test_config_factory.py @@ -573,6 +573,16 @@ class TestPipelineDiscovery: return assert Path(get_deploy_config_path(pipeline.default_deploy_config_name)).is_file() + @pytest.mark.parametrize( + "deploy_path", + sorted(_DEPLOY_DIR.glob("*.yaml")), + ids=lambda deploy_path: deploy_path.name, + ) + def test_explicit_deploy_pipeline_is_registered(self, deploy_path): + deploy = load_deploy_config(deploy_path) + if deploy.pipeline is not None: + assert deploy.pipeline in OMNI_PIPELINES + def test_registry_returns_none_for_unknown(self): """Unknown model_types aren't found and resolve to `None`.""" assert "definitely_not_a_real_model" not in OMNI_PIPELINES diff --git a/vllm_omni/config/pipeline_registry.py b/vllm_omni/config/pipeline_registry.py index 941319c9c..0ee96eca4 100644 --- a/vllm_omni/config/pipeline_registry.py +++ b/vllm_omni/config/pipeline_registry.py @@ -86,6 +86,10 @@ from vllm_omni.model_executor.models.qwen2_5_omni.pipeline import ( ) from vllm_omni.model_executor.models.qwen3_omni.pipeline import resolve_qwen3_omni_pipeline from vllm_omni.model_executor.models.qwen3_tts.pipeline import QWEN3_TTS_PIPELINE +from vllm_omni.model_executor.models.soulx_singer.pipeline import ( + SOULXSINGER_SVC_PIPELINE, + SOULXSINGER_SVS_PIPELINE, +) from vllm_omni.model_executor.models.step_audio2.pipeline import ( STEP_AUDIO2_ASR_PIPELINE, STEP_AUDIO2_PIPELINE, @@ -144,6 +148,8 @@ OMNI_PIPELINES: dict[str, PipelineConfig | PipelineResolverFunc] = { "higgs_multimodal_qwen3": HIGGS_AUDIO_V3_PIPELINE, "dynin_omni": DYNIN_OMNI_PIPELINE, "indextts2": INDEXTTS2_PIPELINE, + "soulxsinger_svc": SOULXSINGER_SVC_PIPELINE, + "soulxsinger_svs": SOULXSINGER_SVS_PIPELINE, } diff --git a/vllm_omni/model_executor/models/soulx_singer/__init__.py b/vllm_omni/model_executor/models/soulx_singer/__init__.py new file mode 100644 index 000000000..1ab85a8d3 --- /dev/null +++ b/vllm_omni/model_executor/models/soulx_singer/__init__.py @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: Copyright contributors to the vLLM project + +# Keep this package lightweight. The pipeline registry imports pipeline.py +# directly, while diffusion model classes are loaded lazily from their registry. diff --git a/vllm_omni/model_executor/models/soulx_singer/pipeline.py b/vllm_omni/model_executor/models/soulx_singer/pipeline.py new file mode 100644 index 000000000..4d2420528 --- /dev/null +++ b/vllm_omni/model_executor/models/soulx_singer/pipeline.py @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: Copyright contributors to the vLLM project +"""SoulX-Singer pipeline topologies.""" + +from vllm_omni.config.stage_config import ( + PipelineConfig, + StageExecutionType, + StagePipelineConfig, +) + +SOULXSINGER_SVS_PIPELINE = PipelineConfig( + model_type="soulxsinger_svs", + default_deploy_config_name="soulxsinger_svs.yaml", + model_arch="SoulXSingerPipeline", + hf_architectures=("SoulXSingerPipeline",), + stages=( + StagePipelineConfig( + stage_id=0, + model_stage="dit", + execution_type=StageExecutionType.DIFFUSION, + input_sources=(), + final_output=True, + final_output_type="audio", + model_arch="SoulXSingerPipeline", + ), + ), +) + +SOULXSINGER_SVC_PIPELINE = PipelineConfig( + model_type="soulxsinger_svc", + default_deploy_config_name="soulxsinger_svc.yaml", + model_arch="SoulXSingerSVCPipeline", + hf_architectures=("SoulXSingerSVCPipeline",), + stages=( + StagePipelineConfig( + stage_id=0, + model_stage="dit", + execution_type=StageExecutionType.DIFFUSION, + input_sources=(), + final_output=True, + final_output_type="audio", + model_arch="SoulXSingerSVCPipeline", + ), + ), +)