Skip to content

update the validity rule for regenerated stride from dim order #12280

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
Jul 9, 2025
Merged

update the validity rule for regenerated stride from dim order #12280

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
18 changes: 15 additions & 3 deletions extension/tensor/tensor_ptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,27 @@ TensorPtr make_tensor_ptr(
}
}
std::vector<executorch::aten::StridesType> computed_strides(dim);

auto error = runtime::dim_order_to_stride(
sizes.data(), dim_order.data(), dim, computed_strides.data());
ET_CHECK_MSG(error == runtime::Error::Ok, "Failed to compute strides.");

if (!strides.empty()) {
ET_CHECK_MSG(computed_strides == strides, "Invalid strides provided.");
} else {
strides = std::move(computed_strides);
for (size_t i = 0; i < dim; i++) {
ET_CHECK_MSG(
strides[i] == computed_strides[i] || sizes[i] == 1,
"invalid strides for dim %zu: %" ET_PRI_SIZES_AND_STRIDES
"!= %" ET_PRI_SIZES_AND_STRIDES
" while its size is %" ET_PRI_SIZES_AND_STRIDES " != 1",
i,
strides[i],
computed_strides[i],
sizes[i]);
}
}

strides = std::move(computed_strides);

#ifndef USE_ATEN_LIB
executorch::aten::TensorImpl tensor_impl(
type,
Expand Down
26 changes: 26 additions & 0 deletions extension/tensor/test/tensor_ptr_maker_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <gtest/gtest.h>

#include <executorch/runtime/platform/runtime.h>
#include <executorch/test/utils/DeathTest.h>

using namespace ::executorch::extension;
using namespace ::executorch::runtime;
Expand Down Expand Up @@ -113,6 +114,31 @@ TEST_F(TensorPtrMakerTest, CreateTensorUsingFromBlobWithStrides) {
EXPECT_EQ(tensor->const_data_ptr<float>()[0], 3);
}

TEST_F(TensorPtrMakerTest, CreateTensorUsingFromBlobWithLegalStrides) {
float data[20] = {3};
auto tensor = from_blob(data, {1, 2, 2}, {10, 2, 1});

EXPECT_EQ(tensor->dim(), 3);
EXPECT_EQ(tensor->size(0), 1);
EXPECT_EQ(tensor->size(1), 2);
EXPECT_EQ(tensor->size(2), 2);

// recalculated stride[0]t o 2 to meet ET's requirement while maintain the
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo

// same behavior as original tensor since size[0] == 1
EXPECT_EQ(tensor->strides()[0], 4);
EXPECT_EQ(tensor->strides()[1], 2);
EXPECT_EQ(tensor->strides()[2], 1);
EXPECT_EQ(tensor->const_data_ptr<float>(), data);
EXPECT_EQ(tensor->const_data_ptr<float>()[0], 3);
}

TEST_F(TensorPtrMakerTest, FailedCreateTensorUsingFromBlobWithIllegalStrides) {
float data[20] = {3};
ET_EXPECT_DEATH(
from_blob(data, {2, 2, 2}, {10, 2, 1}),
"invalid strides for dim 0: 10!= 4 while its size is 2 != 1");
}

TEST_F(TensorPtrMakerTest, TensorMakerConversionOperator) {
float data[20] = {2};
TensorPtr tensor =
Expand Down
Loading