Skip to content

[ET][Portable] Check scalar overflow: op_scatter #12028

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
merged 3 commits into from
Jun 27, 2025
Merged

[ET][Portable] Check scalar overflow: op_scatter #12028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dd85d9
[ET][Portable] Check scalar overflow: op_scatter
manuelcandales Jun 26, 2025
3426504
Update on "[ET][Portable] Check scalar overflow: op_scatter"
manuelcandales Jun 26, 2025
ee1cb14
Update on "[ET][Portable] Check scalar overflow: op_scatter"
manuelcandales Jun 27, 2025
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
4 changes: 3 additions & 1 deletion kernels/portable/cpu/op_scatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ Tensor& scatter_value_out(
constexpr auto name = "scatter.value_out";

ET_SWITCH_REALHBBF16_TYPES(in.scalar_type(), ctx, name, CTYPE, [&]() {
const CTYPE val = utils::scalar_to<CTYPE>(value);
auto opt_val = utils::internal::check_overflow_scalar_cast<CTYPE>(value);
ET_KERNEL_CHECK(ctx, opt_val.has_value(), InvalidArgument, );
auto val = opt_val.value();
scatter_value_helper<CTYPE>(in, dim, index, val, out);
});

Expand Down
16 changes: 16 additions & 0 deletions kernels/test/op_scatter_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

#include <executorch/kernels/test/FunctionHeaderWrapper.h> // Declares the operator
#include <executorch/kernels/test/ScalarOverflowTestMacros.h>
#include <executorch/kernels/test/TestUtil.h>
#include <executorch/kernels/test/supported_features.h>
#include <executorch/runtime/core/exec_aten/exec_aten.h>
Expand Down Expand Up @@ -364,6 +365,19 @@ class OpScatterValueOutTest : public OperatorTest {
op_scatter_value_out(input, 2, index, value, out);
EXPECT_TENSOR_EQ(out, expected);
}

template <ScalarType DTYPE>
void expect_bad_scalar_value_dies(const Scalar& bad_value) {
TensorFactory<DTYPE> tf;
TensorFactory<ScalarType::Long> tf_index;

Tensor self = tf.ones({2, 2});
Tensor index = tf_index.zeros({2, 2});
Tensor out = tf.zeros({2, 2});

ET_EXPECT_KERNEL_FAILURE(
context_, op_scatter_value_out(self, 0, index, bad_value, out));
}
};

TEST_F(OpScatterSrcOutTest, AllValidInputOutputSupport) {
Expand Down Expand Up @@ -652,3 +666,5 @@ TEST_F(OpScatterSrcOutTest, InvalidOneDimInputAndZeroDimIndex) {
ET_EXPECT_KERNEL_FAILURE(
context_, op_scatter_src_out(self, 0, index, src, out));
}

GENERATE_SCALAR_OVERFLOW_TESTS(OpScatterValueOutTest)
Loading