Skip to content

Fix boolean scalar support in portable arange #22060

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

Open
Air-crypto wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −4
Open

Fix boolean scalar support in portable arange #22060

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
20 changes: 16 additions & 4 deletions kernels/portable/cpu/op_arange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,22 @@ namespace torch {
namespace executor {
namespace native {

namespace {

bool extract_arange_scalar(const Scalar& scalar, double* out) {
if (scalar.isBoolean()) {
*out = static_cast<double>(scalar.to<bool>());
return true;
}
return utils::extract_scalar(scalar, out);
}

} // namespace

Tensor& arange_out(KernelRuntimeContext& ctx, const Scalar& end, Tensor& out) {
double end_val = 0;
ET_KERNEL_CHECK(
ctx, utils::extract_scalar(end, &end_val), InvalidArgument, out);
ctx, extract_arange_scalar(end, &end_val), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx, check_arange_args(0.0, end_val, 1.0, out), InvalidArgument, out);
Expand Down Expand Up @@ -53,15 +65,15 @@ Tensor& arange_start_out(

double d_start = 0;
ET_KERNEL_CHECK(
ctx, utils::extract_scalar(start, &d_start), InvalidArgument, out);
ctx, extract_arange_scalar(start, &d_start), InvalidArgument, out);

double d_end = 0;
ET_KERNEL_CHECK(
ctx, utils::extract_scalar(end, &d_end), InvalidArgument, out);
ctx, extract_arange_scalar(end, &d_end), InvalidArgument, out);

double d_step = 0;
ET_KERNEL_CHECK(
ctx, utils::extract_scalar(step, &d_step), InvalidArgument, out);
ctx, extract_arange_scalar(step, &d_step), InvalidArgument, out);

ET_KERNEL_CHECK(
ctx,
Expand Down
20 changes: 20 additions & 0 deletions kernels/test/op_arange_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ TEST_F(OpArangeOutTest, FloatNumberNotEqualIntSupport) {
EXPECT_TENSOR_EQ(out, expected);
}

TEST_F(OpArangeOutTest, BooleanEndSupported) {
TensorFactory<ScalarType::Long> tf;

Tensor out = tf.zeros({1});
Tensor expected = tf.make({1}, {0});

EXPECT_TENSOR_EQ(op_arange_out(Scalar(true), out), expected);
}

TEST_F(OpArangeOutTest, OutDimUnsupportedDie) {
ET_SKIP_IF(
torch::executor::testing::SupportedFeatures::get()->is_aten,
Expand Down Expand Up @@ -195,6 +204,17 @@ TEST_F(OpArangeStartOutTest, FloatNumberNotEqualIntSupport) {
EXPECT_TENSOR_EQ(out, expected);
}

TEST_F(OpArangeStartOutTest, BooleanStartAndStepSupported) {
TensorFactory<ScalarType::Long> tf;

Tensor out = tf.zeros({3});
Tensor expected = tf.make({3}, {0, 1, 2});

EXPECT_TENSOR_EQ(
op_arange_start_out(Scalar(false), Scalar(3), Scalar(true), out),
expected);
}

TEST_F(OpArangeStartOutTest, OutDimUnsupportedDie) {
ET_SKIP_IF(
torch::executor::testing::SupportedFeatures::get()->is_aten,
Expand Down
Loading