Skip to content

Reapply: "relax tolerances for all unary float ops (#9585)", "Add SupportedTensorDtypes::BOOL (#9584)", new op_mul test (#11206) #11919

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

Closed
wants to merge 1 commit into from
Closed

Reapply: "relax tolerances for all unary float ops (#9585)", "Add SupportedTensorDtypes::BOOL (#9584)", new op_mul test (#11206) #11919

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: 2 additions & 0 deletions kernels/portable/cpu/util/dtype_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ bool check_tensor_dtype(
return executorch::runtime::tensor_is_floating_type(t);
case SupportedTensorDtypes::INTB:
return executorch::runtime::tensor_is_integral_type(t, true);
case SupportedTensorDtypes::BOOL:
return executorch::runtime::tensor_is_type(t, ScalarType::Bool);
case SupportedTensorDtypes::BOOL_OR_BYTE:
return (executorch::runtime::tensor_is_type(
t, ScalarType::Bool, ScalarType::Byte));
Expand Down
30 changes: 29 additions & 1 deletion kernels/portable/cpu/util/dtype_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ load_to_compute_fn<CTYPE_COMPUTE> get_load_to_compute_fn_intb(const Tensor& t) {
return result;
}

template <typename CTYPE_COMPUTE, const char* op_name>
load_to_compute_fn<CTYPE_COMPUTE> get_load_to_compute_fn_bool(const Tensor& t) {
ET_CHECK_MSG(
t.scalar_type() == ScalarType::Bool,
"Unhandled dtype %s for %s",
::executorch::runtime::toString(t.scalar_type()),
op_name);
return internal::load_and_convert<CTYPE_COMPUTE, bool>;
}

template <typename CTYPE_COMPUTE, const char* op_name>
load_to_compute_fn<CTYPE_COMPUTE> get_load_to_compute_fn_bool_or_byte(
const Tensor& t) {
Expand Down Expand Up @@ -165,6 +175,17 @@ store_compute_to_tensor_fn<CTYPE_COMPUTE> get_store_compute_to_tensor_fn_intb(
return result;
}

template <typename CTYPE_COMPUTE, const char* op_name>
store_compute_to_tensor_fn<CTYPE_COMPUTE> get_store_compute_to_tensor_fn_bool(
const Tensor& t) {
ET_CHECK_MSG(
t.scalar_type() == ScalarType::Bool,
"Unhandled dtype %s for %s",
::executorch::runtime::toString(t.scalar_type()),
op_name);
return internal::convert_and_store<bool, CTYPE_COMPUTE>;
}

template <typename CTYPE_COMPUTE, const char* op_name>
store_compute_to_tensor_fn<CTYPE_COMPUTE>
get_store_compute_to_tensor_fn_bool_or_byte(const Tensor& t) {
Expand Down Expand Up @@ -219,6 +240,7 @@ enum class SupportedTensorDtypes {
REALHBF16,
FLOATHBF16,
INTB,
BOOL,
BOOL_OR_BYTE,
// DEPRECATED: not likely to be correct; use SAME_AS_COMMON.
SAME_AS_COMPUTE,
Expand All @@ -240,6 +262,8 @@ load_to_compute_fn<CTYPE_COMPUTE> get_load_to_compute_fn_impl(
return get_load_to_compute_fn_realhbf16<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::INTB:
return get_load_to_compute_fn_intb<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::BOOL:
return get_load_to_compute_fn_bool<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::BOOL_OR_BYTE:
return get_load_to_compute_fn_bool_or_byte<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::SAME_AS_COMPUTE:
Expand Down Expand Up @@ -271,6 +295,8 @@ store_compute_to_tensor_fn<CTYPE_COMPUTE> get_store_compute_to_tensor_fn(
t);
case SupportedTensorDtypes::INTB:
return get_store_compute_to_tensor_fn_intb<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::BOOL:
return get_store_compute_to_tensor_fn_bool<CTYPE_COMPUTE, op_name>(t);
case SupportedTensorDtypes::BOOL_OR_BYTE:
return get_store_compute_to_tensor_fn_bool_or_byte<
CTYPE_COMPUTE,
Expand Down Expand Up @@ -318,12 +344,14 @@ bool check_tensor_dtype(
const ScalarType compute_type);

/// Return the one output type we are willing to emit specialized code
/// to handle, given a compute type of CTYPE_COMMON and supported
/// to handle, given a compute type of CTYPE_COMPUTE and supported
/// output types of out_dtypes.
template <typename CTYPE_COMPUTE>
inline constexpr ScalarType specialized_output_scalar_type(
SupportedTensorDtypes out_dtypes) {
switch (out_dtypes) {
case SupportedTensorDtypes::BOOL:
return ScalarType::Bool;
case SupportedTensorDtypes::BOOL_OR_BYTE:
return ScalarType::Bool;
case SupportedTensorDtypes::REALHBBF16:
Expand Down
20 changes: 8 additions & 12 deletions kernels/test/UnaryUfuncRealHBBF16ToFloatHBF16Test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,16 @@ class UnaryUfuncRealHBBF16ToFloatHBF16Test : public OperatorTest {

auto expected = tf_out.make({1, 6}, expected_vector);
if (IN_DTYPE == ScalarType::BFloat16 || OUT_DTYPE == ScalarType::BFloat16) {
double rtol = executorch::runtime::testing::internal::kDefaultRtol;
// It appears we need a higher tolerance for at least some ATen
// tests, like aten_op_acosh_test.
if (get_supported_features()->is_aten) {
rtol = 3e-3;
}
// Raise tolerance because both we and ATen run these
// computations at internal float32 precision rather than
// float64.
double rtol = 3e-3;
EXPECT_TENSOR_CLOSE_WITH_TOL(out, expected, rtol, executorch::runtime::testing::internal::kDefaultBFloat16Atol);
} else if (IN_DTYPE == ScalarType::Half || OUT_DTYPE == ScalarType::Half) {
double rtol = executorch::runtime::testing::internal::kDefaultRtol;
// It appears we need a higher tolerance for at least some ATen
// tests, like aten_op_acosh_test.
if (get_supported_features()->is_aten) {
rtol = 1e-3;
}
// Raise tolerance because both we and ATen run these
// computations at internal float32 precision rather than
// float64.
double rtol = 1e-3;
EXPECT_TENSOR_CLOSE_WITH_TOL(out, expected, rtol, executorch::runtime::testing::internal::kDefaultHalfAtol);
} else {
EXPECT_TENSOR_CLOSE(out, expected);
Expand Down
15 changes: 15 additions & 0 deletions kernels/test/op_mul_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,21 @@ TEST_F(OpMulOutTest, DynamicShapeUnbound) {
EXPECT_TENSOR_CLOSE(out, expected_result);
}

// >>> torch.ops.aten.mul(torch.tensor([100], dtype=torch.int8),
// torch.tensor([100], dtype=torch.int8), out=torch.zeros([1],
// dtype=torch.long)) tensor([16])
TEST_F(OpMulOutTest, MixedIntegerDtypeMatchesATen) {
TensorFactory<ScalarType::Char> tf_in;
TensorFactory<ScalarType::Long> tf_out;

Tensor in = tf_in.make({1}, {100});
Tensor out = tf_out.zeros({1});
Tensor ret = op_mul_out(in, in, out);

Tensor expected = tf_out.make({1}, {16});
EXPECT_TENSOR_CLOSE(out, expected);
}

TEST_F(OpMulScalarOutTest, SanityCheck) {
TensorFactory<ScalarType::Bool> tf_a;
TensorFactory<ScalarType::Float> tf_out;
Expand Down
Loading