fix(quantization): validate bias scale in QDQ Conv → QLinearConv fusion#28229
Open
Rishi-Dave wants to merge 2 commits intomicrosoft:mainfrom
Open
fix(quantization): validate bias scale in QDQ Conv → QLinearConv fusion#28229Rishi-Dave wants to merge 2 commits intomicrosoft:mainfrom
Rishi-Dave wants to merge 2 commits intomicrosoft:mainfrom
Conversation
ONNX QLinearConv reuses the int32 bias values directly without re-scaling, which requires bias_scale[i] == x_scale * w_scale[i] for each output channel. Previously ConvNodeGroupSelector::Check did not verify this invariant, so a QDQ model whose bias DQ used an arbitrary scale (e.g. produced by a non-conformant quantizer) would be silently fused into QLinearConv with wrong outputs. Add a static helper CheckConvBiasScale() that reads the three scale initializers, handles both per-tensor (scalar) and per-channel weight scales, and rejects the fusion when the tolerance check |b_scale - x_scale*w_scale| > atol + rtol*|x_scale*w_scale| (atol=1e-6, rtol=1e-2) fails for any channel. If any scale is not a constant initializer the helper returns false conservatively. Add two Python test cases in TestConvBiasScaleValidation: - test_mismatched_bias_scale_skips_fusion: verifies that optimized and unoptimized sessions agree when bias_scale is 2x the correct value, proving fusion was safely skipped. - test_matching_bias_scale_allows_fusion: verifies the same agreement when bias_scale is exact, ensuring no regression on valid models. Fixes microsoft#24711
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens the QDQ Conv → QLinearConv fusion in the QDQ transformer by validating that the bias dequantization scale conforms to the ONNX QLinearConv requirement (bias_scale == x_scale * w_scale[i]), preventing silent wrong results when models use non-canonical bias scales.
Changes:
- Add
CheckConvBiasScalevalidation toConvNodeGroupSelector::Checkto skip fusion when bias scale does not matchx_scale * w_scale[i]within tolerance. - Add Python tests that run the same model with optimizations enabled vs disabled to detect bias-scale-related corruption.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
onnxruntime/core/optimizer/qdq_transformer/selectors_actions/qdq_selectors.cc |
Adds bias scale validation gate to prevent incorrect QDQ Conv fusion into QLinearConv. |
onnxruntime/test/python/quantization/test_qdq.py |
Adds regression tests for matched vs mismatched bias scales under different optimization levels. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…scale check CheckConvBiasScale derived num_channels from w_scales.size() alone, which is 1 for per-tensor weight scale even when bias_scale is a per-channel vector. That caused valid graphs (per-channel bias with scalar weight scale) to be rejected and only one channel to be validated when num_channels was inferred wrongly. Use the larger of w_num/b_num for num_channels and broadcast either scale across channels when scalar. Reject only when both are vectors with mismatched lengths. Also extend the matching/mismatched-bias-scale tests to save the optimized graph and assert QLinearConv presence/absence directly via op counts, so the tests fail fast if fusion silently disables for an unrelated reason.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
CheckConvBiasScalevalidator insideConvNodeGroupSelector::CheckMotivation
Fixes #24711.
The ONNX QLinearConv spec requires the int32 bias to use scale
x_scale × w_scale[i]so the fused kernel can reuse it directly. The current QDQ selector only verifies the bias dtype is INT32 — it never checks that the bias DQ's scale satisfies this relationship. When a model is constructed with an arbitrary bias scale (e.g. user-supplied or from a non-canonical quantizer), the selector still fuses the subgraph and the QLinearConv kernel produces silently wrong outputs atORT_ENABLE_EXTENDEDand above on CPU EP. CUDA and disabled-optimization paths produce correct results, making the bug particularly hard to diagnose.Changes
onnxruntime/core/optimizer/qdq_transformer/selectors_actions/qdq_selectors.cc: addCheckConvBiasScalestatic helper. Returnsfalse(skip fusion) when:x_scaleis not a scalar / 1-element rank-1 tensorb_scalelength is neither 1 nornum_channelsx_scale × w_scale[i]by more thanatol=1e-6 + rtol=1e-2 × |expected|onnxruntime/test/python/quantization/test_qdq.py: newTestConvBiasScaleValidationclass with two cases — mismatched bias scale (asserts optimized output matches unoptimized) and matching bias scale (asserts correctness preserved when fusion is allowed).Test Plan
python -m pytest onnxruntime/test/python/quantization/test_qdq.py::TestConvBiasScaleValidation -vverify_quantize_convfamily) should continue to pass — fusion is unchanged for canonical quantizer-produced models where bias_scale equals input_scale × weight_scale exactly.ORT_ENABLE_ALLoutput now matchesORT_DISABLE_ALL.