[BugFix] Fix SoulX-Singer deploy pipeline registration (#5210)
Signed-off-by: zwhzzz0821 <2831474076@qq.com>
This commit is contained in:
1 parent
74f2742ac2
commit
7d75095b84
4 files changed
+66
No files matched your search
@@ -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
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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.
|
||||
@@ -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",
|
||||
),
|
||||
),
|
||||
)
|
||||
Reference in new issue
Block a user