@@ -24,7 +24,7 @@ class TensorPtrTest : public ::testing::Test {
24
24
25
25
TEST_F (TensorPtrTest, ScalarTensorCreation) {
26
26
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);
28
28
29
29
EXPECT_EQ (tensor->numel (), 1 );
30
30
EXPECT_EQ (tensor->dim (), 0 );
@@ -80,8 +80,7 @@ TEST_F(TensorPtrTest, ScalarTensorSingleValueCreation) {
80
80
81
81
TEST_F (TensorPtrTest, CreateTensorWithStridesAndDimOrder) {
82
82
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 });
85
84
EXPECT_EQ (tensor->dim (), 2 );
86
85
EXPECT_EQ (tensor->size (0 ), 4 );
87
86
EXPECT_EQ (tensor->size (1 ), 5 );
@@ -93,7 +92,7 @@ TEST_F(TensorPtrTest, CreateTensorWithStridesAndDimOrder) {
93
92
94
93
TEST_F (TensorPtrTest, TensorSharingImpl) {
95
94
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);
97
96
auto tensor2 = make_tensor_ptr (tensor1);
98
97
EXPECT_EQ (tensor1->unsafeGetTensorImpl (), tensor2->unsafeGetTensorImpl ());
99
98
}
@@ -103,8 +102,7 @@ TEST_F(TensorPtrTest, TensorImplLifetime) {
103
102
EXPECT_EQ (tensor, nullptr );
104
103
{
105
104
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);
108
106
tensor = make_tensor_ptr (tensor_impl);
109
107
}
110
108
EXPECT_EQ (tensor->dim (), 2 );
@@ -114,22 +112,22 @@ TEST_F(TensorPtrTest, TensorImplLifetime) {
114
112
115
113
TEST_F (TensorPtrTest, TensorWithZeroDimensionAndElements) {
116
114
float data[20 ] = {2 };
117
- auto tensor = make_tensor_ptr (exec_aten::ScalarType::Float, {}, data);
115
+ auto tensor = make_tensor_ptr ({}, data);
118
116
EXPECT_EQ (tensor->dim (), 0 );
119
117
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);
121
119
EXPECT_EQ (tensor->dim (), 2 );
122
120
EXPECT_EQ (tensor->numel (), 0 );
123
121
}
124
122
125
123
TEST_F (TensorPtrTest, TensorResize) {
126
124
float data[20 ] = {2 };
127
125
auto tensor = make_tensor_ptr (
128
- exec_aten::ScalarType::Float,
129
126
{4 , 5 },
130
127
data,
131
128
{},
132
129
{},
130
+ exec_aten::ScalarType::Float,
133
131
exec_aten::TensorShapeDynamism::DYNAMIC_UNBOUND);
134
132
EXPECT_EQ (resize_tensor_ptr (tensor, {5 , 4 }), Error::Ok);
135
133
EXPECT_EQ (tensor->size (0 ), 5 );
@@ -138,7 +136,7 @@ TEST_F(TensorPtrTest, TensorResize) {
138
136
139
137
TEST_F (TensorPtrTest, TensorDataAccess) {
140
138
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);
142
140
EXPECT_EQ (tensor->const_data_ptr <float >()[0 ], 1 );
143
141
EXPECT_EQ (tensor->const_data_ptr <float >()[5 ], 6 );
144
142
tensor->mutable_data_ptr <float >()[0 ] = 10 ;
@@ -149,11 +147,11 @@ TEST_F(TensorPtrTest, TensorWithCustomDataDeleter) {
149
147
auto deleter_called = false ;
150
148
float * data = new float [20 ]();
151
149
auto tensor = make_tensor_ptr (
152
- exec_aten::ScalarType::Float,
153
150
{4 , 5 },
154
151
data,
155
152
{},
156
153
{},
154
+ exec_aten::ScalarType::Float,
157
155
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
158
156
[&deleter_called](void * ptr) {
159
157
deleter_called = true ;
@@ -169,11 +167,11 @@ TEST_F(TensorPtrTest, TensorManagesMovedVector) {
169
167
std::vector<float > data (20 , 3 .0f );
170
168
auto * data_ptr = data.data ();
171
169
auto tensor = make_tensor_ptr (
172
- exec_aten::ScalarType::Float,
173
170
{4 , 5 },
174
171
data_ptr,
175
172
{},
176
173
{},
174
+ exec_aten::ScalarType::Float,
177
175
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
178
176
[moved_data = std::move (data), &deleter_called](void *) mutable {
179
177
deleter_called = true ;
@@ -191,11 +189,11 @@ TEST_F(TensorPtrTest, TensorDeleterReleasesCapturedSharedPtr) {
191
189
std::shared_ptr<float []> data_ptr (
192
190
new float [10 ], [](float * ptr) { delete[] ptr; });
193
191
auto tensor = make_tensor_ptr (
194
- exec_aten::ScalarType::Float,
195
192
{4 , 5 },
196
193
data_ptr.get (),
197
194
{},
198
195
{},
196
+ exec_aten::ScalarType::Float,
199
197
exec_aten::TensorShapeDynamism::DYNAMIC_BOUND,
200
198
[data_ptr, &deleter_called](void *) mutable { deleter_called = true ; });
201
199
0 commit comments