Skip to content

Fix ConvInteger handling of optional inputs. #23935

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

Merged
skottmckay merged 1 commit into from
Mar 7, 2025
Merged

Fix ConvInteger handling of optional inputs. #23935

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
7 changes: 4 additions & 3 deletions onnxruntime/core/providers/cpu/quantization/conv_integer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,18 @@ ONNX_OPERATOR_KERNEL_EX(
ConvInteger);

Status ConvInteger::Compute(OpKernelContext* context) const {
size_t num_inputs = OpKernel::Node().InputDefs().size();
const auto input_defs = Node().InputDefs();
size_t num_inputs = input_defs.size();
const auto* X = context->Input<Tensor>(0);
const auto* W = context->Input<Tensor>(1);
uint8_t input_offset = 0;
uint8_t filter_offset = 0;
if (num_inputs >= 3) {
if (num_inputs >= 3 && input_defs[2]->Exists()) {
const auto* X_Zero_Point = context->Input<Tensor>(2);
ORT_ENFORCE(IsScalarOr1ElementVector(X_Zero_Point), "Must be a scalar or 1D tensor or size 1.");
input_offset = *(X_Zero_Point->Data<uint8_t>());
}
if (num_inputs >= 4) {
if (num_inputs >= 4 && input_defs[3]->Exists()) {
const auto* W_Zero_Point = context->Input<Tensor>(3);
ORT_ENFORCE(IsScalarOr1ElementVector(W_Zero_Point), "Non per-tensor quantization is not supported now.");
filter_offset = *(W_Zero_Point->Data<uint8_t>());
Expand Down
40 changes: 40 additions & 0 deletions onnxruntime/test/providers/cpu/nn/conv_integer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,5 +254,45 @@ TEST(ConvIntegerTest, WithStride3_2D_u8u8) {
test.Run();
}

TEST(ConvIntegerTest, NoXZeroPoint) {
OpTester test("ConvInteger", 10);
std::vector<int64_t> x_dims{1, 1, 3, 3};
test.AddInput<uint8_t>("x", x_dims,
{2, 3, 4,
5, 6, 7,
8, 9, 10});
std::vector<int64_t> w_dims{1, 1, 2, 2};
test.AddInput<uint8_t>("w", w_dims,
{2, 2,
2, 2});
test.AddOptionalInputEdge<uint8_t>();
test.AddInput<uint8_t>("w_zero_point", {}, {1});
std::vector<int64_t> y_dims{1, 1, 2, 2};
test.AddOutput<int32_t>("y", y_dims,
{16, 20,
28, 32});
test.Run();
}

// provide optional input with empty name for w. tests that input args == 4 but the w_zero_point does not exist.
TEST(ConvIntegerTest, NoWZeroPoint) {
OpTester test("ConvInteger", 10);
std::vector<int64_t> x_dims{1, 1, 3, 3};
test.AddInput<uint8_t>("x", x_dims,
{2, 3, 4,
5, 6, 7,
8, 9, 10});
std::vector<int64_t> w_dims{1, 1, 2, 2};
test.AddInput<uint8_t>("w", w_dims,
{2, 2,
2, 2});
test.AddInput<uint8_t>("x_zero_point", {}, {1});
test.AddOptionalInputEdge<uint8_t>();
std::vector<int64_t> y_dims{1, 1, 2, 2};
test.AddOutput<int32_t>("y", y_dims,
{24, 32,
48, 56});
test.Run();
}
} // namespace test
} // namespace onnxruntime
Loading