Skip to content

Commit cc19972

Browse files
committed
fix: resolve conflict with #27989 - remove duplicate coefficient validation
1 parent 7048557 commit cc19972

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

onnxruntime/core/providers/cpu/ml/linearclassifier.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,6 @@ Status LinearClassifier::Compute(OpKernelContext* ctx) const {
163163
"coefficients size (", coefficients_.size(), ") must equal class_count (", class_count_,
164164
") * num_features (", num_features, ")");
165165

166-
// Validate coefficients are large enough to prevent OOB read in GEMM.
167-
const size_t expected_coefficients_size = SafeInt<size_t>(class_count_) * SafeInt<size_t>(num_features);
168-
if (coefficients_.size() < expected_coefficients_size) {
169-
return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT,
170-
"LinearClassifier: coefficients length (", coefficients_.size(),
171-
") is less than classes (", class_count_, ") * features (", num_features, ")");
172-
}
173-
174166
Tensor* Y = ctx->Output(0, {num_batches});
175167

176168
int64_t output_classes = class_count_;

onnxruntime/test/providers/cpu/ml/linearclassifer_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ TEST(MLOpTest, LinearClassifierInvalidCoefficientsSizeFails) {
199199
test.AddOutput<float>("Z", {1, 3}, {0.f, 0.f, 0.f});
200200

201201
test.Run(OpTester::ExpectResult::kExpectFailure,
202-
"LinearClassifier: coefficients length (3) is less than classes (3) * features (2)");
202+
"coefficients size (3) must equal class_count (3) * num_features (2)");
203203
}
204204

205205
// Regression test: coefficients not divisible by class_count.

0 commit comments

Comments
 (0)