ci: merge CPU default and stage-a-cpu-only suites (#20992)

2026-03-20 00:04:55 -07:00
parent 95327458ee
commit cea79530f8
54 changed files with 56 additions and 55 deletions
@@ -28,7 +28,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import ParallelAxis, TokenLayou
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 class TestExecuteSubPlans:
@@ -25,7 +25,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import TokenLayout
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _make_meta(
@@ -22,7 +22,7 @@ from sglang.srt.debug_utils.comparator.aligner.unsharder.types import (
 from sglang.srt.debug_utils.comparator.dims_spec import ParallelAxis
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _zigzag_order(cp_size: int) -> list[int]:
@@ -24,7 +24,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestComputeReordererPlans:
@@ -13,7 +13,7 @@ from sglang.srt.debug_utils.comparator.log_sink import log_sink
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 class TestComputeAxisAlignerPlan:
@@ -19,7 +19,7 @@ from sglang.srt.debug_utils.comparator.log_sink import LogSink
 from sglang.srt.debug_utils.comparator.output_types import ErrorLog, InfoLog
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)

 _sglang_plugin = _SGLangPlugin()
 _megatron_plugin = _MegatronPlugin()
@@ -16,7 +16,7 @@ from sglang.srt.debug_utils.comparator.aligner.token_aligner.smart.types import
 from sglang.srt.debug_utils.comparator.dims_spec import TokenLayout
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)

 _sglang_plugin = _SGLangPlugin()
 _megatron_plugin = _MegatronPlugin()
@@ -9,7 +9,7 @@ from sglang.srt.debug_utils.comparator.aligner.token_aligner.concat_steps import
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 class TestExecuteConcat:
@@ -25,7 +25,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import TokenLayout
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _named(tensor: torch.Tensor, names: list[str]) -> torch.Tensor:
@@ -23,7 +23,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import TokenLayout
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)


 class TestBuildTokenIndexSGLangThd:
@@ -14,7 +14,7 @@ from sglang.srt.debug_utils.comparator.aligner.token_aligner.smart.aux_plugins i
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _save_pt(
@@ -27,7 +27,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 from sglang.srt.debug_utils.comparator.output_types import ReplicatedCheckResult
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _name_tensors(
@@ -9,7 +9,7 @@ from sglang.srt.debug_utils.comparator.aligner.unsharder.types import AxisInfo
 from sglang.srt.debug_utils.comparator.dims_spec import ParallelAxis
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestNormalizeParallelInfo:
@@ -14,7 +14,7 @@ from sglang.srt.debug_utils.comparator.aligner.unsharder.types import (
 from sglang.srt.debug_utils.comparator.dims_spec import ParallelAxis, parse_dims
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestComputeUnsharderPlan:
@@ -12,7 +12,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=5, suite="default", nightly=True)
+register_cpu_ci(est_time=5, suite="stage-a-cpu-only", nightly=True)


 class TestParseDim:
@@ -15,7 +15,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=5, suite="default", nightly=True)
+register_cpu_ci(est_time=5, suite="stage-a-cpu-only", nightly=True)


 class TestSingletonDimUtilFilterOut:
@@ -13,7 +13,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=5, suite="default", nightly=True)
+register_cpu_ci(est_time=5, suite="stage-a-cpu-only", nightly=True)


 class TestFindDimIndex:
@@ -9,7 +9,7 @@ from sglang.srt.debug_utils.comparator.dims_spec import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=5, suite="default", nightly=True)
+register_cpu_ci(est_time=5, suite="stage-a-cpu-only", nightly=True)


 class TestDimConstants:
@@ -13,7 +13,7 @@ from sglang.srt.debug_utils.comparator.tensor_comparator.comparator import (
 from sglang.srt.debug_utils.comparator.tensor_comparator.types import DiffInfo
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=20, suite="default", nightly=True)
+register_cpu_ci(est_time=20, suite="stage-a-cpu-only", nightly=True)


 class TestComputeTensorStats:
