Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion kernels/portable/cpu/op_full.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ Tensor& full_out(
constexpr auto name = "full.out";

ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
CTYPE_OUT val_casted = utils::scalar_to<CTYPE_OUT>(fill_value);
auto opt_val_casted =
utils::internal::check_overflow_scalar_cast<CTYPE_OUT>(fill_value);
ET_KERNEL_CHECK(ctx, opt_val_casted.has_value(), InvalidArgument, );
auto val_casted = opt_val_casted.value();
auto data_out = out.mutable_data_ptr<CTYPE_OUT>();
for (const auto i : c10::irange(out.numel())) {
data_out[i] = val_casted;
Expand Down
27 changes: 13 additions & 14 deletions kernels/test/op_full_test.cpp
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 @@ -59,6 +60,17 @@ class OpFullOutTest : public OperatorTest {
op_full_out(aref, 1.0, out);
EXPECT_TENSOR_EQ(out, tf.ones(size_int32_t));
}

template <ScalarType DTYPE>
void expect_bad_scalar_value_dies(const Scalar& bad_value) {
TensorFactory<DTYPE> tf;
std::vector<int32_t> sizes = {2, 2};
std::vector<int64_t> sizes_int64_t(sizes.begin(), sizes.end());
auto aref = IntArrayRef(sizes_int64_t.data(), sizes_int64_t.size());
Tensor out = tf.zeros(sizes);

ET_EXPECT_KERNEL_FAILURE(context_, op_full_out(aref, bad_value, out));
}
};

#define GENERATE_TEST(_, DTYPE) \
Expand All @@ -72,20 +84,7 @@ class OpFullOutTest : public OperatorTest {

ET_FORALL_REALHBF16_TYPES(GENERATE_TEST)

TEST_F(OpFullOutTest, ValueOverflow) {
if (torch::executor::testing::SupportedFeatures::get()->is_aten) {
GTEST_SKIP() << "ATen kernel doesn't handle overflow";
}
TensorFactory<ScalarType::Byte> tf;

std::vector<int64_t> sizes_int64_t_vec = {2, 3};
std::vector<int32_t> sizes_in32_t_vec = {2, 3};
auto sizes = IntArrayRef(sizes_int64_t_vec.data(), sizes_int64_t_vec.size());

Tensor out = tf.zeros(sizes_in32_t_vec);

op_full_out(sizes, 1000, out);
}
GENERATE_SCALAR_OVERFLOW_TESTS(OpFullOutTest)

TEST_F(OpFullOutTest, HalfSupport) {
TensorFactory<ScalarType::Half> tf;
Expand Down
Loading