mirror of
https://github.com/NVIDIA/Model-Optimizer.git
synced 2026-10-18 05:40:03 +08:00
### What does this PR do?
Type of change: Tests (CI speed-up)
Follow-up to #2724. Each step of the diffusers example tests started a
fresh `python <script>.py` subprocess. On the tiny test models most of
each step was startup: about 20s importing torch/diffusers/modelopt and
initializing CUDA. For example, `quantize.py`'s own timer reports 3.1s
for the SDXL quantize run inside a ~30s step.
- **In-process runner**
(`tests/_test_utils/examples/diffusers_example_runner.py`). It plugs
into the existing `set_in_process_runner` hook, like the megatron_bridge
suite does, and runs the script with `runpy.run_path(...,
run_name="__main__")`. Argument parsing and `if __name__ == "__main__":`
blocks run exactly as on the command line; `diffusion_trt.py` swaps
`torch.nn.RMSNorm` only in that block. After each step it puts back the
process-wide state the script changed:
- sibling modules imported by bare name (`config`, `utils`, `quantize`,
...), with any same-named module imported elsewhere stashed and
restored;
- the `torch.nn.RMSNorm` swap;
- logger levels, plus the handlers `quantize.py` attaches to the
captured stdout;
- warning filters, the environment, the working directory and
`sys.path`.
- **Opt-in per module** with `pytestmark =
pytest.mark.usefixtures("in_process_examples")`: `test_diffusers.py`,
`test_export_diffusers_hf_ckpt.py` and `sparsity/test_sparsity.py`. The
deprecated ONNX/TRT test, which CI doesn't run, keeps using
subprocesses.
- **`torch.compile` steps stay in a subprocess.** They already pass
`env=`, which forces one, and that is where the Inductor settings and
cudagraphs belong. The expected fallback warning is filtered.
- **`examples/diffusers/quantization/{onnx_utils,calib}/__init__.py`.**
As namespace packages these dirs lose to any same-named regular module
anywhere on `sys.path`. Importing `onnxruntime.transformers` appends its
own directory, which holds an `onnx_utils.py`. Once that has happened in
a long-lived process, `from onnx_utils.export import ...` in
`diffusion_trt.py` and in the ONNX/TRT deprecation test resolves to
onnxruntime's module. A fresh subprocess never hit this. Making them
regular packages lets the example's own directory win. Both files
contain only the license header.
### Usage
N/A (tests only).
### Testing
I ran these on an RTX PRO 6000 in `nvcr.io/nvidia/pytorch:26.07-py3`,
set up like the CI lane (editable `.[onnx,hf,dev-test]`,
`diffusers==0.39.0`). Both runs used `pytest tests/examples/diffusers
--ignore=test_diffusers_onnx_trt.py --ignore=fastgen --cov`, with
`COVERAGE_PROCESS_START` set as in CI:
| | `main` (af07754) | this PR |
|---|---:|---:|
| Result | 40 passed | 40 passed |
| Wall time | **22m35s** | **4m07s** |
| Coverage (statements missed / total) | 54899 / 68343 | 54899 / 68343 |
Per-test examples:
- SDXL int8 quantize + HF export + restore: 60s → 11s
- each Wan 2.2 quantize + restore: ~50s → ~3s
- each sparsity script run: ~25s → ~2s
The three `torch.compile` tests remain the bulk. They took 113s locally
on a warm Inductor cache and 190s on #2724's CI run, so I expect the
lane's pytest step to drop from about 21 min to about 6 min.
- `tests/unit/test_diffusers_example_runner.py` (CPU): runs a fake
example that makes all of the above process-wide changes, imports a
bare-name sibling `utils` while another module named `utils` is already
loaded, and exits nonzero on request. It checks the output is captured
and every change is undone, and that a nonzero exit raises with the
output attached.
- `pre-commit` passes.
### Before your PR is "*Ready for review*"
- Is this change backward compatible?: ✅ (the two `__init__.py` files
only turn namespace packages into regular ones)
- If you copied code from any other sources or added a new PIP
dependency, did you follow guidance in `CONTRIBUTING.md`: N/A
- Did you write any new necessary tests?: ✅
`tests/unit/test_diffusers_example_runner.py`
- Did you update
[Changelog](https://github.com/NVIDIA/Model-Optimizer/blob/main/CHANGELOG.rst)?:
N/A (tests only)
- Did you get Claude approval on this PR?: ❌
### Additional Information
- This touches `tests/_test_utils/`, so CI runs every example test lane.
- Example scripts' own warnings now appear in pytest's warnings summary
instead of being lost in subprocess output.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Tests**
* Diffusers example tests can now run examples within the test process,
with output captured for successful and failed runs.
* Test runs restore process state after execution, including environment
settings and logging.
* Added coverage for execution, failure reporting, and cleanup behavior.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---------
Signed-off-by: Chenjie Luo <chenjiel@nvidia.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
372 lines
12 KiB
Python
372 lines
12 KiB
Python
# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import os
|
|
from pathlib import Path
|
|
from typing import NamedTuple
|
|
|
|
import pytest
|
|
from _test_utils.examples.models import FLUX_SCHNELL_PATH, SD3_PATH, SDXL_PATH
|
|
from _test_utils.examples.run_command import run_example_command
|
|
from _test_utils.torch.misc import minimum_sm
|
|
|
|
# Calibrate from local prompts: the default Hub datasets (OpenVid-1M for Wan) are slow to load
|
|
# and add a network dependency without adding coverage.
|
|
CALIB_PROMPTS_FILE = Path(__file__).parent / "calib_prompts.txt"
|
|
|
|
# Run the example scripts in this process: ~20s of startup saved per step (see conftest).
|
|
pytestmark = pytest.mark.usefixtures("in_process_examples")
|
|
|
|
|
|
def assert_hf_ckpt_exported(hf_ckpt_dir: Path) -> None:
|
|
assert hf_ckpt_dir.exists(), f"HF checkpoint directory was not created: {hf_ckpt_dir}"
|
|
|
|
config_files = list(hf_ckpt_dir.rglob("config.json"))
|
|
assert len(config_files) > 0, f"No config.json found in {hf_ckpt_dir}"
|
|
|
|
weight_files = list(hf_ckpt_dir.rglob("*.safetensors")) + list(hf_ckpt_dir.rglob("*.bin"))
|
|
assert len(weight_files) > 0, f"No weight files (.safetensors or .bin) found in {hf_ckpt_dir}"
|
|
|
|
|
|
class DiffuserModel(NamedTuple):
|
|
dtype: str
|
|
name: str
|
|
path: str
|
|
format_type: str
|
|
quant_algo: str
|
|
collect_method: str
|
|
# Also export an HF checkpoint from the quantize run, rather than calibrating again in a
|
|
# separate export test.
|
|
hf_export: bool = False
|
|
|
|
def _run_cmd(self, script: str, *args: str) -> str:
|
|
cmd_args = [
|
|
"python",
|
|
script,
|
|
"--model",
|
|
self.name,
|
|
"--override-model-path",
|
|
self.path,
|
|
]
|
|
cmd_args.extend(args)
|
|
return run_example_command(cmd_args, "diffusers/quantization")
|
|
|
|
def _format_args(self) -> list[str]:
|
|
return [
|
|
"--calib-size",
|
|
"4",
|
|
"--percentile",
|
|
"1.0",
|
|
"--alpha",
|
|
"0.8",
|
|
"--n-steps",
|
|
"2",
|
|
"--batch-size",
|
|
"2",
|
|
"--format",
|
|
self.format_type,
|
|
"--collect-method",
|
|
self.collect_method,
|
|
"--quant-algo",
|
|
self.quant_algo,
|
|
"--prompts-file",
|
|
str(CALIB_PROMPTS_FILE),
|
|
]
|
|
|
|
def quantize(self, tmp_path: Path, *export_args: str) -> None:
|
|
self._run_cmd(
|
|
"quantize.py",
|
|
*self._format_args(),
|
|
"--trt-high-precision-dtype",
|
|
self.dtype,
|
|
"--quantized-torch-ckpt-save-path",
|
|
str(tmp_path / f"{self.name}_{self.format_type}.pt"),
|
|
*export_args,
|
|
)
|
|
|
|
assert any((tmp_path / f"{self.name}_{self.format_type}.pt").glob("*.pt"))
|
|
|
|
def restore(self, tmp_path: Path, *export_args: str) -> None:
|
|
output = self._run_cmd(
|
|
"quantize.py",
|
|
*self._format_args(),
|
|
"--trt-high-precision-dtype",
|
|
self.dtype,
|
|
"--restore-from",
|
|
str(tmp_path / f"{self.name}_{self.format_type}.pt"),
|
|
*export_args,
|
|
)
|
|
assert f"Detected restored quantization format: {self.format_type}" in output
|
|
|
|
|
|
class Wan22Model(NamedTuple):
|
|
model: str
|
|
backbone: str | None
|
|
format_type: str
|
|
quant_algo: str
|
|
collect_method: str
|
|
# See DiffuserModel.hf_export.
|
|
hf_export: bool = False
|
|
|
|
def _ckpt_path(self, tmp_path: Path) -> str:
|
|
stem = self.model.replace("wan2.2-t2v-", "")
|
|
parts = [stem, *([self.backbone] if self.backbone else []), self.format_type]
|
|
return str(tmp_path / f"wan22_{'_'.join(parts)}.pt")
|
|
|
|
def _common_args(self, tiny_wan22_path: str) -> list[str]:
|
|
cmd_args = [
|
|
"python",
|
|
"quantize.py",
|
|
"--model",
|
|
self.model,
|
|
"--override-model-path",
|
|
tiny_wan22_path,
|
|
"--format",
|
|
self.format_type,
|
|
"--quant-algo",
|
|
self.quant_algo,
|
|
"--collect-method",
|
|
self.collect_method,
|
|
"--model-dtype",
|
|
"BFloat16",
|
|
"--trt-high-precision-dtype",
|
|
"BFloat16",
|
|
"--calib-size",
|
|
"2",
|
|
"--batch-size",
|
|
"1",
|
|
"--n-steps",
|
|
"2",
|
|
"--prompts-file",
|
|
str(CALIB_PROMPTS_FILE),
|
|
# Tiny video dims — override MODEL_DEFAULTS for fast CI.
|
|
"--extra-param",
|
|
"height=16",
|
|
"--extra-param",
|
|
"width=16",
|
|
"--extra-param",
|
|
"num_frames=5",
|
|
]
|
|
if self.backbone is not None:
|
|
cmd_args.extend(["--backbone", self.backbone])
|
|
return cmd_args
|
|
|
|
def quantize(self, tiny_wan22_path: str, tmp_path: Path, *export_args: str) -> None:
|
|
run_example_command(
|
|
[
|
|
*self._common_args(tiny_wan22_path),
|
|
"--quantized-torch-ckpt-save-path",
|
|
self._ckpt_path(tmp_path),
|
|
*export_args,
|
|
],
|
|
"diffusers/quantization",
|
|
)
|
|
|
|
def restore(self, tiny_wan22_path: str, tmp_path: Path) -> None:
|
|
run_example_command(
|
|
[*self._common_args(tiny_wan22_path), "--restore-from", self._ckpt_path(tmp_path)],
|
|
"diffusers/quantization",
|
|
)
|
|
|
|
|
|
DIFFUSER_MODELS = [
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="flux-schnell",
|
|
path=FLUX_SCHNELL_PATH,
|
|
dtype="BFloat16",
|
|
format_type="int8",
|
|
quant_algo="smoothquant",
|
|
collect_method="min-mean",
|
|
),
|
|
id="flux_schnell_bf16_int8_smoothquant_3.0_min_mean",
|
|
),
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="sd3-medium",
|
|
path=SD3_PATH,
|
|
dtype="Half",
|
|
format_type="int8",
|
|
quant_algo="smoothquant",
|
|
collect_method="min-mean",
|
|
),
|
|
id="sd3_medium_fp16_int8_smoothquant_3.0_min_mean",
|
|
),
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="sd3-medium",
|
|
path=SD3_PATH,
|
|
dtype="Half",
|
|
format_type="fp8",
|
|
quant_algo="max",
|
|
collect_method="default",
|
|
),
|
|
marks=minimum_sm(89),
|
|
id="sd3_medium_fp16_fp8_max_3.0_default",
|
|
),
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="sdxl-1.0",
|
|
path=SDXL_PATH,
|
|
dtype="Half",
|
|
format_type="fp8",
|
|
quant_algo="max",
|
|
collect_method="default",
|
|
hf_export=True,
|
|
),
|
|
marks=minimum_sm(89),
|
|
id="sdxl_1.0_fp16_fp8_max_3.0_default",
|
|
),
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="sdxl-1.0",
|
|
path=SDXL_PATH,
|
|
dtype="Half",
|
|
format_type="fp4",
|
|
quant_algo="max",
|
|
collect_method="default",
|
|
),
|
|
marks=minimum_sm(100),
|
|
id="sdxl_1.0_fp16_fp4_max_3.0_default",
|
|
),
|
|
pytest.param(
|
|
DiffuserModel(
|
|
name="sdxl-1.0",
|
|
path=SDXL_PATH,
|
|
dtype="Half",
|
|
format_type="int8",
|
|
quant_algo="smoothquant",
|
|
collect_method="min-mean",
|
|
hf_export=True,
|
|
),
|
|
id="sdxl_1.0_fp16_int8_smoothquant_3.0_min_mean",
|
|
),
|
|
]
|
|
|
|
|
|
# The VAE (``AutoencoderKLWan``) is shared between Wan 2.2 14B and 5B, so the
|
|
# Conv3D NVFP4 implicit-GEMM dispatch exercises the same kernel either way; we
|
|
# parametrize both ``--model`` values to also cover the ``quantize.py`` dispatch
|
|
# for each.
|
|
WAN22_MODELS = [
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-14b", None, "int8", "smoothquant", "min-mean", hf_export=True),
|
|
id="wan22_14b_transformer_int8_smoothquant",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-14b", None, "fp8", "max", "default", hf_export=True),
|
|
marks=minimum_sm(89),
|
|
id="wan22_14b_transformer_fp8_max",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-14b", None, "fp4", "max", "default"),
|
|
marks=minimum_sm(89),
|
|
id="wan22_14b_transformer_fp4_max",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-14b", "vae", "fp8", "max", "default"),
|
|
marks=minimum_sm(89),
|
|
id="wan22_14b_vae_fp8_max",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-14b", "vae", "fp4", "max", "default"),
|
|
marks=minimum_sm(89),
|
|
id="wan22_14b_vae_fp4_max",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-5b", "vae", "fp8", "max", "default"),
|
|
marks=minimum_sm(89),
|
|
id="wan22_5b_vae_fp8_max",
|
|
),
|
|
pytest.param(
|
|
Wan22Model("wan2.2-t2v-5b", "vae", "fp4", "max", "default"),
|
|
marks=minimum_sm(89),
|
|
id="wan22_5b_vae_fp4_max",
|
|
),
|
|
]
|
|
|
|
|
|
@pytest.mark.parametrize("model", DIFFUSER_MODELS)
|
|
def test_diffusers_quantization(model: DiffuserModel, tmp_path: Path) -> None:
|
|
hf_ckpt_dir = tmp_path / "hf_ckpt"
|
|
model.quantize(tmp_path, *(["--hf-ckpt-dir", str(hf_ckpt_dir)] if model.hf_export else []))
|
|
if model.hf_export:
|
|
assert_hf_ckpt_exported(hf_ckpt_dir)
|
|
model.restore(tmp_path)
|
|
|
|
|
|
@pytest.mark.parametrize("wan_model", WAN22_MODELS)
|
|
def test_wan22_quantization(wan_model: Wan22Model, tiny_wan22_path: str, tmp_path: Path) -> None:
|
|
hf_ckpt_dir = tmp_path / "hf_ckpt"
|
|
wan_model.quantize(
|
|
tiny_wan22_path,
|
|
tmp_path,
|
|
*(["--hf-ckpt-dir", str(hf_ckpt_dir)] if wan_model.hf_export else []),
|
|
)
|
|
if wan_model.hf_export:
|
|
assert_hf_ckpt_exported(hf_ckpt_dir)
|
|
wan_model.restore(tiny_wan22_path, tmp_path)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("model_name", "model_path", "torch_compile"),
|
|
[
|
|
("flux-schnell", FLUX_SCHNELL_PATH, False),
|
|
("flux-schnell", FLUX_SCHNELL_PATH, True),
|
|
("sd3-medium", SD3_PATH, False),
|
|
("sd3-medium", SD3_PATH, True),
|
|
("sdxl-1.0", SDXL_PATH, False),
|
|
("sdxl-1.0", SDXL_PATH, True),
|
|
],
|
|
ids=[
|
|
"flux_schnell_torch",
|
|
"flux_schnell_torch_compile",
|
|
"sd3_medium_torch",
|
|
"sd3_medium_torch_compile",
|
|
"sdxl_1.0_torch",
|
|
"sdxl_1.0_torch_compile",
|
|
],
|
|
)
|
|
@pytest.mark.filterwarnings("ignore:.*env= given; running this step as a subprocess")
|
|
def test_diffusion_trt_torch(
|
|
model_name: str,
|
|
model_path: str,
|
|
torch_compile: bool,
|
|
) -> None:
|
|
cmd_args = [
|
|
"python",
|
|
"diffusion_trt.py",
|
|
"--model",
|
|
model_name,
|
|
"--override-model-path",
|
|
model_path,
|
|
"--torch",
|
|
"--num-inference-steps",
|
|
"2",
|
|
]
|
|
env = None
|
|
if torch_compile:
|
|
cmd_args.append("--torch-compile")
|
|
# The script compiles with mode="max-autotune"; benchmarking Triton GEMM/conv templates is
|
|
# a large share of the run on these tiny models and covers nothing in the example. Passing
|
|
# env= also keeps this step in a subprocess, where the Inductor settings and cudagraphs
|
|
# belong rather than in the shared pytest process.
|
|
env = {
|
|
**os.environ,
|
|
"TORCHINDUCTOR_MAX_AUTOTUNE_GEMM_BACKENDS": "ATEN",
|
|
"TORCHINDUCTOR_MAX_AUTOTUNE_CONV_BACKENDS": "ATEN",
|
|
}
|
|
run_example_command(cmd_args, "diffusers/quantization", env=env)
|