[Test] Fix expansion and example test case for qwen3-omni (#1358)
Signed-off-by: yenuo26 <410167048@qq.com>
This commit is contained in:
1 parent
75770c9309
commit
a42b7487b0
8 files changed
+432
-376
No files matched your search
@@ -46,7 +46,8 @@ def modify_stage(default_path, updates, deletes):
|
||||
|
||||
|
||||
def create_unique_server_params(configs: list[dict[str, Any]]) -> list[tuple[str, str, str]]:
|
||||
unique_params = set()
|
||||
unique_params = []
|
||||
seen = set()
|
||||
for config in configs:
|
||||
test_name = config["test_name"]
|
||||
model = config["server_params"]["model"]
|
||||
@@ -55,9 +56,13 @@ def create_unique_server_params(configs: list[dict[str, Any]]) -> list[tuple[str
|
||||
delete = config["server_params"].get("delete", None)
|
||||
update = config["server_params"].get("update", None)
|
||||
stage_config_path = modify_stage(stage_config_path, update, delete)
|
||||
unique_params.add((test_name, model, stage_config_path))
|
||||
|
||||
return list(unique_params)
|
||||
server_param = (test_name, model, stage_config_path)
|
||||
if server_param not in seen:
|
||||
seen.add(server_param)
|
||||
unique_params.append(server_param)
|
||||
|
||||
return unique_params
|
||||
|
||||
|
||||
def create_test_parameter_mapping(configs: list[dict[str, Any]]) -> dict[str, dict]:
|
||||
@@ -95,6 +100,7 @@ def omni_server(request):
|
||||
print(f"Starting OmniServer with test: {test_name}, model: {model}")
|
||||
|
||||
with OmniServer(model, ["--stage-configs-path", stage_config_path, "--stage-init-timeout", "120"]) as server:
|
||||
server.test_name = test_name
|
||||
print("OmniServer started successfully")
|
||||
yield server
|
||||
print("OmniServer stopping...")
|
||||
@@ -150,10 +156,15 @@ def get_benchmark_params_for_server(test_name: str) -> list:
|
||||
|
||||
def create_benchmark_indices():
|
||||
indices = []
|
||||
for test_name, config_data in server_to_benchmark_mapping.items():
|
||||
params_list = config_data["benchmark_params"]
|
||||
for idx in range(len(params_list)):
|
||||
indices.append((test_name, idx))
|
||||
seen = set()
|
||||
for config in BENCHMARK_CONFIGS:
|
||||
test_name = config["test_name"]
|
||||
if test_name not in seen:
|
||||
seen.add(test_name)
|
||||
params_list = get_benchmark_params_for_server(test_name)
|
||||
for idx in range(len(params_list)):
|
||||
indices.append((test_name, idx))
|
||||
|
||||
return indices
|
||||
|
||||
|
||||
@@ -164,6 +175,10 @@ benchmark_indices = create_benchmark_indices()
|
||||
def benchmark_params(request, omni_server):
|
||||
"""Benchmark parameters fixture with proper parametrization"""
|
||||
test_name, param_index = request.param
|
||||
|
||||
if test_name != omni_server.test_name:
|
||||
pytest.skip(f"Skipping parameter for {test_name} - current server is {omni_server.test_name}")
|
||||
|
||||
all_params = get_benchmark_params_for_server(test_name)
|
||||
|
||||
if not all_params:
|
||||
@@ -172,6 +187,10 @@ def benchmark_params(request, omni_server):
|
||||
if param_index >= len(all_params):
|
||||
raise ValueError(f"No benchmark parameters found for index {param_index} in test: {test_name}")
|
||||
|
||||
current = param_index + 1
|
||||
total = len(all_params)
|
||||
print(f"\n Running benchmark {current}/{total} for {test_name}")
|
||||
|
||||
return {"test_name": test_name, "params": all_params[param_index]}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user