Skip to content

Commit 5feb0f7

Browse files
authored
Update tensor_ptr_test.cpp
1 parent d6d5e83 commit 5feb0f7

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

extension/tensor/test/tensor_ptr_test.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TensorPtrTest : public ::testing::Test {
2424

2525
TEST_F(TensorPtrTest, ScalarTensorCreation) {
2626
float scalar_data = 3.14f;
27-
auto tensor = make_tensor_ptr(exec_aten::ScalarType::Float, {}, &scalar_data);
27+
auto tensor = make_tensor_ptr({}, &scalar_data);
2828

2929
EXPECT_EQ(tensor->numel(), 1);
3030
EXPECT_EQ(tensor->dim(), 0);
@@ -80,8 +80,7 @@ TEST_F(TensorPtrTest, ScalarTensorSingleValueCreation) {
8080

8181
TEST_F(TensorPtrTest, CreateTensorWithStridesAndDimOrder) {
8282
float data[20] = {2};
83-
auto tensor = make_tensor_ptr(
84-
exec_aten::ScalarType::Float, {4, 5}, data, {0, 1}, {5, 1});
83+
auto tensor = make_tensor_ptr({4, 5}, data, {0, 1}, {5, 1});
8584
EXPECT_EQ(tensor->dim(), 2);
8685
EXPECT_EQ(tensor->size(0), 4);
8786
EXPECT_EQ(tensor->size(1), 5);
@@ -93,7 +92,7 @@ TEST_F(TensorPtrTest, CreateTensorWithStridesAndDimOrder) {
9392

9493
TEST_F(TensorPtrTest, TensorSharingImpl) {
9594
float data[20] = {2};
96-
auto tensor1 = make_tensor_ptr(exec_aten::ScalarType::Float, {4, 5}, data);
95+
auto tensor1 = make_tensor_ptr({4, 5}, data);
9796
auto tensor2 = make_tensor_ptr(tensor1);
9897
EXPECT_EQ(tensor1->unsafeGetTensorImpl(), tensor2->unsafeGetTensorImpl());
9998
}
@@ -103,8 +102,7 @@ TEST_F(TensorPtrTest, TensorImplLifetime) {
103102
EXPECT_EQ(tensor, nullptr);
104103
{
105104
float data[20] = {2};
106-
auto tensor_impl =
107-
make_tensor_impl_ptr(exec_aten::ScalarType::Float, {4, 5}, data);
105+
auto tensor_impl = make_tensor_impl_ptr({4, 5}, data);
108106
tensor = make_tensor_ptr(tensor_impl);
109107
}
110108
EXPECT_EQ(tensor->dim(), 2);
@@ -114,22 +112,22 @@ TEST_F(TensorPtrTest, TensorImplLifetime) {
114112

115113
TEST_F(TensorPtrTest, TensorWithZeroDimensionAndElements) {
116114
float data[20] = {2};
117-
auto tensor = make_tensor_ptr(exec_aten::ScalarType::Float, {}, data);
115+
auto tensor = make_tensor_ptr({}, data);
118116
EXPECT_EQ(tensor->dim(), 0);
119117
EXPECT_EQ(tensor->numel(), 1);
120-
tensor = make_tensor_ptr(exec_aten::ScalarType::Float, {0, 5}, data);
118+
tensor = make_tensor_ptr({0, 5}, data);
121119
EXPECT_EQ(tensor->dim(), 2);
122120
EXPECT_EQ(tensor->numel(), 0);
123121
}
124122

125123
TEST_F(TensorPtrTest, TensorResize) {
126124
float data[20] = {2};
127125
auto tensor = make_tensor_ptr(
128-
exec_aten::ScalarType::Float,
129126
{4, 5},
130127
data,
131128
{},
132129
{},
130+
exec_aten::ScalarType::Float,
133131
exec_aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
134132
EXPECT_EQ(resize_tensor_ptr(tensor, {5, 4}), Error::Ok);
135133
EXPECT_EQ(tensor->size(0), 5);
@@ -138,7 +136,7 @@ TEST_F(TensorPtrTest, TensorResize) {
138136

139137
TEST_F(TensorPtrTest, TensorDataAccess) {
140138
float data[6] = {1, 2, 3, 4, 5, 6};
141-
auto tensor = make_tensor_ptr(exec_aten::ScalarType::Float, {2, 3}, data);
139+
auto tensor = make_tensor_ptr({2, 3}, data);
142140
EXPECT_EQ(tensor->const_data_ptr<float>()[0], 1);
143141
EXPECT_EQ(tensor->const_data_ptr<float>()[5], 6);
144142
tensor->mutable_data_ptr<float>()[0] = 10;
@@ -149,11 +147,11 @@ TEST_F(TensorPtrTest, TensorWithCustomDataDeleter) {
149147
auto deleter_called = false;
150148
float* data = new float[20]();
151149
auto tensor = make_tensor_ptr(
152-
exec_aten::ScalarType::Float,
153150
{4, 5},
154151
data,
155152
{},
156153
{},
154+
exec_aten::ScalarType::Float,
157155
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
158156
[&deleter_called](void* ptr) {
159157
deleter_called = true;
@@ -169,11 +167,11 @@ TEST_F(TensorPtrTest, TensorManagesMovedVector) {
169167
std::vector<float> data(20, 3.0f);
170168
auto* data_ptr = data.data();
171169
auto tensor = make_tensor_ptr(
172-
exec_aten::ScalarType::Float,
173170
{4, 5},
174171
data_ptr,
175172
{},
176173
{},
174+
exec_aten::ScalarType::Float,
177175
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
178176
[moved_data = std::move(data), &deleter_called](void*) mutable {
179177
deleter_called = true;
@@ -191,11 +189,11 @@ TEST_F(TensorPtrTest, TensorDeleterReleasesCapturedSharedPtr) {
191189
std::shared_ptr<float[]> data_ptr(
192190
new float[10], [](float* ptr) { delete[] ptr; });
193191
auto tensor = make_tensor_ptr(
194-
exec_aten::ScalarType::Float,
195192
{4, 5},
196193
data_ptr.get(),
197194
{},
198195
{},
196+
exec_aten::ScalarType::Float,
199197
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
200198
[data_ptr, &deleter_called](void*) mutable { deleter_called = true; });
201199

0 commit comments

Comments
 (0)