Skip to content

Commit 9025373

Browse files
authored
[Lod][fluid_ops] Remove recursive_sequence_lengths in tests (#69381)
* Fix * Fix * Fix
1 parent 7b8dd55 commit 9025373

9 files changed

+0
-265
lines changed

test/book/notest_understand_sentiment.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ def infer(word_dict, use_cuda, save_dirname=None):
191191
fetch_list=fetch_targets,
192192
return_numpy=False,
193193
)
194-
print(results[0].recursive_sequence_lengths())
195194
np_data = np.array(results[0])
196195
print("Inference Shape: ", np_data.shape)
197196
print("Inference results: ", np_data)

test/deprecated/legacy_test/test_weight_normalization_deprecated.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ def set_inputs(self, place):
114114
for desc in self.data_desc:
115115
tensor = base.Tensor()
116116
tensor.set(self.data[desc[0]][0], place)
117-
if self.data[desc[0]][1]:
118-
tensor.set_recursive_sequence_lengths(self.data[desc[0]][1])
119117
self.inputs[desc[0]] = tensor
120118

121119
def weight_normalize(self):

test/legacy_test/test_batch_norm_op.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ def create_or_get_tensor(scope, var_name, var, place):
191191
tensor = scope.var(var_name).get_tensor()
192192
if var is not None:
193193
assert isinstance(var, np.ndarray)
194-
tensor.set_recursive_sequence_lengths([])
195194
tensor.set(var, place)
196195
return tensor
197196

test/legacy_test/test_data_feeder.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ def test_lod_level_0_converter(self):
3434

3535
self.assertEqual(result['image'].shape(), [2, 1, 28, 28])
3636
self.assertEqual(result['label'].shape(), [2, 1])
37-
self.assertEqual(result['image'].recursive_sequence_lengths(), [])
38-
self.assertEqual(result['label'].recursive_sequence_lengths(), [])
3937

4038
try:
4139
result = feeder.feed([([0] * 783, [9]), ([1] * 783, [1])])
@@ -66,16 +64,6 @@ def test_lod_level_1_converter(self):
6664

6765
self.assertEqual(result['sentences'].shape(), [9, 1])
6866
self.assertEqual(result['label'].shape(), [3, 1])
69-
if paddle.framework.use_pir_api():
70-
self.assertEqual(
71-
result['sentences'].recursive_sequence_lengths(), []
72-
)
73-
else:
74-
self.assertEqual(
75-
result['sentences'].recursive_sequence_lengths(),
76-
[[3, 2, 4]],
77-
)
78-
self.assertEqual(result['label'].recursive_sequence_lengths(), [])
7967

