mirror of
https://github.com/NVIDIA/Model-Optimizer.git
synced 2026-11-08 09:03:20 +08:00
### What does this PR do? Type of change: Bug fix + new tests (test-suite only; changes are confined to `tests/`) - **Fix `test_parallel_load_and_export` hang on 2 GPUs.** The temp paths were built from `os.getpid()` *inside* the workers, so each rank got a different `ckpt_dir`; rank 1 then took `_resolve_checkpoint_dir`'s Hub branch and blocked on an extra barrier while rank 0 ran the loader's broadcasts. The checkpoint is now built once in the parent under `tmp_path` and passed in, so all ranks agree on the path. - **Imports moved to module top** across `tests/gpu*` and `tests/examples`; function-local imports kept only where guarded (`importorskip`/`try`), where the import *is* the test (JIT compile), or where it must follow `sys.path` setup. - **Reuse `_test_utils` instead of local copies:** added `get_tiny_mixtral`; deduped `assert_nodes_are_quantized` (5 copies), the accelerate-offload/layerwise config helpers, `make_quant_attention`, `get_dflash_config`, the NVFP4 amax assertions, and 3 copies of the `tiny_wan22_path` fixture. - **Shared model-dir fixtures assert they were not modified** (`assert_unmodified_tree`): a file manifest is compared on teardown, so a test that writes into a session-scoped fixture directory fails instead of silently changing what later tests see. - **Dropped dependency guards the CI env already guarantees** (diffusers, tensorrt_llm in `gpu_trtllm`, transformer_engine in `gpu_megatron`, transformers in examples) so a missing dep fails loudly instead of skipping. - **`test_heterogenous_sharded_state_dict` is skipped on Blackwell** (sm_120), matching the existing marker and its TE/CUDA-13 rationale — same tracking issue as #1901. ### Testing Local, 2x RTX 6000 Ada: `tests/gpu/torch/utils/test_model_load_utils.py` passes on 2 GPUs and on 1 GPU (previously hung on 2). Also ran the touched files in `tests/unit` (608 passed) and `tests/gpu` (~340 passed). ### Before your PR is "*Ready for review*" - Is this change backward compatible?: ✅ - 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?: N/A — test-only PR - Did you update [Changelog](https://github.com/NVIDIA/Model-Optimizer/blob/main/CHANGELOG.rst)?: N/A - Did you get Claude approval on this PR?: ❌ — not yet run <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Tests** * Added reusable validation utilities for generated files, quantization behavior, attention modules, model fixtures, offloading, and speculative decoding. * Expanded coverage for tiny Wan, Mixtral, Llama, and related model scenarios. * Consolidated duplicated setup and assertions across ONNX, GPU, quantization, export, and sparsity tests. * Improved fixture integrity checks, NVFP4 validation, and handling of identity inputs. * Reduced unnecessary dependency-based skips and isolated known platform-specific flakiness. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Keval Morabia <28916987+kevalmorabia97@users.noreply.github.com>
240 lines
8.8 KiB
Python
240 lines
8.8 KiB
Python
# SPDX-FileCopyrightText: Copyright (c) 2024 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.
|
|
|
|
"""Tests for skip-softmax sparse attention on Wan 2.2 (examples/diffusers/sparsity/).
|
|
|
|
Uses a tiny Wan 2.2 model (dual transformer, 2 layers, hidden_dim=24) created
|
|
from scratch. Tests run the wan22_skip_softmax.py example script in baseline,
|
|
triton-baseline, fixed-threshold, and export modes. Also includes a Python API
|
|
test for calibration params + export (calibration can't succeed on tiny models
|
|
via the Triton kernel, so params are injected directly).
|
|
"""
|
|
|
|
import json
|
|
import math
|
|
|
|
import pytest
|
|
import torch
|
|
from _test_utils.examples.run_command import run_example_command
|
|
from diffusers import AutoencoderKLWan, WanPipeline
|
|
|
|
import modelopt.torch.sparsity.attention_sparsity as mtsa
|
|
from modelopt.torch.export import export_hf_checkpoint
|
|
from modelopt.torch.sparsity.attention_sparsity.sparse_attention import SparseAttentionModule
|
|
|
|
EXAMPLE_PATH = "diffusers/sparsity"
|
|
|
|
# Tiny inference settings — fast but exercises all code paths
|
|
_TINY_ARGS = [
|
|
"--num-frames",
|
|
"5",
|
|
"--height",
|
|
"16",
|
|
"--width",
|
|
"16",
|
|
"--num-steps",
|
|
"2",
|
|
"--guidance-scale",
|
|
"1.0",
|
|
"--skip-first-last",
|
|
"0",
|
|
"--negative-prompt",
|
|
"",
|
|
]
|
|
|
|
|
|
def test_wan22_baseline(tiny_wan22_path, tmp_path):
|
|
"""Dense baseline — no sparsity, default diffusers attention backend."""
|
|
cmd = [
|
|
"python",
|
|
"wan22_skip_softmax.py",
|
|
"--model-path",
|
|
tiny_wan22_path,
|
|
"--baseline",
|
|
"--prompt",
|
|
"test",
|
|
"--output",
|
|
str(tmp_path / "baseline.mp4"),
|
|
*_TINY_ARGS,
|
|
]
|
|
run_example_command(cmd, EXAMPLE_PATH)
|
|
|
|
|
|
def test_wan22_triton_baseline(tiny_wan22_path, tmp_path):
|
|
"""Triton kernel without skip-softmax (threshold=0, apples-to-apples)."""
|
|
cmd = [
|
|
"python",
|
|
"wan22_skip_softmax.py",
|
|
"--model-path",
|
|
tiny_wan22_path,
|
|
"--triton-baseline",
|
|
"--prompt",
|
|
"test",
|
|
"--output",
|
|
str(tmp_path / "triton_baseline.mp4"),
|
|
*_TINY_ARGS,
|
|
]
|
|
run_example_command(cmd, EXAMPLE_PATH)
|
|
|
|
|
|
def test_wan22_skip_softmax_threshold(tiny_wan22_path, tmp_path):
|
|
"""Skip-softmax with a fixed lambda threshold — no calibration needed."""
|
|
cmd = [
|
|
"python",
|
|
"wan22_skip_softmax.py",
|
|
"--model-path",
|
|
tiny_wan22_path,
|
|
"--skip-softmax-threshold",
|
|
"0.03125",
|
|
"--report-avg-sparsity",
|
|
"--prompt",
|
|
"test",
|
|
"--output",
|
|
str(tmp_path / "skip_softmax_threshold.mp4"),
|
|
*_TINY_ARGS,
|
|
]
|
|
run_example_command(cmd, EXAMPLE_PATH)
|
|
|
|
|
|
def test_wan22_export_sparse_checkpoint(tiny_wan22_path, tmp_path):
|
|
"""Export a fixed-threshold checkpoint and verify the structure.
|
|
|
|
A fixed ``--skip-softmax-threshold`` run is uncalibrated, so
|
|
``export_sparse_attention_config`` returns ``None`` and no
|
|
``sparse_attention_config`` is written (the populated-config path is covered
|
|
by ``test_wan22_calibrated_export``). Here we just verify the checkpoint is
|
|
written and that no standalone ``sparse.yaml`` is produced.
|
|
"""
|
|
export_dir = tmp_path / "sparse_export"
|
|
cmd = [
|
|
"python",
|
|
"wan22_skip_softmax.py",
|
|
"--model-path",
|
|
tiny_wan22_path,
|
|
"--skip-softmax-threshold",
|
|
"0.03125",
|
|
"--export-dir",
|
|
str(export_dir),
|
|
*_TINY_ARGS,
|
|
]
|
|
run_example_command(cmd, EXAMPLE_PATH)
|
|
|
|
assert export_dir.exists()
|
|
for component in ["transformer", "transformer_2"]:
|
|
component_dir = export_dir / component
|
|
assert component_dir.exists(), f"Missing component dir: {component}"
|
|
config_path = component_dir / "config.json"
|
|
assert config_path.exists(), f"Missing config.json for {component}"
|
|
with open(config_path) as f:
|
|
config_data = json.load(f)
|
|
# Fixed (uncalibrated) threshold has nothing to export.
|
|
assert "sparse_attention_config" not in config_data, (
|
|
f"Unexpected sparse_attention_config in {component}/config.json for a "
|
|
"fixed-threshold (uncalibrated) export"
|
|
)
|
|
weight_files = list(component_dir.glob("*.safetensors")) + list(component_dir.glob("*.bin"))
|
|
assert len(weight_files) > 0, f"No weight files for {component}"
|
|
|
|
# Sparse config (when present) lives only in config.json — never a standalone yaml.
|
|
assert not (export_dir / "sparse.yaml").exists(), "Unexpected top-level sparse.yaml"
|
|
|
|
|
|
def test_wan22_calibrated_export(tiny_wan22_path, tmp_path):
|
|
"""Inject calibration params via the Python API and verify the exported config.
|
|
|
|
Calibration can't succeed on tiny models via the Triton kernel (not enough
|
|
data points in the 10%-90% sparsity range), so this test sparsifies, injects
|
|
calibration params directly, and exports. Verifies the calibrated config schema
|
|
(top-level ``threshold_scale_factor`` of the form ``a * exp(b * target_sparsity)``)
|
|
and that the dense (cross-attention) layers are recorded under ``ignore``.
|
|
"""
|
|
pipe_dir = tiny_wan22_path
|
|
vae = AutoencoderKLWan.from_pretrained(pipe_dir, subfolder="vae", torch_dtype=torch.float32)
|
|
pipe = WanPipeline.from_pretrained(pipe_dir, vae=vae, torch_dtype=torch.bfloat16)
|
|
pipe.to("cuda")
|
|
|
|
# Sparsify self-attention only; cross-attention (attn2) stays dense.
|
|
sparse_cfg = {
|
|
"*.attn1*": {
|
|
"method": "triton_skip_softmax",
|
|
"skip_softmax_threshold": 0.1,
|
|
"backend": "triton",
|
|
"is_causal": False,
|
|
"initial_disabled_steps": 5,
|
|
"enable": True,
|
|
},
|
|
"*.attn2*": {"enable": False},
|
|
"default": {"enable": False},
|
|
}
|
|
config = {"sparse_cfg": sparse_cfg}
|
|
for transformer in [pipe.transformer, pipe.transformer_2]:
|
|
mtsa.sparsify(transformer, config)
|
|
|
|
# Inject calibration params (simulating a successful log-space calibration).
|
|
test_log_a = math.log(1.5)
|
|
test_b = 3.0
|
|
calibration_params = {
|
|
"prefill": {
|
|
"a": math.exp(test_log_a),
|
|
"b": test_b,
|
|
"log_a": test_log_a,
|
|
"fit_logspace": True,
|
|
"min_observed_sparsity": 0.15,
|
|
"max_observed_sparsity": 0.85,
|
|
},
|
|
}
|
|
target_sparse_ratio = {"prefill": 0.5}
|
|
for transformer in [pipe.transformer, pipe.transformer_2]:
|
|
for module in transformer.modules():
|
|
if isinstance(module, SparseAttentionModule) and module.is_enabled:
|
|
module._sparse_method_instance.calibration_params = calibration_params
|
|
module._sparse_method_instance.target_sparse_ratio = target_sparse_ratio
|
|
|
|
export_dir = tmp_path / "calibrated_export"
|
|
export_hf_checkpoint(pipe, export_dir=export_dir)
|
|
|
|
for component in ["transformer", "transformer_2"]:
|
|
config_path = export_dir / component / "config.json"
|
|
assert config_path.exists(), f"Missing config.json for {component}"
|
|
with open(config_path) as f:
|
|
config_data = json.load(f)
|
|
assert "sparse_attention_config" in config_data, (
|
|
f"No sparse_attention_config in {component}/config.json"
|
|
)
|
|
|
|
sa_config = config_data["sparse_attention_config"]
|
|
group_0 = sa_config["config_groups"]["group_0"]
|
|
assert group_0["algorithm"] == "skip_softmax"
|
|
assert group_0["targets"]
|
|
|
|
# Dense (uncalibrated) layers must be recorded so deployment skips them too.
|
|
assert "ignore" in group_0
|
|
assert any(".attn2" in name for name in group_0["ignore"])
|
|
|
|
# Opt-in initial_disabled_steps metadata is carried through (exported only when > 0).
|
|
assert group_0["initial_disabled_steps"] == 5
|
|
|
|
# threshold_scale_factor lives inside the skip_softmax group.
|
|
tsf = group_0["threshold_scale_factor"]
|
|
assert tsf["formula"] == "a * exp(b * target_sparsity)"
|
|
assert tsf["prefill"]["a"] == pytest.approx(math.exp(test_log_a))
|
|
assert tsf["prefill"]["b"] == pytest.approx(test_b)
|
|
|
|
# Calibrated mode — no raw_threshold.
|
|
assert "raw_threshold" not in group_0
|
|
|
|
# Sparse config lives only in config.json — no standalone sparse.yaml.
|
|
assert not (export_dir / "sparse.yaml").exists(), "Unexpected top-level sparse.yaml"
|