Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Allow custom sizes, dim order and strides for tensor view.#14944

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
shoumikhin merged 1 commit into from
Oct 10, 2025
Merged

Allow custom sizes, dim order and strides for tensor view. #14944

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
86 changes: 57 additions & 29 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,26 +323,54 @@ inline TensorPtr make_tensor_ptr(
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the given Tensor, sharing the same data without owning it.
* Creates a TensorPtr to manage a new Tensor that aliases the given Tensor's
* storage, with optional metadata overrides. Shape dynamism is inherited from
* the source tensor.
*
* @param tensor The Tensor whose properties are used to create a new TensorPtr.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* If an override is provided (non-empty), it is passed as-is. If an override is
* empty, the corresponding metadata is reused from the source tensor when it
* fits; otherwise it is left empty for the core factory to derive a valid
* configuration. If `dim_order` is empty but `strides` is provided, `dim_order`
* is left empty so the core may infer it from the provided strides.
*
* @param tensor The source tensor to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
return make_tensor_ptr(
std::vector<executorch::aten::SizesType>(
tensor.sizes().begin(), tensor.sizes().end()),
tensor.mutable_data_ptr(),
inline TensorPtr make_tensor_ptr(
const executorch::aten::Tensor& tensor,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
if (sizes.empty()) {
sizes.assign(tensor.sizes().begin(), tensor.sizes().end());
}
const auto same_rank = sizes.size() == static_cast<size_t>(tensor.dim());
Comment thread
shoumikhin marked this conversation as resolved.
const auto same_shape = same_rank &&
std::equal(sizes.begin(), sizes.end(), tensor.sizes().begin());
const auto element_count =
executorch::aten::compute_numel(sizes.data(), sizes.size());
const auto parent_element_count = tensor.numel();
ET_CHECK_MSG(
element_count <= parent_element_count,
"Requested view has %zd elements, but source tensor only has %zd.",
static_cast<ssize_t>(element_count),
static_cast<ssize_t>(parent_element_count));
#ifndef USE_ATEN_LIB
std::vector<executorch::aten::DimOrderType>(
tensor.dim_order().begin(), tensor.dim_order().end()),
#else // USE_ATEN_LIB
{},
if (dim_order.empty() && strides.empty() && same_rank) {
dim_order.assign(tensor.dim_order().begin(), tensor.dim_order().end());
}
#endif // USE_ATEN_LIB
std::vector<executorch::aten::StridesType>(
tensor.strides().begin(), tensor.strides().end()),
if (strides.empty() && dim_order.empty() && same_shape) {
strides.assign(tensor.strides().begin(), tensor.strides().end());
}
return make_tensor_ptr(
std::move(sizes),
tensor.mutable_data_ptr(),
std::move(dim_order),
std::move(strides),
tensor.scalar_type()
#ifndef USE_ATEN_LIB
,
Expand All@@ -352,21 +380,21 @@ inline TensorPtr make_tensor_ptr(const executorch::aten::Tensor& tensor) {
}

/**
* Creates a TensorPtr to manage a new Tensor with the same properties
* as the Tensor referenced by the given TensorPtr, sharing the same data
* without owning it.
* Convenience overload identical to make_tensor_ptr(*tensor_ptr, ...).
*
* This is a convenience overload equivalent to make_tensor_ptr(*tensor_ptr).
* It does not extend the lifetime of the underlying buffer; if the original
* owner releases the storage, all views aliasing it become dangling.
*
* @param tensor_ptr The TensorPtr whose underlying Tensor is used to initialize
* the returned view.
* @return A new TensorPtr managing a Tensor with the same properties as the
* original.
* @param tensor_ptr The source tensor pointer to alias.
* @param sizes Optional sizes override.
* @param dim_order Optional dimension order override.
* @param strides Optional strides override.
* @return A TensorPtr aliasing the same storage with requested metadata.
*/
inline TensorPtr make_tensor_ptr(const TensorPtr& tensor_ptr) {
return make_tensor_ptr(*tensor_ptr);
inline TensorPtr make_tensor_ptr(
const TensorPtr& tensor_ptr,
std::vector<executorch::aten::SizesType> sizes = {},
std::vector<executorch::aten::DimOrderType> dim_order = {},
std::vector<executorch::aten::StridesType> strides = {}) {
return make_tensor_ptr(
*tensor_ptr, std::move(sizes), std::move(dim_order), std::move(strides));
}

/**
Expand Down
204 changes: 201 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,6 +357,204 @@ TEST_F(TensorPtrTest, MakeTensorPtrFromExistingTensorInt32) {
EXPECT_EQ(new_tensor->scalar_type(), executorch::aten::ScalarType::Int);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesRankIncrease) {
std::vector<float> data = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr({2, 3}, std::move(data));
auto view = make_tensor_ptr(tensor, {1, 2, 3});

EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 1);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->const_data_ptr<float>(), tensor->const_data_ptr<float>());
EXPECT_EQ(view->strides()[0], 6);
EXPECT_EQ(view->strides()[1], 3);
EXPECT_EQ(view->strides()[2], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideSizesSameRankRecomputesStrides) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {4, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
}

TEST_F(TensorPtrTest, MakeViewOverrideDimOrderOnly) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 2);
}

TEST_F(TensorPtrTest, MakeViewOverrideStridesOnlyInfersDimOrder) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {}, {1, 3});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewReuseMetadataWhenShapeSame) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data, {1, 0}, {1, 3});
auto view = make_tensor_ptr(tensor, {3, 4});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewShapeChangeWithExplicitOldStridesExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
std::vector<executorch::aten::StridesType> old_strides(
tensor->strides().begin(), tensor->strides().end());

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {2, 6}, {}, old_strides); }, "");
}

TEST_F(TensorPtrTest, MakeViewInvalidDimOrderExpectDeath) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);

ET_EXPECT_DEATH(
{ auto _ = make_tensor_ptr(tensor, {3, 4}, {2, 1}, {1, 4}); }, "");
}

TEST_F(TensorPtrTest, MakeViewFromTensorPtrConvenienceOverload) {
float data[12] = {0};
auto tensor = make_tensor_ptr({3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {1, 0}, {});

EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 4);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, MakeViewRankDecreaseFlatten) {
float data[6] = {1, 2, 3, 4, 5, 6};
auto tensor = make_tensor_ptr(
{2, 3},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto view = make_tensor_ptr(tensor, {6});
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_NE(tensor->unsafeGetTensorImpl(), view->unsafeGetTensorImpl());
EXPECT_EQ(resize_tensor_ptr(view, {3, 2}), Error::NotSupported);
EXPECT_EQ(view->dim(), 1);
EXPECT_EQ(view->size(0), 6);
}

TEST_F(TensorPtrTest, MakeViewFromScalarAliasAnd1D) {
float scalar_value = 7.f;
auto tensor = make_tensor_ptr({}, &scalar_value);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(alias->dim(), 0);
EXPECT_EQ(alias->numel(), 1);
auto reshaped = make_tensor_ptr(tensor, {1});
EXPECT_EQ(reshaped->dim(), 1);
EXPECT_EQ(reshaped->size(0), 1);
EXPECT_EQ(reshaped->strides()[0], 1);
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {0}, {}); }, "");
ET_EXPECT_DEATH({ auto unused = make_tensor_ptr(tensor, {}, {}, {1}); }, "");
}

TEST_F(TensorPtrTest, MakeViewExplicitDimOrderAndStridesShapeChange) {
float data[6] = {0};
auto tensor = make_tensor_ptr({2, 3}, data);
auto view = make_tensor_ptr(tensor, {3, 2}, {1, 0}, {1, 3});
EXPECT_EQ(view->dim(), 2);
EXPECT_EQ(view->size(0), 3);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->strides()[0], 1);
EXPECT_EQ(view->strides()[1], 3);
}

TEST_F(TensorPtrTest, TensorUint8dataInt16Type) {
std::vector<int16_t> int16_values = {-1, 2, -3, 4};
auto byte_pointer = reinterpret_cast<const uint8_t*>(int16_values.data());
std::vector<uint8_t> byte_data(
byte_pointer, byte_pointer + int16_values.size() * sizeof(int16_t));
auto tensor = make_tensor_ptr(
{4}, std::move(byte_data), executorch::aten::ScalarType::Short);
EXPECT_EQ(tensor->dim(), 1);
EXPECT_EQ(tensor->size(0), 4);
auto int16_data = tensor->const_data_ptr<int16_t>();
EXPECT_EQ(int16_data[0], -1);
EXPECT_EQ(int16_data[1], 2);
EXPECT_EQ(int16_data[2], -3);
EXPECT_EQ(int16_data[3], 4);
}

TEST_F(TensorPtrTest, MakeView3DDimOrderOnly) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data);
auto view = make_tensor_ptr(tensor, {}, {2, 0, 1}, {});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 2);
EXPECT_EQ(view->size(1), 3);
EXPECT_EQ(view->size(2), 4);
EXPECT_EQ(view->strides()[0], 3);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 6);
}

#ifndef USE_ATEN_LIB
TEST_F(TensorPtrTest, MakeViewDynamismPropagationResizeAlias) {
float data[12] = {0};
auto tensor = make_tensor_ptr(
{3, 4},
data,
{},
{},
executorch::aten::ScalarType::Float,
executorch::aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
auto alias = make_tensor_ptr(tensor);
EXPECT_EQ(resize_tensor_ptr(alias, {2, 6}), Error::Ok);
EXPECT_EQ(alias->size(0), 2);
EXPECT_EQ(alias->size(1), 6);
EXPECT_EQ(tensor->size(0), 3);
EXPECT_EQ(tensor->size(1), 4);
}

TEST_F(TensorPtrTest, MakeViewSameRankShapeChangeCopiesDimOrder) {
float data[24] = {0};
auto tensor = make_tensor_ptr({2, 3, 4}, data, {2, 0, 1}, {3, 1, 6});
auto view = make_tensor_ptr(tensor, {4, 2, 3});
EXPECT_EQ(view->dim(), 3);
EXPECT_EQ(view->size(0), 4);
EXPECT_EQ(view->size(1), 2);
EXPECT_EQ(view->size(2), 3);
EXPECT_EQ(view->strides()[0], 2);
EXPECT_EQ(view->strides()[1], 1);
EXPECT_EQ(view->strides()[2], 8);
}
#endif

TEST_F(TensorPtrTest, CloneTensorPtrFromExistingTensorInt32) {
std::vector<int32_t> data = {1, 2, 3, 4};
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
Expand DownExpand Up@@ -803,7 +1001,7 @@ TEST_F(TensorPtrTest, TensorDeducedScalarType) {
EXPECT_EQ(tensor->const_data_ptr<double>()[3], 4.0);
}

TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
TEST_F(TensorPtrTest, TensorUint8dataWithFloatScalarType) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));

Expand All@@ -827,14 +1025,14 @@ TEST_F(TensorPtrTest, TensorUint8BufferWithFloatScalarType) {
EXPECT_EQ(tensor->const_data_ptr<float>()[3], 4.0f);
}

TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooSmallExpectDeath) {
std::vector<uint8_t> data(
2 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH(
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
TEST_F(TensorPtrTest, TensorUint8dataTooLargeExpectDeath) {
std::vector<uint8_t> data(
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
Expand Down
Loading