[None][ci] tighten VisualGen CBTS routing

Move remaining public VisualGen config imports to the public args module so _torch.visual_gen.config stays internal to VisualGen.

Place scheduled VisualGen tests, golden data, and perf helpers under dedicated visual_gen test paths, then match VG CBTS blocks by that namespace. Public tensorrt_llm/visual_gen changes still fall back because those symbols are imported by non-VG startup paths.

Signed-off-by: Zhenhua Wang <zhenhuaw@nvidia.com>

Author: zhenhuaw-me

jenkins/scripts/cbts/rules/README.md

@@ -162,33 +162,30 @@ still force VG stages.
 Block selection — entry-pattern based only:
 VisualGen has no `condition.terms.backend` of its own; VG entries
 live in `backend: pytorch` and `backend: tensorrt` blocks. A block
-"belongs to VG" iff any of its `tests:` entries matches one of the
-three stable VG path families:
-
-- `unittest/_torch/visual_gen/...` (28 entries)
-- `examples/test_visual_gen.py...` (1 entry)
-- `visual_gen/test_visual_gen_benchmark.py` (1 entry)
+"belongs to VG" iff any of its `tests:` entries lives under a dedicated
+`visual_gen/` test path.
 
 For each matched block, `block_filters` keeps only the VG entries.
 Non-VG siblings in the same block stay governed by other rules.
 
-Outward-facing fallback: unlike AutoDeploy, VG is imported eagerly
-(top-level `from tensorrt_llm._torch.visual_gen.config import ...`
-in `commands/serve.py`, `commands/utils.py`,
-`serve/openai_server.py`). The 5 files that define / re-export the
-public API symbols (`VisualGenArgs`, `ParallelConfig`, `VisualGen`,
-`VisualGenParams`) are listed in `_VG_OUTWARD_FILES`; touching any
-of them claims the changed files but emits `scope=None` so Selector
-falls back to baseline. This protects trtllm-serve / trtllm-bench
-startup paths from VG signature drift slipping through pre-merge.
+Outward-facing fallback: unlike AutoDeploy, VG public symbols are
+imported eagerly by non-VG startup paths such as `commands/serve.py`,
+`commands/utils.py`, and `serve/openai_server.py`. The public API
+package prefix (`tensorrt_llm/visual_gen/`) is listed in
+`_VG_OUTWARD_PREFIXES`; touching any non-doc file under it claims the
+changed files but emits `scope=None` so Selector falls back to baseline.
+This protects trtllm-serve / trtllm-bench startup paths from VG
+signature drift slipping through pre-merge.
 
 Outcomes:
 
 - No VG source files in the diff → rule returns `None`.
