Skip to content

[ET][Portable] Check scalar overflow: op_scalar_tensor #12025

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

[ET][Portable] Check scalar overflow: op_scalar_tensor #12025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888ea73
[ET][Portable] Check scalar overflow: op_scalar_tensor
manuelcandales Jun 26, 2025
be896bb
Update on "[ET][Portable] Check scalar overflow: op_scalar_tensor"
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
16 changes: 5 additions & 11 deletions kernels/portable/cpu/op_scalar_tensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,11 @@ scalar_tensor_out(KernelRuntimeContext& ctx, const Scalar& s, Tensor& out) {

constexpr auto name = "scalar_tensor.out";

if (s.isFloatingPoint() &&
executorch::runtime::isIntegralType(out_type, false)) {
ET_SWITCH_INT_TYPES(out_type, ctx, name, CTYPE, [&]() {
out.mutable_data_ptr<CTYPE>()[0] =
static_cast<CTYPE>(utils::scalar_to<int64_t>(s));
});
} else {
ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE, [&]() {
out.mutable_data_ptr<CTYPE>()[0] = utils::scalar_to<CTYPE>(s);
});
}
ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE, [&]() {
auto opt_val_casted = utils::internal::check_overflow_scalar_cast<CTYPE>(s);
ET_KERNEL_CHECK(ctx, opt_val_casted.has_value(), InvalidArgument, );
out.mutable_data_ptr<CTYPE>()[0] = opt_val_casted.value();
});

return out;
}
Expand Down
11 changes: 11 additions & 0 deletions kernels/test/op_scalar_tensor_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 @@ -71,6 +72,14 @@ class OpScalarTensorOutTest : public OperatorTest {

ET_EXPECT_KERNEL_FAILURE(context_, op_scalar_tensor_out(value, out));
}

template <ScalarType DTYPE>
void expect_bad_scalar_value_dies(const Scalar& bad_value) {
TensorFactory<DTYPE> tf;
Tensor out = tf.zeros({});

ET_EXPECT_KERNEL_FAILURE(context_, op_scalar_tensor_out(bad_value, out));
}
};

#define GENERATE_TEST_0D(ctype, dtype) \
Expand Down Expand Up @@ -131,3 +140,5 @@ TEST_F(OpScalarTensorOutTest, HalfSupport) {
op_scalar_tensor_out(INFINITY, out);
EXPECT_TENSOR_CLOSE(out, tf.make({}, {INFINITY}));
}

GENERATE_SCALAR_OVERFLOW_TESTS(OpScalarTensorOutTest)
Loading