Skip to content
Open
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
4 changes: 2 additions & 2 deletions docs/contributing/ci/CI_5levels.md
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ When you want to add L5-level stability test cases, add or extend the appropriat
"test_name": "test_qwen3_omni_stability",
"server_params": {
"model": "Qwen/Qwen3-Omni-30B-A3B-Instruct",
"stage_config_name": "qwen3_omni.yaml"
"stage_config_name": "qwen3_omni_moe.yaml"
},
"benchmark_params": [
{
Expand Down Expand Up @@ -640,7 +640,7 @@ When you want to add L5-level stability test cases, add or extend the appropriat
| Parameter | Required | Example | Description |
| ----------------- | -------- | ---------------------------------- | ----------------------------------- |
| model | Yes | "Qwen/Qwen3-Omni-30B-A3B-Instruct" | Model name or path |
| stage_config_name | Yes | "qwen3_omni.yaml" | Stage configuration file name |
| stage_config_name | Yes | "qwen3_omni_moe.yaml" | Stage configuration file name |

##### Dynamic Configuration (update/delete)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ When you want to add L4-level ***performance test*** cases, you can refer to the
"test_name": "test_qwen3_omni",
"server_params": {
"model": "Qwen/Qwen3-Omni-30B-A3B-Instruct",
"stage_config_name": "qwen3_omni.yaml"
"stage_config_name": "qwen3_omni_moe.yaml"
},
"benchmark_params": [
{
Expand Down Expand Up @@ -43,7 +43,7 @@ When you want to add L4-level ***performance test*** cases, you can refer to the
| Parameter | Required | Example | Description |
| ----------------- | -------- | ---------------------------------- | ----------------------------- |
| model | Yes | "Qwen/Qwen3-Omni-30B-A3B-Instruct" | Model name or path |
| stage_config_name | Yes | "qwen3_omni.yaml" | Stage configuration file name |
| stage_config_name | Yes | "qwen3_omni_moe.yaml" | Stage configuration file name |

*Dynamic Configuration (update/delete)*

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/ci/tests_style.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ models = ["Qwen/Qwen3-Omni-30B-A3B-Instruct"]

#If you use the default configuration file, you can directly use the following address.
def get_default_config():
return get_deploy_config_path("ci/qwen3_omni_moe.yaml")
return get_deploy_config_path("qwen3_omni_moe.yaml")

#If you need to modify the configuration file, you can use modify_stage_config.
def get_chunk_config():
Expand Down
10 changes: 7 additions & 3 deletions tests/dfx/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from tests.dfx.reliability.helpers import list_remote_process_pids_by_pattern, post_chat_completions_raw
from tests.helpers.runtime import OmniServerParams
from tests.helpers.stage_config import modify_stage_config
from tests.helpers.stage_config import get_deploy_config_path, modify_stage_config
from vllm_omni.platforms import current_omni_platform


Expand Down Expand Up @@ -69,7 +69,7 @@ def _build_serve_args(serve_args: Any) -> list[str]:

def create_unique_server_params(
configs: list[dict[str, Any]],
stage_configs_dir: Path,
stage_configs_dir: Path | None = None,
) -> list[tuple[str, str, str | None, str | None, tuple[str, ...], bool]]:
"""Return one row per unique server configuration.

Expand All @@ -87,7 +87,11 @@ def create_unique_server_params(
model = server_params["model"]
stage_config_name = server_params.get("stage_config_name")
if stage_config_name:
stage_config_path = str(stage_configs_dir / stage_config_name)
stage_config_path = (
str(stage_configs_dir / stage_config_name)
if stage_configs_dir is not None
else get_deploy_config_path(stage_config_name)
)
delete = server_params.get("delete", None)
update = server_params.get("update", None)
stage_config_path = modify_stage(stage_config_path, update, delete)
Expand Down
3 changes: 1 addition & 2 deletions tests/dfx/perf/scripts/run_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ def _get_config_file_from_argv() -> str | None:
OMNI_RESULT_TEMPLATE_PATH = Path(__file__).parent / "result_omni_template.json"


DEPLOY_CONFIGS_DIR = Path(__file__).parent.parent / "deploy"
test_params = create_unique_server_params(BENCHMARK_CONFIGS, DEPLOY_CONFIGS_DIR)
test_params = create_unique_server_params(BENCHMARK_CONFIGS)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yenuo26 raised this on the previous diff — the inline path resolution was moved into conftest's create_unique_server_params instead of using get_deploy_config_path directly here. Worth a quick reply to close the loop.

server_to_benchmark_mapping = create_test_parameter_mapping(BENCHMARK_CONFIGS)

_omni_server_lock = threading.Lock()
Expand Down
Loading
Loading