Skip to content

Support Half/BFloat16 in hardtanh #7899

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

Support Half/BFloat16 in hardtanh #7899

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
2 changes: 1 addition & 1 deletion kernels/portable/cpu/op_hardtanh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Tensor& hardtanh_out(

ET_KERNEL_CHECK(ctx, in_type == out_type, InvalidArgument, out);

ET_SWITCH_REAL_TYPES(in_type, ctx, "hardtanh.out", CTYPE, [&]() {
ET_SWITCH_REALHBF16_TYPES(in_type, ctx, "hardtanh.out", CTYPE, [&]() {
CTYPE min_casted;
ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "hardtanh.out", CTYPE_MIN, [&]() {
CTYPE_MIN min_val;
Expand Down
12 changes: 8 additions & 4 deletions kernels/portable/cpu/util/math_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@ INT_T max_override(INT_T a, INT_T b) {

template <
typename T,
typename std::enable_if<std::is_same<T, exec_aten::Half>::value, bool>::
type = true>
typename std::enable_if_t<
std::is_same_v<T, exec_aten::Half> ||
std::is_same_v<T, exec_aten::BFloat16>,
bool> = true>
T min_override(T a, T b) {
const auto float_a = static_cast<float>(a);
if (std::isnan(float_a)) {
Expand All @@ -116,8 +118,10 @@ T min_override(T a, T b) {

template <
typename T,
typename std::enable_if<std::is_same<T, exec_aten::Half>::value, bool>::
type = true>
typename std::enable_if_t<
std::is_same_v<T, exec_aten::Half> ||
std::is_same_v<T, exec_aten::BFloat16>,
bool> = true>
T max_override(T a, T b) {
const auto float_a = static_cast<float>(a);
if (std::isnan(float_a)) {
Expand Down
32 changes: 24 additions & 8 deletions kernels/test/op_hardtanh_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,31 @@ class OpHardTanhTest : public OperatorTest {
return torch::executor::aten::hardtanh_outf(
context_, self, min_val, max_val, out);
}
};

TEST_F(OpHardTanhTest, SanityCheck) {
TensorFactory<ScalarType::Float> tf;
Tensor in = tf.ones({2, 2});
Tensor out = tf.zeros({2, 2});
template <typename CTYPE, ScalarType DTYPE>
void test_dtype() {
TensorFactory<DTYPE> tf;
CTYPE lowest_test_element;
CTYPE lower_bound;
if constexpr (std::numeric_limits<CTYPE>::is_signed) {
lowest_test_element = -3;
lower_bound = -2;
} else {
lowest_test_element = 0;
lower_bound = 0;
}
Tensor in = tf.make({2, 2}, {lowest_test_element, 0, 1, 100});
Tensor out = tf.zeros({2, 2});

Tensor ret = op_hardtanh_out(in, lower_bound, 2, out);

Tensor ret = op_hardtanh_out(in, -2, 2, out);
EXPECT_TENSOR_EQ(out, ret);
EXPECT_TENSOR_EQ(out, tf.make({2, 2}, {lower_bound, 0, 1, 2}));
}
};

EXPECT_TENSOR_EQ(out, ret);
EXPECT_TENSOR_EQ(out, tf.ones({2, 2}));
TEST_F(OpHardTanhTest, SanityCheck) {
#define TEST_ENTRY(ctype, dtype) test_dtype<ctype, ScalarType::dtype>();
ET_FORALL_REALHBF16_TYPES(TEST_ENTRY);
#undef TEST_ENTRY
}
Loading