Skip to content

Support Half/BFloat16 in fill #7809

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 1 commit into from
Jan 22, 2025
Merged

Support Half/BFloat16 in fill #7809

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
16 changes: 8 additions & 8 deletions kernels/portable/cpu/op_fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Tensor& fill_scalar_out(
out,
"Failed to resize output tensor.");

ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "fill.Scalar_out", CTYPE_A, [&] {
ET_SWITCH_REALHBBF16_TYPES(a_type, ctx, "fill.Scalar_out", CTYPE_A, [&] {
CTYPE_A b_casted;
ET_SWITCH_SCALAR_OBJ_TYPES(b_type, ctx, "fill.Scalar_out", CTYPE_B, [&] {
CTYPE_B b_val;
Expand Down Expand Up @@ -87,14 +87,14 @@ Tensor& fill_tensor_out(
out,
"Failed to resize output tensor.");

ET_SWITCH_REAL_TYPES_AND(Bool, a_type, ctx, "fill.Tensor_out", CTYPE_A, [&] {
ET_SWITCH_REALHBBF16_TYPES(a_type, ctx, "fill.Tensor_out", CTYPE_A, [&] {
CTYPE_A b_casted;
ET_SWITCH_REAL_TYPES_AND(
Bool, b_type, ctx, "fill.Tensor_out", CTYPE_B, [&] {
CTYPE_B b_val;
extract_scalar_tensor(b, &b_val);
b_casted = static_cast<CTYPE_A>(b_val);
});
ET_SWITCH_REALHBBF16_TYPES(b_type, ctx, "fill.Tensor_out", CTYPE_B, [&] {
CTYPE_B b_val;
ET_DCHECK_MSG(
extract_scalar_tensor(b, &b_val), "extract_scalar_tensor failed!");
b_casted = static_cast<CTYPE_A>(b_val);
});

apply_unary_map_fn(
[b_casted](const CTYPE_A val_a) { return b_casted; },
Expand Down
4 changes: 2 additions & 2 deletions kernels/test/op_fill_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ class OpFillTest : public OperatorTest {
TEST_FILL_OUT(test_fill_scalar_out, DTYPE); \
}

ET_FORALL_REAL_TYPES_AND(Bool, GENERATE_SCALAR_INPUT_SUPPORT_TEST)
ET_FORALL_REALHBBF16_TYPES(GENERATE_SCALAR_INPUT_SUPPORT_TEST)

// Create input support tests for tensor variant.
#define GENERATE_TENSOR_INPUT_SUPPORT_TEST(_, DTYPE) \
TEST_F(OpFillTest, DTYPE##TensorInputSupport) { \
TEST_FILL_OUT(test_fill_tensor_out, DTYPE); \
}

ET_FORALL_REAL_TYPES_AND(Bool, GENERATE_TENSOR_INPUT_SUPPORT_TEST)
ET_FORALL_REALHBBF16_TYPES(GENERATE_TENSOR_INPUT_SUPPORT_TEST)

TEST_F(OpFillTest, MismatchedOtherPropertiesDies) {
TensorFactory<ScalarType::Int> tf;
Expand Down
9 changes: 6 additions & 3 deletions runtime/core/exec_aten/util/tensor_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,8 +1062,11 @@ bool extract_scalar_tensor(executorch::aten::Tensor tensor, INT_T* out_val) {
*/
template <
typename FLOAT_T,
typename std::enable_if<std::is_floating_point<FLOAT_T>::value, bool>::
type = true>
typename std::enable_if<
std::is_floating_point_v<FLOAT_T> ||
std::is_same_v<FLOAT_T, exec_aten::BFloat16> ||
std::is_same_v<FLOAT_T, exec_aten::Half>,
bool>::type = true>
bool extract_scalar_tensor(executorch::aten::Tensor tensor, FLOAT_T* out_val) {
if (tensor.numel() != 1) {
return false;
Expand All @@ -1083,7 +1086,7 @@ bool extract_scalar_tensor(executorch::aten::Tensor tensor, FLOAT_T* out_val) {
}

switch (tensor.scalar_type()) {
ET_FORALL_REAL_TYPES(CASE_REAL_DTYPE);
ET_FORALL_REALHBF16_TYPES(CASE_REAL_DTYPE);
default:
return false;
}
Expand Down
Loading