@@ -55,7 +55,7 @@ from sglang.srt.debug_utils.comparator.tensor_comparator.types import (
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 # Snapshot strings below are intentionally spelled out in full per test.
@@ -21,7 +21,7 @@ from sglang.srt.debug_utils.comparator.tensor_comparator.types import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _make_stats(**overrides) -> TensorStats:
@@ -10,7 +10,7 @@ from sglang.srt.debug_utils.comparator.log_sink import LogSink
 from sglang.srt.debug_utils.comparator.output_types import ErrorLog
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _save_tensor(
@@ -13,7 +13,7 @@ from sglang.srt.debug_utils.comparator.bundle_matcher import (
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _make_row(
@@ -20,7 +20,7 @@ from sglang.srt.debug_utils.comparator.output_types import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _render_rich(renderable: object) -> str:
@@ -11,7 +11,7 @@ from sglang.srt.debug_utils.comparator.dp_utils import (
 from sglang.srt.debug_utils.dump_loader import ValueWithMeta
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=15, suite="default", nightly=True)
+register_cpu_ci(est_time=15, suite="stage-a-cpu-only", nightly=True)


 def _make_sglang_meta(
@@ -7,7 +7,7 @@ import torch
 from sglang.srt.debug_utils.dump_loader import read_tokenizer_path
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _save_pt(
@@ -30,7 +30,7 @@ from sglang.srt.debug_utils.comparator.output_types import (
 from sglang.srt.debug_utils.dumper import DumperConfig, _Dumper, _RecomputeStatus
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)

 _FIXED_EXP_NAME = "my_exp_name"

@@ -11,7 +11,7 @@ from sglang.srt.debug_utils.comparator.output_types import (
 from sglang.srt.debug_utils.comparator.report_sink import report_sink
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _make_error_log(**overrides) -> ErrorLog:
@@ -23,7 +23,7 @@ import torch

 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=60, suite="default", nightly=True)
+register_cpu_ci(est_time=60, suite="stage-a-cpu-only", nightly=True)

 _PUBLISH_DIR: Path = Path("/tmp/comparator_manual_verify")
 _PNG_MAGIC: bytes = b"\x89PNG"
@@ -16,7 +16,7 @@ from sglang.srt.debug_utils.comparator.meta_overrider import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 # ───────────────────── Unit: MetaOverrideRule ─────────────────────
@@ -44,7 +44,7 @@ from sglang.srt.debug_utils.comparator.tensor_comparator.types import (
 from sglang.srt.debug_utils.comparator.utils import Pair, _check_equal_lengths
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestCheckEqualLengths:
@@ -49,7 +49,7 @@ from sglang.srt.debug_utils.comparator.output_types import (
 from sglang.srt.debug_utils.comparator.utils import Pair
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 def _render_rich(renderable: object) -> str:
@@ -15,7 +15,7 @@ from sglang.srt.debug_utils.comparator.tensor_comparator.comparator import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)

 _PNG_MAGIC: bytes = b"\x89PNG"

@@ -3,7 +3,7 @@ import pytest
 from sglang.srt.debug_utils.comparator.preset import PRESETS, expand_preset
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=5, suite="default", nightly=True)
+register_cpu_ci(est_time=5, suite="stage-a-cpu-only", nightly=True)


 class TestExpandPreset:
@@ -17,7 +17,7 @@ from sglang.srt.debug_utils.comparator.utils import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestCalcRelDiff:
@@ -10,7 +10,7 @@ from sglang.srt.debug_utils.comparator.visualizer.preprocessing import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)


 class TestPreprocessTensor:
@@ -7,7 +7,10 @@ from typing import Optional
 from sglang.test.ci.ci_register import register_cpu_ci

 register_cpu_ci(
-    est_time=0, suite="default", nightly=True, disabled="helper module, no tests"
+    est_time=0,
+    suite="stage-a-cpu-only",
+    nightly=True,
+    disabled="helper module, no tests",
 )

 from sglang.srt.debug_utils.comparator.tensor_comparator.types import (
@@ -10,7 +10,7 @@ from sglang.srt.debug_utils.source_patcher.code_patcher import (
 from sglang.srt.debug_utils.source_patcher.types import EditSpec, PatchSpec
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)

 SAMPLE_MODULE_NAME = "_source_patcher_test_fixtures.sample_module"

@@ -8,7 +8,7 @@ import yaml
 from sglang.srt.debug_utils.dumper import DumperConfig, _Dumper
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)

 SAMPLE_MODULE_NAME = "_source_patcher_test_fixtures.sample_module"

@@ -5,7 +5,7 @@ from sglang.srt.debug_utils.source_patcher.source_editor import apply_edits
 from sglang.srt.debug_utils.source_patcher.types import EditSpec, PatchApplicationError
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=10, suite="default", nightly=True)
+register_cpu_ci(est_time=10, suite="stage-a-cpu-only", nightly=True)


 class TestApplyEdits:
@@ -14,7 +14,7 @@ from sglang.srt.debug_utils.dump_comparator import (
 from sglang.srt.debug_utils.dumper import DumperConfig, _Dumper
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)


 # ----------------------------- Unit tests -----------------------------
@@ -15,7 +15,7 @@ from sglang.srt.debug_utils.dump_loader import (
 )
 from sglang.test.ci.ci_register import register_cpu_ci

-register_cpu_ci(est_time=30, suite="default", nightly=True)
+register_cpu_ci(est_time=30, suite="stage-a-cpu-only", nightly=True)


 class TestReadMeta:
@@ -25,7 +25,7 @@ from sglang.srt.debug_utils.schedule_simulator import (
 from sglang.test.ci.ci_register import register_cpu_ci
 from sglang.test.test_utils import CustomTestCase

-register_cpu_ci(est_time=120, suite="default", nightly=True)
+register_cpu_ci(est_time=120, suite="stage-a-cpu-only", nightly=True)


 # ==================== Non-E2E Tests ====================