Fix GLM4-7B-Flash accuracy test configuration, tune Qwen3.6-27B/35B performance test parameters, and harden Ascend NPU multi-node E2E test utilities against pod name format errors. (#32371)
This commit is contained in:
@@ -310,7 +310,9 @@ def create_or_update_configmap(cm_name: str, data: dict, namespace: str):
|
||||
|
||||
def prepare_cm_data(namespace, pod_string):
|
||||
"""Prepare a configmap data: {pod_name: pod_ip} by the running pod's information."""
|
||||
pods = core_api.list_namespaced_pod(namespace=namespace)
|
||||
pods = core_api.list_namespaced_pod(
|
||||
namespace=namespace, label_selector="app=sgl-ascend"
|
||||
)
|
||||
data = {}
|
||||
for pod in pods.items:
|
||||
pod_name = pod.metadata.name
|
||||
|
||||
@@ -426,7 +426,12 @@ def check_role(allowed_roles: Union[str, Iterable[str]]):
|
||||
def launch_pd_mix_node(model_config):
|
||||
logger.info(f"Launch pd mix node start ......")
|
||||
host_name = get_host_name()
|
||||
pod_index = int(host_name.rsplit("-", 1)[-1])
|
||||
last_part = host_name.rsplit("-", 1)[-1]
|
||||
if not last_part.isdigit():
|
||||
raise RuntimeError(
|
||||
f"Unexpected hostname format, expected numeric suffix: {host_name}"
|
||||
)
|
||||
pod_index = int(last_part)
|
||||
|
||||
# Monitor ConfigMap to generate dist-init-addr and node-rank
|
||||
is_ready = False
|
||||
@@ -497,7 +502,12 @@ def launch_pd_mix_node(model_config):
|
||||
def launch_pd_separation_node(model_config):
|
||||
logger.info(f"Launch pd separation node start ......")
|
||||
host_name = get_host_name()
|
||||
pod_index = int(host_name.rsplit("-", 1)[-1])
|
||||
last_part = host_name.rsplit("-", 1)[-1]
|
||||
if not last_part.isdigit():
|
||||
raise RuntimeError(
|
||||
f"Unexpected hostname format, expected numeric suffix: {host_name}"
|
||||
)
|
||||
pod_index = int(last_part)
|
||||
role = "prefill" if "prefill" in host_name else "decode"
|
||||
|
||||
bootstrap_init_port = BOOTSTRAP_INIT_PORT
|
||||
@@ -717,7 +727,14 @@ def launch_router(model_config):
|
||||
node_ip_list.clear()
|
||||
|
||||
for pod_name, pod_ip in configmap.data.items():
|
||||
pod_index = int(pod_name.rsplit("-", 1)[-1])
|
||||
# Skip unexpected entries that don't end with a numeric index
|
||||
last_part = pod_name.rsplit("-", 1)[-1]
|
||||
if not last_part.isdigit():
|
||||
logger.info(
|
||||
"Skipping ConfigMap entry with non-numeric suffix: %s", pod_name
|
||||
)
|
||||
continue
|
||||
pod_index = int(last_part)
|
||||
|
||||
if "prefill" in pod_name:
|
||||
if is_multi_node_prefill_instance:
|
||||
|
||||
Reference in New Issue
Block a user