Skip to content

Fix DropQDQ not dropping Q/DQ around opset-22 MaxPool #29201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tairenpiao wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −2
Open

Fix DropQDQ not dropping Q/DQ around opset-22 MaxPool #29201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ntime/core/optimizer/qdq_transformer/selectors_actions/qdq_selector_action_transformer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void DropQDQNodesRules(SelectorActionRegistry& qdq_selector_action_registry) {
std::unique_ptr<NodeSelector> selector_no_16bit_and_positive_scale =
std::make_unique<QDQ::DropQDQNodesSelector>(false, true, false, providers);
qdq_selector_action_registry.RegisterSelectorAndAction(drop_action_no_int16_and_positive_scale_name,
{{"MaxPool", {12}},
{{"MaxPool", {12, 22}},
{"ReduceMax", {}},
{"ReduceMin", {}}},
std::move(selector_no_16bit_and_positive_scale),
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static const OpVersionsAndSelector::OpVersionsMap GetMiscOpVersionsMap() {
{"Expand", {}},
{"Flatten", {}},
{"Transpose", {}},
{"MaxPool", {12}},
{"MaxPool", {12, 22}},
{"Resize", {}},
{"Squeeze", {}},
{"Unsqueeze", {}},
Expand Down
22 changes: 22 additions & 0 deletions onnxruntime/test/optimizer/qdq_transformer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,28 @@ TEST(QDQTransformerTests, MaxpoolDontDropQDQForNegativeScale) {
RunMaxPoolNegativeScaleDropQDQTestCase<uint16_t>();
}

// Q/DQ around a MaxPool must still be dropped for the opset-22 MaxPool schema, not only MaxPool-12.
TEST(QDQTransformerTests, MaxpoolDropQDQOpset22) {
auto build_test_case = [](ModelTestBuilder& builder) {
auto* input_arg = builder.MakeInput<uint8_t>({1, 17, 17, 3}, 0, 255);
auto* dq_output = builder.MakeIntermediate();
auto* maxpool_output = builder.MakeIntermediate();

builder.AddDequantizeLinearNode<uint8_t>(input_arg, 0.003f, 128, dq_output);
builder.AddNode("MaxPool", {dq_output}, {maxpool_output}).AddAttribute("kernel_shape", std::vector<int64_t>{2, 2});
builder.AddQuantizeLinearNode<uint8_t>(maxpool_output, 0.003f, 128, builder.MakeOutput());
};

auto check_graph = [](InferenceSessionWrapper& session) {
auto op_to_count = CountOpsInGraph(session.GetGraph());
EXPECT_EQ(op_to_count["MaxPool"], 1);
EXPECT_EQ(op_to_count["QuantizeLinear"], 0);
EXPECT_EQ(op_to_count["DequantizeLinear"], 0);
};

TransformerTester(build_test_case, check_graph, TransformerLevel::Level1, TransformerLevel::Level2, 22);
}

// Runs a test case that checks if Q/DQ nodes are dropped from DQ -> (Un)Squeeze -> Q.
template <typename QuantType>
static void RunSqueezeUnsqueezeDropQDQTestCase(const std::string& squeeze_type,
Expand Down
Loading