Skip to content

Coerce to true_ctype in tensor_factory #7856

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
Jan 23, 2025
Merged

Coerce to true_ctype in tensor_factory #7856

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
0d910f0
Update
swolchok Jan 22, 2025
0d365a6
Support Half/BFloat16 in prod operator (#7857)
swolchok Jan 23, 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
8 changes: 4 additions & 4 deletions kernels/portable/cpu/op_prod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Tensor& prod_out(
ScalarType out_type = out.scalar_type();
constexpr auto name = "prod.int_out";

ET_SWITCH_REALHB_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
ET_SWITCH_REALHB_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
ET_SWITCH_REALHBBF16_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
const auto data_in = in.const_data_ptr<CTYPE_IN>();
auto data_out = out.mutable_data_ptr<CTYPE_OUT>();
data_out[0] = static_cast<CTYPE_OUT>(1);
Expand Down Expand Up @@ -73,8 +73,8 @@ Tensor& prod_int_out(
ScalarType out_type = out.scalar_type();
constexpr auto name = "prod.int_out";

ET_SWITCH_REALHB_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
ET_SWITCH_REALHB_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
ET_SWITCH_REALHBBF16_TYPES(in_type, ctx, name, CTYPE_IN, [&] {
ET_SWITCH_REALHBBF16_TYPES(out_type, ctx, name, CTYPE_OUT, [&] {
CTYPE_OUT* out_data = out.mutable_data_ptr<CTYPE_OUT>();
for (size_t out_ix = 0; out_ix < out.numel(); ++out_ix) {
CTYPE_OUT prod = 1;
Expand Down
60 changes: 40 additions & 20 deletions kernels/test/op_prod_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,24 @@ class OpProdOutTest : public ::testing::Test {
// first.
torch::executor::runtime_init();
}

template <ScalarType DTYPE>
void test_dtype() {
TensorFactory<DTYPE> tf;
TensorFactory<
executorch::runtime::isIntegralType(DTYPE, /*includeBool*/ true)
? ScalarType::Long
: DTYPE>
tf_out;

Tensor self = tf.make({2, 3}, {1, 2, 3, 4, 5, 6});
optional<ScalarType> dtype{};
Tensor out = tf_out.zeros({});
Tensor out_expected =
tf_out.make({}, {DTYPE == ScalarType::Bool ? 1 : 720});
op_prod_out(self, dtype, out);
EXPECT_TENSOR_CLOSE(out, out_expected);
}
};

class OpProdIntOutTest : public ::testing::Test {
Expand All @@ -54,30 +72,32 @@ class OpProdIntOutTest : public ::testing::Test {
// first.
torch::executor::runtime_init();
}
};

TEST_F(OpProdOutTest, SmokeTest) {
TensorFactory<ScalarType::Float> tfFloat;
template <ScalarType DTYPE>
void test_dtype() {
TensorFactory<DTYPE> tf;

Tensor self = tfFloat.make({2, 3}, {1, 2, 3, 4, 5, 6});
optional<ScalarType> dtype{};
Tensor out = tfFloat.zeros({});
Tensor out_expected = tfFloat.make({}, {720});
op_prod_out(self, dtype, out);
EXPECT_TENSOR_CLOSE(out, out_expected);
}
Tensor self = tf.make({2, 3}, {1, 2, 3, 4, 5, 6});
int64_t dim = 0;
bool keepdim = false;
optional<ScalarType> dtype{};
Tensor out = tf.zeros({3});
Tensor out_expected = tf.make({3}, {4, 10, 18});
op_prod_int_out(self, dim, keepdim, dtype, out);
EXPECT_TENSOR_CLOSE(out, out_expected);
}
};

TEST_F(OpProdIntOutTest, SmokeTest) {
TensorFactory<ScalarType::Float> tfFloat;
TEST_F(OpProdOutTest, SmokeTest){
#define TEST_ENTRY(ctype, dtype) test_dtype<ScalarType::dtype>();
ET_FORALL_REALHBBF16_TYPES(TEST_ENTRY)
#undef TEST_ENTRY
}

Tensor self = tfFloat.make({2, 3}, {1, 2, 3, 4, 5, 6});
int64_t dim = 0;
bool keepdim = false;
optional<ScalarType> dtype{};
Tensor out = tfFloat.zeros({3});
Tensor out_expected = tfFloat.make({3}, {4, 10, 18});
op_prod_int_out(self, dim, keepdim, dtype, out);
EXPECT_TENSOR_CLOSE(out, out_expected);
TEST_F(OpProdIntOutTest, SmokeTest){
#define TEST_ENTRY(ctype, dtype) test_dtype<ScalarType::dtype>();
ET_FORALL_REALHBBF16_TYPES(TEST_ENTRY)
#undef TEST_ENTRY
}

TEST_F(OpProdIntOutTest, SmokeTestKeepdim) {
Expand Down
26 changes: 23 additions & 3 deletions runtime/core/exec_aten/testing_util/tensor_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,10 @@ class TensorFactory {
t = empty_strided(sizes, strides);
}
if (t.nbytes() > 0) {
memcpy(t.template data<true_ctype>(), data.data(), t.nbytes());
std::transform(
data.begin(), data.end(), t.template data<true_ctype>(), [](auto x) {
return static_cast<true_ctype>(x);
});
}
return t;
}
Expand Down Expand Up @@ -319,7 +322,10 @@ class TensorFactory {
t = empty_strided(sizes, strides);
}
if (t.nbytes() > 0) {
memcpy(t.template data<true_ctype>(), data.data(), t.nbytes());
std::transform(
data.begin(), data.end(), t.template data<true_ctype>(), [](auto x) {
return static_cast<true_ctype>(x);
});
}
return t;
}
Expand Down Expand Up @@ -721,6 +727,13 @@ class TensorFactory {
*/
using ctype = typename internal::ScalarTypeToCppTypeWrapper<DTYPE>::ctype;

/**
* The official C type for the scalar type. Used when accessing elements
* of a constructed Tensor.
*/
using true_ctype =
typename executorch::runtime::ScalarTypeToCppType<DTYPE>::type;

TensorFactory() = default;

/**
Expand Down Expand Up @@ -1019,7 +1032,14 @@ class TensorFactory {
data_.data(),
dim_order_.data(),
strides_.data(),
dynamism) {}
dynamism) {
// The only valid values for bool are 0 and 1; coerce!
if constexpr (std::is_same_v<true_ctype, bool>) {
Copy link
Contributor

@kimishpatel kimishpatel Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems in ifdef aten section this transformation is unconditional while here it is applied only if it is bool. I dont fully understand.

Copy link
Contributor Author

@swolchok swolchok Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it doesn't build with bits16 and we don't have bit_cast, otherwise I would make it unconditional here and use bit_cast.

Copy link
Contributor

@kimishpatel kimishpatel Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am guessing bit_cast not being usable is related to it available only in c++20.

Copy link
Contributor Author

@swolchok swolchok Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes; we will have access to c10::bit_cast once I get back to code sharing but currently we don't have it.

for (auto& x : data_) {
x = static_cast<true_ctype>(x);
}
}
}

std::vector<int32_t> sizes_;
std::vector<ctype> data_;
Expand Down
Loading