8068
def test_lod_level_2_converter(self):
8169
with paddle.static.program_guard(
@@ -100,17 +88,6 @@ def test_lod_level_2_converter(self):
10088

10189
self.assertEqual(result['paragraphs'].shape(), [9, 1])
10290
self.assertEqual(result['label'].shape(), [2, 1])
103-
if paddle.framework.use_pir_api():
104-
self.assertEqual(
105-
result['paragraphs'].recursive_sequence_lengths(),
106-
[],
107-
)
108-
else:
109-
self.assertEqual(
110-
result['paragraphs'].recursive_sequence_lengths(),
111-
[[2, 1], [3, 2, 4]],
112-
)
113-
self.assertEqual(result['label'].recursive_sequence_lengths(), [])
11491

11592
def test_errors(self):
11693
def pir_mode_not_supported_str_feed():

test/legacy_test/test_feed_fetch_method.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ def test_feed_fetch(self):
3535
output.append(input_tensor)
3636
output_tensor = core.get_fetch_variable(scope, "fetch", 0)
3737

38-
output_lod = output_tensor.recursive_sequence_lengths()
39-
self.assertEqual(2, output_lod[0][0])
40-
self.assertEqual(2, output_lod[0][1])
41-
4238
output_array = np.array(output_tensor)
4339
self.assertEqual(3, output_array[0, 0, 0])
4440
self.assertEqual(10, output_array[3, 3, 5])

test/legacy_test/test_lod_tensor.py

Lines changed: 0 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -14,182 +14,5 @@
1414

1515
import unittest
1616

17-
import numpy as np
18-
19-
import paddle
20-
from paddle import base
21-
from paddle.base import core
22-
from paddle.base.lod_tensor import (
23-
create_lod_tensor,
24-
create_random_int_lodtensor,
25-
)
26-
27-
28-
class TestLoDTensor(unittest.TestCase):
29-
def test_pybind_recursive_seq_lens(self):
30-
tensor = base.DenseTensor()
31-
recursive_seq_lens = []
32-
tensor.set_recursive_sequence_lengths(recursive_seq_lens)
33-
recursive_seq_lens = [[], [1], [3]]
34-
self.assertRaises(
35-
Exception, tensor.set_recursive_sequence_lengths, recursive_seq_lens
36-
)
37-
recursive_seq_lens = [[0], [2], [3]]
38-
self.assertRaises(
39-
Exception, tensor.set_recursive_sequence_lengths, recursive_seq_lens
40-
)
41-
42-
recursive_seq_lens = [[1, 2, 3]]
43-
tensor.set_recursive_sequence_lengths(recursive_seq_lens)
44-
self.assertEqual(
45-
tensor.recursive_sequence_lengths(), recursive_seq_lens
46-
)
47-
tensor.set(np.random.random([6, 1]), base.CPUPlace())
48-
self.assertTrue(tensor.has_valid_recursive_sequence_lengths())
49-
tensor.set(np.random.random([9, 1]), base.CPUPlace())
50-
self.assertFalse(tensor.has_valid_recursive_sequence_lengths())
51-
52-
# Each level's sum should be equal to the number of items in the next level
53-
# Moreover, last level's sum should be equal to the tensor height
54-
recursive_seq_lens = [[2, 3], [1, 3, 1, 2, 2]]
55-
tensor.set_recursive_sequence_lengths(recursive_seq_lens)
56-
self.assertEqual(
57-
tensor.recursive_sequence_lengths(), recursive_seq_lens
58-
)
59-
tensor.set(np.random.random([8, 1]), base.CPUPlace())
60-
self.assertFalse(tensor.has_valid_recursive_sequence_lengths())
61-
recursive_seq_lens = [[2, 3], [1, 3, 1, 2, 1]]
62-
tensor.set_recursive_sequence_lengths(recursive_seq_lens)
63-
self.assertTrue(tensor.has_valid_recursive_sequence_lengths())
64-
tensor.set(np.random.random([9, 1]), base.CPUPlace())
65-
self.assertFalse(tensor.has_valid_recursive_sequence_lengths())
66-
67-
def test_create_lod_tensor(self):
68-
# Create DenseTensor from a list
69-
data = [
70-
[np.int64(1), np.int64(2), np.int64(3)],
71-
[np.int64(3), np.int64(4)],
72-
]
73-
wrong_recursive_seq_lens = [[2, 2]]
74-
correct_recursive_seq_lens = [[3, 2]]
75-
self.assertRaises(
76-
AssertionError,
77-
create_lod_tensor,
78-
data,
79-
wrong_recursive_seq_lens,
80-
base.CPUPlace(),
81-
)
82-
tensor = create_lod_tensor(
83-
data, correct_recursive_seq_lens, base.CPUPlace()
84-
)
85-
self.assertEqual(
86-
tensor.recursive_sequence_lengths(), correct_recursive_seq_lens
87-
)
88-
self.assertEqual(
89-
tensor._dtype(), paddle.base.core.VarDesc.VarType.INT64
90-
)
91-
self.assertEqual(tensor.shape(), [5, 1])
92-
np.testing.assert_array_equal(
93-
np.array(tensor),
94-
np.array([1, 2, 3, 3, 4]).reshape(tensor.shape()).astype('int64'),
95-
)
96-
97-
# Create DenseTensor from numpy array
98-
data = np.random.random([10, 1]).astype('float64')
99-
recursive_seq_lens = [[2, 1], [3, 3, 4]]
100-
tensor = create_lod_tensor(data, recursive_seq_lens, base.CPUPlace())
101-
self.assertEqual(
102-
tensor.recursive_sequence_lengths(), recursive_seq_lens
103-
)
104-
self.assertEqual(tensor._dtype(), paddle.base.core.VarDesc.VarType.FP64)
105-
self.assertEqual(tensor.shape(), [10, 1])
106-
np.testing.assert_array_equal(np.array(tensor), data)
107-
108-
# Create DenseTensor from another DenseTensor, they are differnt instances
109-
new_recursive_seq_lens = [[2, 2, 1], [1, 2, 2, 3, 2]]
110-
new_tensor = create_lod_tensor(
111-
tensor, new_recursive_seq_lens, base.CPUPlace()
112-
)
113-
self.assertEqual(
114-
tensor.recursive_sequence_lengths(), recursive_seq_lens
115-
)
116-
self.assertEqual(
117-
new_tensor.recursive_sequence_lengths(), new_recursive_seq_lens
118-
)
119-
120-
def test_create_random_int_lodtensor(self):
121-
# The shape of a word, commonly used in speech and NLP problem, is [1]
122-
shape = [1]
123-
recursive_seq_lens = [[2, 3, 5]]
124-
dict_size = 10000
125-
low = 0
126-
high = dict_size - 1
127-
tensor = create_random_int_lodtensor(
128-
recursive_seq_lens, shape, base.CPUPlace(), low, high
129-
)
130-
self.assertEqual(
131-
tensor.recursive_sequence_lengths(), recursive_seq_lens
132-
)
133-
self.assertEqual(tensor.shape(), [10, 1])
134-
135-
def test_print_lodtensor(self):
136-
shape = [1]
137-
recursive_seq_lens = [[2, 3, 5]]
138-
dict_size = 100
139-
low = 0
140-
high = dict_size - 1
141-
tensor = create_random_int_lodtensor(
142-
recursive_seq_lens, shape, base.CPUPlace(), low, high
143-
)
144-
print(tensor)
145-
self.assertTrue(isinstance(str(tensor), str))
146-
147-
if core.is_compiled_with_cuda():
148-
gtensor = create_random_int_lodtensor(
149-
recursive_seq_lens, shape, base.CUDAPlace(0), low, high
150-
)
151-
print(gtensor)
152-
self.assertTrue(isinstance(str(gtensor), str))
153-
154-
def test_dlpack_support(self):
155-
tensor = base.create_lod_tensor(
156-
np.array([[1], [2], [3], [4]]).astype('int'),
157-
[[1, 3]],
158-
base.CPUPlace(),
159-
)
160-
dltensor = tensor._to_dlpack()
161-
tensor_from_dlpack = base.core.from_dlpack(dltensor)
162-
self.assertTrue(isinstance(tensor_from_dlpack, base.core.DenseTensor))
163-
np.testing.assert_array_equal(
164-
np.array(tensor_from_dlpack),
165-
np.array([[1], [2], [3], [4]]).astype('int'),
166-
)
167-
# when build with cuda
168-
if core.is_compiled_with_cuda():
169-
gtensor = base.create_lod_tensor(
170-
np.array([[1], [2], [3], [4]]).astype('int'),
171-
[[1, 3]],
172-
base.CUDAPlace(0),
173-
)
174-
gdltensor = gtensor._to_dlpack()
175-
gtensor_from_dlpack = base.core.from_dlpack(gdltensor)
176-
self.assertTrue(
177-
isinstance(gtensor_from_dlpack, base.core.DenseTensor)
178-
)
179-
np.testing.assert_array_equal(
180-
np.array(gtensor_from_dlpack),
181-
np.array([[1], [2], [3], [4]]).astype('int'),
182-
)
183-
184-
def test_as_type(self):
185-
tensor = base.create_lod_tensor(
186-
np.array([[1], [2], [3], [4]]).astype('int'),
187-
[[1, 3]],
188-
base.CPUPlace(),
189-
)
190-
fp32_tensor = tensor._as_type(paddle.base.core.VarDesc.VarType.FP32)
191-
print(fp32_tensor)
192-
193-
19417
if __name__ == '__main__':
19518
unittest.main()

test/legacy_test/test_lod_tensor_array.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,19 @@ def test_get_set(self):
3030
for i in range(10):
3131
t = core.DenseTensor()
3232
t.set(np.array([i], dtype='float32'), cpu)
33-
t.set_recursive_sequence_lengths([[1]])
3433
tensor_array.append(t)
3534

3635
self.assertEqual(10, len(tensor_array))
3736

3837
for i in range(10):
3938
t = tensor_array[i]
4039
self.assertEqual(np.array(t), np.array([i], dtype='float32'))
41-
self.assertEqual([[1]], t.recursive_sequence_lengths())
4240

4341
t = core.DenseTensor()
4442
t.set(np.array([i + 10], dtype='float32'), cpu)
45-
t.set_recursive_sequence_lengths([[1]])
4643
tensor_array[i] = t
4744
t = tensor_array[i]
4845
self.assertEqual(np.array(t), np.array([i + 10], dtype='float32'))
49-
self.assertEqual([[1]], t.recursive_sequence_lengths())
5046

5147

5248
class TestCreateArray(unittest.TestCase):

test/legacy_test/test_print_op.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def setUp(self):
3535
self.x_tensor = base.core.DenseTensor()
3636
tensor_np = np.random.random(size=(2, 3)).astype(self.dtype)
3737
self.x_tensor.set(tensor_np, self.place)
38-
self.x_tensor.set_recursive_sequence_lengths([[1, 1]])
3938

4039
def build_network(self, only_forward, **kargs):
4140
x = paddle.static.data(
@@ -140,7 +139,6 @@ def setUp(self):
140139
self.x_tensor = base.core.DenseTensor()
141140
tensor_np = np.random.random(size=(2, 3)).astype(self.dtype)
142141
self.x_tensor.set(tensor_np, self.place)
143-
self.x_tensor.set_recursive_sequence_lengths([[1, 1]])
144142

145143

146144
@unittest.skipIf(
@@ -153,7 +151,6 @@ def setUp(self):
153151
self.x_tensor = base.core.DenseTensor()
154152
tensor_np = np.random.random(size=(2, 3)).astype(self.dtype)
155153
self.x_tensor.set(tensor_np, self.place)
156-
self.x_tensor.set_recursive_sequence_lengths([[1, 1]])
157154

158155

159156
@unittest.skipIf(
@@ -166,7 +163,6 @@ def setUp(self):
166163
self.x_tensor = base.core.DenseTensor()
167164
tensor_np = convert_float_to_uint16(np.random.random(size=(2, 3)))
168165
self.x_tensor.set(tensor_np, self.place)
169-
self.x_tensor.set_recursive_sequence_lengths([[1, 1]])
170166

171167

172168
class TestPrintOpBackward(unittest.TestCase):

test/legacy_test/test_tensor.py

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,10 @@ def test_int_lod_tensor(self):
173173
array[0, 0, 0] = 3
174174
array[3, 3, 5] = 10
175175
lod_tensor.set(array, place)
176-
lod_tensor.set_recursive_sequence_lengths([[2, 2]])
177176

178177
lod_v = np.array(lod_tensor)
179178
self.assertTrue(np.all(array == lod_v))
180179

181-
lod = lod_tensor.recursive_sequence_lengths()
182-
self.assertEqual(2, lod[0][0])
183-
self.assertEqual(2, lod[0][1])
184-
185180
def test_float_lod_tensor(self):
186181
place = core.CPUPlace()
187182
scope = core.Scope()
@@ -200,50 +195,6 @@ def test_float_lod_tensor(self):
200195
lod_v = np.array(lod_tensor)
201196
self.assertAlmostEqual(1.0, lod_v[0, 0, 0, 0])
202197
self.assertAlmostEqual(2.0, lod_v[0, 0, 0, 1])
203-
self.assertEqual(len(lod_tensor.recursive_sequence_lengths()), 0)
204-
205-
lod_py = [[2, 1], [1, 2, 2]]
206-
lod_tensor.set_recursive_sequence_lengths(lod_py)
207-
lod = lod_tensor.recursive_sequence_lengths()
208-
self.assertListEqual(lod_py, lod)
209-
210-
def test_lod_tensor_init(self):
211-
place = core.CPUPlace()
212-
lod_py = [[2, 1], [1, 2, 2]]
213-
lod_tensor = core.DenseTensor()
214-
215-
lod_tensor._set_dims([5, 2, 3, 4])
216-
lod_tensor.set_recursive_sequence_lengths(lod_py)
217-
lod_tensor._alloc_float(place)
218-
tensor_array = np.array(lod_tensor)
219-
tensor_array[0, 0, 0, 0] = 1.0
220-
tensor_array[0, 0, 0, 1] = 2.0
221-
lod_tensor.set(tensor_array, place)
222-
223-
lod_v = np.array(lod_tensor)
224-
self.assertAlmostEqual(1.0, lod_v[0, 0, 0, 0])
225-
self.assertAlmostEqual(2.0, lod_v[0, 0, 0, 1])
226-
self.assertListEqual(lod_py, lod_tensor.recursive_sequence_lengths())
227-
228-
def test_lod_tensor_gpu_init(self):
229-
if not core.is_compiled_with_cuda():
230-
return
231-
place = core.CUDAPlace(0)
232-
lod_py = [[2, 1], [1, 2, 2]]
233-
lod_tensor = core.DenseTensor()
234-
235-
lod_tensor._set_dims([5, 2, 3, 4])
236-
lod_tensor.set_recursive_sequence_lengths(lod_py)
237-
lod_tensor._alloc_float(place)
238-
tensor_array = np.array(lod_tensor)
239-
tensor_array[0, 0, 0, 0] = 1.0
240-
tensor_array[0, 0, 0, 1] = 2.0
241-
lod_tensor.set(tensor_array, place)
242-
243-
lod_v = np.array(lod_tensor)
244-
self.assertAlmostEqual(1.0, lod_v[0, 0, 0, 0])
245-
self.assertAlmostEqual(2.0, lod_v[0, 0, 0, 1])
246-
self.assertListEqual(lod_py, lod_tensor.recursive_sequence_lengths())
247198

248199
def test_empty_tensor(self):
249200
place = core.CPUPlace()

0 commit comments

Comments
 (0)