-- VG source touched, all internal → `scope=visualgenonly`; sanity
-  off (VG changes don't affect wheel sanity); perfsanity on iff a
-  matched block lives in `l0_perf` or `*perf_sanity*`.
-- VG source touched, any outward-facing file → `scope=None`
+- VG source touched, all internal (`examples/visual_gen/**` or
+  `tensorrt_llm/_torch/visual_gen/**`) → `scope=visualgenonly`;
+  sanity off (VG changes don't affect wheel sanity); perfsanity on iff
+  a matched block lives in `l0_perf` or `*perf_sanity*`.
+- VG source touched, any outward-facing path under
+  `tensorrt_llm/visual_gen/` → `scope=None`
   (fallback).
 - VG source touched but no VG block found anywhere (defensive) →
   `scope=None` (fallback).

jenkins/scripts/cbts/rules/visual_gen_rule.py

@@ -20,21 +20,18 @@
 Block selection — entry-pattern based only:
 VisualGen does NOT have its own `condition.terms.backend`; VG test
 entries live in `backend: pytorch` and `backend: tensorrt` blocks.
-A block "belongs to VG" iff any of its `tests:` entries matches one
-of the three stable VG entry path families:
-  - `unittest/_torch/visual_gen/...`         (28 entries)
-  - `examples/test_visual_gen.py...`         (1 entry)
-  - `visual_gen/test_visual_gen_benchmark.py` (1 entry)
+A block "belongs to VG" iff any of its `tests:` entries lives under a
+dedicated `visual_gen/` test path.
 
 Outward-facing fallback:
 Unlike AutoDeploy, VG is imported eagerly (module-level) by non-VG
 code: `commands/serve.py`, `commands/utils.py`, and
 `serve/openai_server.py` import `VisualGenArgs` / `ParallelConfig` /
 `VisualGen` / `VisualGenParams` at top level. A signature change to
 those symbols can break trtllm-serve startup, which would affect
-non-VG tests. The 5 files that define / re-export those symbols are
-listed in `_VG_OUTWARD_FILES`; touching any of them forces fallback
-even if the rest of the diff is VG-internal.
+non-VG tests. The public API package prefix is listed in
+`_VG_OUTWARD_PREFIXES`; touching any file under it forces fallback even
+if the rest of the diff is VG-internal.
 """
 
 from __future__ import annotations
@@ -55,28 +52,14 @@
     "tensorrt_llm/visual_gen/",
 )
 
-# Files inside _VG_SRC_PREFIXES that are imported eagerly by non-VG
-# code (top-level `from ... import VisualGenArgs / ParallelConfig /
-# VisualGen / VisualGenParams`). Touching any of these can break
-# trtllm-serve / trtllm-bench startup paths, so the rule defers to
-# baseline rather than narrowing.
-_VG_OUTWARD_FILES: frozenset[str] = frozenset(
-    {
-        "tensorrt_llm/_torch/visual_gen/config.py",
-        "tensorrt_llm/visual_gen/__init__.py",
-        "tensorrt_llm/visual_gen/args.py",
-        "tensorrt_llm/visual_gen/params.py",
-        "tensorrt_llm/visual_gen/visual_gen.py",
-    }
-)
+# Public VisualGen API package imported eagerly by non-VG code. Touching
+# any non-doc file under this prefix can break trtllm-serve / trtllm-bench
+# startup paths, so the rule defers to baseline rather than narrowing.
+_VG_OUTWARD_PREFIXES: tuple[str, ...] = ("tensorrt_llm/visual_gen/",)
 
-# Substrings that mark a test entry as VG. Cover all three path
-# families that appear in test-db YAMLs (audited 2026-05).
-_VG_ENTRY_PATTERNS: tuple[str, ...] = (
-    "unittest/_torch/visual_gen/",
-    "examples/test_visual_gen.py",
-    "visual_gen/test_visual_gen_benchmark.py",
-)
+# Substrings that mark a test entry as VG. VG tests are expected to live
+# under dedicated visual_gen test directories.
+_VG_ENTRY_PATTERNS: tuple[str, ...] = ("visual_gen/",)
 
 
 def _is_vg_claim(path: str) -> bool:
@@ -122,19 +105,19 @@ def apply(self, pr: PRInputs) -> Optional[RuleResult]:
         if not claimed:
             return None
 
-        # Outward-facing VG files break the "self-contained subsystem"
+        # Outward-facing VG paths break the "self-contained subsystem"
         # assumption — they are imported eagerly by trtllm-serve /
         # trtllm-bench. Claim the files (so they don't go unhandled and
         # silently fallback) but emit scope=None so Selector falls back
         # to baseline coverage instead of narrowing to VG-only stages.
-        outward = claimed & _VG_OUTWARD_FILES
+        outward = {f for f in claimed if f.startswith(_VG_OUTWARD_PREFIXES)}
         if outward:
             return RuleResult(
                 handled_files=claimed,
                 affected_stages=set(),
                 scope=None,
                 reason=(
-                    f"visualgen: {len(outward)} outward-facing VG file(s) "
+                    f"visualgen: {len(outward)} outward-facing VG path(s) "
                     f"touched ({sorted(outward)[0]}{'...' if len(outward) > 1 else ''}); "
                     "fallback to baseline"
                 ),

tensorrt_llm/bench/benchmark/visual_gen.py

@@ -199,8 +199,8 @@ def visual_gen_command(
     """Benchmark VisualGen (image/video generation) models offline."""
     import yaml
 
-    from tensorrt_llm._torch.visual_gen.config import VisualGenArgs
     from tensorrt_llm.visual_gen import VisualGen, VisualGenParams
+    from tensorrt_llm.visual_gen.args import VisualGenArgs
 
     if prompt is None and prompt_file is None:
         raise click.UsageError("Either --prompt or --prompt_file must be specified.")

tensorrt_llm/commands/utils.py

@@ -7,8 +7,8 @@
 import click
 from click.core import ParameterSource
 
-from tensorrt_llm._torch.visual_gen.config import ParallelConfig
 from tensorrt_llm.llmapi.utils import download_hf_partial
+from tensorrt_llm.visual_gen.args import ParallelConfig
 
 logger = logging.getLogger(__name__)
 

…rf/README_test_visual_gen_perf_sanity.md …en/README_test_visual_gen_perf_sanity.mdtests/integration/defs/perf/README_test_visual_gen_perf_sanity.md renamed to tests/integration/defs/visual_gen/README_test_visual_gen_perf_sanity.md tests/integration/defs/perf/README_test_visual_gen_perf_sanity.md renamed to tests/integration/defs/visual_gen/README_test_visual_gen_perf_sanity.md

@@ -6,11 +6,11 @@ SPDX-License-Identifier: Apache-2.0
 # TensorRT-LLM VisualGen Perf Sanity (`test_visual_gen_perf_sanity.py`)
 
 Performance sanity testing for VisualGen models is implemented by
-`tests/integration/defs/perf/test_visual_gen_perf_sanity.py`.
+`tests/integration/defs/visual_gen/test_visual_gen_perf_sanity.py`.
 
-This document is the VisualGen counterpart to `README_test_perf_sanity.md`.
+This document is the VisualGen counterpart to `../perf/README_test_perf_sanity.md`.
 For the shared regression pipeline architecture, see
-`README_perf_regression_system.md`.
+`../perf/README_perf_regression_system.md`.
 
 ## How `test_visual_gen_perf_sanity.py` Uses the Pipeline
 
@@ -168,19 +168,19 @@ Both prefixes support two selector forms:
 1. Run all server recipes in a family YAML:
 
 ```text
-perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-{config_base}]
+visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-{config_base}]
 ```
 
 2. Run one named server recipe:
 
 ```text
-perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-{config_base}-{server_name}]
+visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-{config_base}-{server_name}]
 ```
 
 Example:
 
 ```text
-perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-wan21_t2v_1p3b_blackwell-wan21_1p3b_fp8_fa4_cfg1_ulysses1_teacache_on]
+visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-wan21_t2v_1p3b_blackwell-wan21_1p3b_fp8_fa4_cfg1_ulysses1_teacache_on]
 ```
 
 ## CI Integration
@@ -251,7 +251,7 @@ Important:
    end-to-end before pushing:
 
    ```bash
-   pytest perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg-{config_base}-{server_name}]
+   pytest visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg-{config_base}-{server_name}]
    ```
 
 6. **Verify uploaded results** after a `vg_upload` run by opening the
@@ -295,10 +295,10 @@ extraction in `build_visual_gen_db_entry` and treat it as a baseline reset.
 
 ```bash
 # Run a single named recipe
-pytest perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-wan21_t2v_14b_blackwell-wan21_14b_nvfp4_trtllm_cfg2_ulysses4_teacache_on]
+pytest visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-wan21_t2v_14b_blackwell-wan21_14b_nvfp4_trtllm_cfg2_ulysses4_teacache_on]
 
 # Run all server recipes from one family YAML without uploading
-pytest perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg-ltx2_blackwell]
+pytest visual_gen/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg-ltx2_blackwell]
 ```
 
 Set `LLM_MODELS_ROOT` to the shared model cache before running locally:
@@ -311,8 +311,8 @@ export LLM_MODELS_ROOT=/home/scratch.trt_llm_data_ci/llm-models
 
 | Resource | Path |
 |----------|------|
-| Main pytest entry | `tests/integration/defs/perf/test_visual_gen_perf_sanity.py` |
-| VisualGen helpers | `tests/integration/defs/perf/visual_gen_perf_utils.py` |
+| Main pytest entry | `tests/integration/defs/visual_gen/test_visual_gen_perf_sanity.py` |
+| VisualGen helpers | `tests/integration/defs/visual_gen/visual_gen_perf_utils.py` |
 | Family YAMLs | `tests/scripts/perf-sanity/visual_gen/` |
 | B200 post-merge test-db | `tests/integration/test_lists/test-db/l0_b200_visual_gen_perf_sanity.yml` |
 | Jenkins stage wiring | `jenkins/L0_Test.groovy` |