Skip to content

Commit 80fd2cf

Browse files
committed
Merge remote-tracking branch 'origin/PR-0730-metax-graph-serving' into dev-zyh
2 parents 751d862 + 699bb58 commit 80fd2cf

4 files changed

Lines changed: 107 additions & 2 deletions

File tree

.github/scripts/generate_matrix.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ def resolve_task_dir(task_key: str) -> str:
5858
return TASK_DIR_MAP.get(task_key, task_key)
5959

6060

61+
def resolve_e2e_timeout(config: dict, device: str, task_dir: str) -> int:
62+
"""Return timeout for an E2E task, allowing platform YAML overrides."""
63+
default = DEFAULT_TIMEOUT.get(task_dir, 60)
64+
timeouts = (
65+
config.get(device, {}).get("tests", {}).get("timeouts", {}).get("e2e", {})
66+
)
67+
value = timeouts.get(task_dir, default)
68+
return int(value)
69+
70+
6171
def get_device_sections(config: dict) -> list[str]:
6272
"""Return device section names present in the config.
6373
@@ -108,7 +118,7 @@ def build_e2e_matrix(
108118
# Build one matrix entry per (task, device) group
109119
entries = []
110120
for (task_dir, device), case_list in groups.items():
111-
timeout = DEFAULT_TIMEOUT.get(task_dir, 60)
121+
timeout = resolve_e2e_timeout(config, device, task_dir)
112122
entries.append(
113123
{
114124
"task": task_dir,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2026 FlagOS Contributors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Qwen3.6-27B MetaX smoke configuration (TP=2, graph).
16+
17+
llm:
18+
model: "/data/models/Qwen/Qwen3.6-27B"
19+
tensor_parallel_size: 2
20+
pipeline_parallel_size: 1
21+
max_model_len: 8192
22+
gpu_memory_utilization: 0.90
23+
enforce_eager: false
24+
trust_remote_code: false
25+
disable_custom_all_reduce: true
26+
27+
generate:
28+
prompts:
29+
- "Introduce yourself,please"
30+
sampling:
31+
max_tokens: 100
32+
temperature: 0.0
33+
34+
serve:
35+
served_model_name: "qwen"
36+
startup_retries: 300
37+
endpoints: ["chat"]
38+
stream: false
39+
max_tokens: 256
40+
chat_messages:
41+
- role: "user"
42+
content: "Introduce yourself,please"
43+
sampling:
44+
temperature: 0.0
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2026 FlagOS Contributors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Qwen3.6-35B-A3B MetaX smoke configuration (TP=2, graph).
16+
17+
llm:
18+
model: "/data/models/Qwen/Qwen3.6-35B-A3B"
19+
tensor_parallel_size: 2
20+
pipeline_parallel_size: 1
21+
max_model_len: 8192
22+
gpu_memory_utilization: 0.90
23+
enforce_eager: false
24+
trust_remote_code: false
25+
disable_custom_all_reduce: true
26+
27+
generate:
28+
prompts:
29+
- "Introduce yourself,please"
30+
sampling:
31+
max_tokens: 100
32+
temperature: 0.0
33+
34+
serve:
35+
served_model_name: "qwen"
36+
startup_retries: 300
37+
endpoints: ["chat"]
38+
stream: false
39+
max_tokens: 256
40+
chat_messages:
41+
- role: "user"
42+
content: "Introduce yourself,please"
43+
sampling:
44+
temperature: 0.0

tests/platforms/metax.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,14 @@ c550:
4242
inference:
4343
qwen3_6: ["27b_tp2_eager_metax"]
4444
serving:
45-
qwen3_6: ["35b_a3b_tp2_eager_metax"]
45+
qwen3_6:
46+
- "27b_tp2_eager_metax"
47+
- "35b_a3b_tp2_eager_metax"
48+
- "27b_tp2_graph_metax"
49+
- "35b_a3b_tp2_graph_metax"
50+
timeouts:
51+
e2e:
52+
serving: 180
4653
functional:
4754
include: "*"
4855
exclude: []

0 commit comments

Comments
 (0)