Skip to content

Use dynamic bound by default. #5234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Use dynamic bound by default. #5234

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
7 changes: 2 additions & 5 deletions extension/llm/runner/text_token_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,8 @@ class TextTokenGenerator {
}

// initialize tensor wrappers
auto tokens_managed = from_blob(
token_data.data(),
token_shape,
exec_aten::ScalarType::Long,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND);
auto tokens_managed =
from_blob(token_data.data(), token_shape, exec_aten::ScalarType::Long);

auto start_pos_managed = from_blob(&pos, {1}, exec_aten::ScalarType::Long);

Expand Down
8 changes: 4 additions & 4 deletions extension/tensor/tensor_impl_ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ TensorImplPtr make_tensor_impl_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
std::function<void(void*)> deleter = nullptr);

/**
Expand All @@ -93,7 +93,7 @@ TensorImplPtr make_tensor_impl_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
constexpr exec_aten::ScalarType scalar_type =
runtime::CppTypeToScalarType<T>::value;
const auto raw_data_ptr = data.data();
Expand Down Expand Up @@ -126,7 +126,7 @@ template <typename T = float>
TensorImplPtr make_tensor_impl_ptr(
std::vector<T> data,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
constexpr exec_aten::ScalarType scalar_type =
runtime::CppTypeToScalarType<T>::value;
std::vector<exec_aten::SizesType> sizes{exec_aten::SizesType(data.size())};
Expand Down Expand Up @@ -165,7 +165,7 @@ TensorImplPtr make_tensor_impl_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC);
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND);

} // namespace extension
} // namespace executorch
8 changes: 4 additions & 4 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ inline TensorPtr make_tensor_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
const exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
std::function<void(void*)> deleter = nullptr) {
return make_tensor_ptr(make_tensor_impl_ptr(
type,
Expand Down Expand Up @@ -160,7 +160,7 @@ TensorPtr make_tensor_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return make_tensor_ptr(make_tensor_impl_ptr(
std::move(sizes),
std::move(data),
Expand All @@ -186,7 +186,7 @@ template <typename T = float>
TensorPtr make_tensor_ptr(
std::vector<T> data,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return make_tensor_ptr(make_tensor_impl_ptr(std::move(data), dynamism));
}

Expand All @@ -212,7 +212,7 @@ inline TensorPtr make_tensor_ptr(
std::vector<exec_aten::DimOrderType> dim_order = {},
std::vector<exec_aten::StridesType> strides = {},
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return make_tensor_ptr(make_tensor_impl_ptr(
scalar_type,
std::move(sizes),
Expand Down
10 changes: 5 additions & 5 deletions extension/tensor/tensor_ptr_maker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class TensorPtrMaker final {
void* data_ = nullptr;
exec_aten::ScalarType type_ = exec_aten::ScalarType::Float;
exec_aten::TensorShapeDynamism dynamism_ =
exec_aten::TensorShapeDynamism::STATIC;
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND;
};

/**
Expand Down Expand Up @@ -182,7 +182,7 @@ inline TensorPtr from_blob(
std::vector<exec_aten::SizesType> sizes,
exec_aten::ScalarType type = exec_aten::ScalarType::Float,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return for_blob(data, std::move(sizes), type)
.dynamism(dynamism)
.make_tensor_ptr();
Expand Down Expand Up @@ -210,7 +210,7 @@ inline TensorPtr from_blob(
std::vector<exec_aten::StridesType> strides,
exec_aten::ScalarType type = exec_aten::ScalarType::Float,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return for_blob(data, std::move(sizes), type)
.strides(std::move(strides))
.dynamism(dynamism)
Expand Down Expand Up @@ -239,7 +239,7 @@ inline TensorPtr from_blob(
exec_aten::ScalarType type,
std::function<void(void*)>&& deleter,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return for_blob(data, std::move(sizes), type)
.deleter(std::move(deleter))
.dynamism(dynamism)
Expand Down Expand Up @@ -270,7 +270,7 @@ inline TensorPtr from_blob(
exec_aten::ScalarType type,
std::function<void(void*)>&& deleter,
exec_aten::TensorShapeDynamism dynamism =
exec_aten::TensorShapeDynamism::STATIC) {
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND) {
return for_blob(data, std::move(sizes), type)
.strides(std::move(strides))
.deleter(std::move(deleter))
Expand Down
4 changes: 2 additions & 2 deletions extension/tensor/test/tensor_impl_ptr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ TEST_F(TensorImplPtrTest, TensorImplDataDeleterReleasesCapturedSharedPtr) {
data_ptr.get(),
{},
{},
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
[data_ptr, &deleter_called](void*) mutable { deleter_called = true; });

EXPECT_EQ(data_ptr.use_count(), 2);
Expand Down Expand Up @@ -280,7 +280,7 @@ TEST_F(TensorImplPtrTest, CustomDeleterWithSharedData) {
data->data(),
{},
{},
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
[data, &deleter_called](void*) mutable {
deleter_called = true;
data.reset();
Expand Down
6 changes: 3 additions & 3 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ TEST_F(TensorPtrTest, TensorWithCustomDataDeleter) {
data,
{},
{},
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
[&deleter_called](void* ptr) {
deleter_called = true;
delete[] static_cast<float*>(ptr);
Expand All @@ -118,7 +118,7 @@ TEST_F(TensorPtrTest, TensorManagesMovedVector) {
data_ptr,
{},
{},
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
[moved_data = std::move(data), &deleter_called](void*) mutable {
deleter_called = true;
});
Expand All @@ -140,7 +140,7 @@ TEST_F(TensorPtrTest, TensorDeleterReleasesCapturedSharedPtr) {
data_ptr.get(),
{},
{},
exec_aten::TensorShapeDynamism::STATIC,
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
[data_ptr, &deleter_called](void*) mutable { deleter_called = true; });

EXPECT_EQ(data_ptr.use_count(), 2);
Expand Down