Skip to content

Commit beb0d8d

Browse files
authored
[Cleanup][B-7] clean some to_variable for test (#61511)
1 parent 537008d commit beb0d8d

10 files changed

Lines changed: 31 additions & 32 deletions

test/dygraph_to_static/test_for_enumerate.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
)
2525

2626
import paddle
27-
from paddle import base
2827
from paddle.static import InputSpec
2928

3029

3130
# 0. for in range var.numpy()[0]
3231
def for_in_range(x):
3332
z = paddle.tensor.fill_constant([1], 'int32', 0)
34-
x = base.dygraph.to_variable(x)
33+
x = paddle.to_tensor(x)
3534
for i in range(x.numpy().item()):
3635
z = z + i
3736
return z
@@ -56,7 +55,7 @@ def for_enumerate_list(x_array):
5655
# 3. for iter var.numpy()
5756
def for_iter_var_numpy(x_array):
5857
z = paddle.tensor.fill_constant([1], 'int32', 0)
59-
x_array = base.dygraph.to_variable(x_array)
58+
x_array = paddle.to_tensor(x_array)
6059
for x in x_array.numpy():
6160
z = z + x
6261
return z
@@ -66,7 +65,7 @@ def for_iter_var_numpy(x_array):
6665
def for_enumerate_var_numpy(x_array):
6766
y = paddle.tensor.fill_constant([1], 'int32', 0)
6867
z = paddle.tensor.fill_constant([1], 'int32', 0)
69-
x_array = base.dygraph.to_variable(x_array)
68+
x_array = paddle.to_tensor(x_array)
7069
for i, x in enumerate(x_array.numpy()):
7170
y = y + i
7271
z = z + x
@@ -77,7 +76,7 @@ def for_enumerate_var_numpy(x_array):
7776
def for_enumerate_var_numpy_with_start(x_array):
7877
y = paddle.tensor.fill_constant([1], 'int32', 0)
7978
z = paddle.tensor.fill_constant([1], 'int32', 0)
80-
x_array = base.dygraph.to_variable(x_array)
79+
x_array = paddle.to_tensor(x_array)
8180
for i, x in enumerate(x_array.numpy(), 1):
8281
y = y + i
8382
z = z + x
@@ -87,7 +86,7 @@ def for_enumerate_var_numpy_with_start(x_array):
8786
# 6. for in range with break
8887
def for_in_range_with_break(x):
8988
z = paddle.tensor.fill_constant([1], 'int32', 0)
90-
x = base.dygraph.to_variable(x)
89+
x = paddle.to_tensor(x)
9190
for i in range(x.numpy()[0]):
9291
z = z + i
9392
if i > 2:
@@ -99,7 +98,7 @@ def for_in_range_with_break(x):
9998
def for_enumerate_var_numpy_with_break(x_array):
10099
y = paddle.tensor.fill_constant([1], 'int32', 0)
101100
z = paddle.tensor.fill_constant([1], 'int32', 0)
102-
x_array = base.dygraph.to_variable(x_array)
101+
x_array = paddle.to_tensor(x_array)
103102
for i, x in enumerate(x_array.numpy()):
104103
y = y + i
105104
z = z + x
@@ -112,7 +111,7 @@ def for_enumerate_var_numpy_with_break(x_array):
112111
def for_enumerate_var_numpy_with_continue(x_array):
113112
y = paddle.tensor.fill_constant([1], 'int32', 0)
114113
z = paddle.tensor.fill_constant([1], 'int32', 0)
115-
x_array = base.dygraph.to_variable(x_array)
114+
x_array = paddle.to_tensor(x_array)
116115
for i, x in enumerate(x_array.numpy()):
117116
y = y + i
118117
if i > 2:
@@ -125,7 +124,7 @@ def for_enumerate_var_numpy_with_continue(x_array):
125124
def for_enumerate_var_numpy_with_start_break(x_array):
126125
y = paddle.tensor.fill_constant([1], 'int32', 0)
127126
z = paddle.tensor.fill_constant([1], 'int32', 0)
128-
x_array = base.dygraph.to_variable(x_array)
127+
x_array = paddle.to_tensor(x_array)
129128
for i, x in enumerate(x_array.numpy(), 1):
130129
y = y + i
131130
z = z + x
@@ -138,7 +137,7 @@ def for_enumerate_var_numpy_with_start_break(x_array):
138137
def for_enumerate_var_numpy_with_start_continue(x_array):
139138
y = paddle.tensor.fill_constant([1], 'int32', 0)
140139
z = paddle.tensor.fill_constant([1], 'int32', 0)
141-
x_array = base.dygraph.to_variable(x_array)
140+
x_array = paddle.to_tensor(x_array)
142141
for i, x in enumerate(x_array.numpy(), 1):
143142
y = y + i
144143
if i > 2:
@@ -150,7 +149,7 @@ def for_enumerate_var_numpy_with_start_continue(x_array):
150149
# 11. for iter var
151150
def for_iter_var(x_array):
152151
z = paddle.tensor.fill_constant([1], 'int32', 0)
153-
x_array = base.dygraph.to_variable(x_array)
152+
x_array = paddle.to_tensor(x_array)
154153

155154
for x in x_array:
156155
z = z + x
@@ -161,7 +160,7 @@ def for_iter_var(x_array):
161160
def for_enumerate_var(x_array):
162161
y = paddle.tensor.fill_constant([1], 'int32', 0)
163162
z = paddle.tensor.fill_constant([1], 'int32', 0)
164-
x_array = base.dygraph.to_variable(x_array)
163+
x_array = paddle.to_tensor(x_array)
165164
for i, x in enumerate(x_array):
166165
y = y + i
167166
z = z + x
@@ -171,7 +170,7 @@ def for_enumerate_var(x_array):
171170
# 13. for iter list[var]
172171
def for_iter_var_list(x):
173172
# 1. prepare data, ref test_list.py
174-
x = base.dygraph.to_variable(x)
173+
x = paddle.to_tensor(x)
175174
iter_num = paddle.tensor.fill_constant(shape=[1], value=5, dtype="int32")
176175
a = []
177176
for i in range(iter_num):
@@ -186,7 +185,7 @@ def for_iter_var_list(x):
186185
# 14. for enumerate list[var]
187186
def for_enumerate_var_list(x):
188187
# 1. prepare data, ref test_list.py
189-
x = base.dygraph.to_variable(x)
188+
x = paddle.to_tensor(x)
190189
iter_num = paddle.tensor.fill_constant(shape=[1], value=5, dtype="int32")
191190
a = []
192191
for i in range(iter_num):
@@ -203,7 +202,7 @@ def for_enumerate_var_list(x):
203202
# 15. for enumerate list[var] with a nested for range
204203
def for_enumerate_var_with_nested_range(x_array):
205204
x = paddle.tensor.fill_constant([1], 'int32', 0)
206-
x_array = base.dygraph.to_variable(x_array)
205+
x_array = paddle.to_tensor(x_array)
207206
for i, num in enumerate(x_array):
208207
for idx in range(num):
209208
x = x + num
@@ -213,7 +212,7 @@ def for_enumerate_var_with_nested_range(x_array):
213212
# 16. for iter var[idx]
214213
def for_iter_var_idx(x_array):
215214
z = paddle.tensor.fill_constant([1], 'int32', 0)
216-
x_array = base.dygraph.to_variable(x_array)
215+
x_array = paddle.to_tensor(x_array)
217216

218217
for x in x_array[0:]:
219218
z = z + x

test/legacy_test/test_elementwise_pow_op.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ def test_grad(self):
230230
places.append(base.CUDAPlace(0))
231231
for place in places:
232232
with base.dygraph.guard(place):
233-
x = base.dygraph.to_variable(self.x, zero_copy=False)
234-
y = base.dygraph.to_variable(self.y, zero_copy=False)
233+
x = paddle.to_tensor(self.x)
234+
y = paddle.to_tensor(self.y)
235235
x.stop_gradient = False
236236
y.stop_gradient = False
237237
res = x**y

test/legacy_test/test_elementwise_sub_op.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,8 @@ def test_dygraph(self):
930930
with base.dygraph.guard():
931931
np_x = np.array([2, 3, 4]).astype('float64')
932932
np_y = np.array([1, 5, 2]).astype('float64')
933-
x = base.dygraph.to_variable(np_x)
934-
y = base.dygraph.to_variable(np_y)
933+
x = paddle.to_tensor(np_x)
934+
y = paddle.to_tensor(np_y)
935935
z = self._executed_api(x, y)
936936
np_z = z.numpy(False)
937937
z_expected = np.array([1.0, -2.0, 2.0])

test/legacy_test/test_erf_op.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _test_case(self, place):
6868
x = np.random.uniform(-1, 1, size=(11, 17)).astype(np.float64)
6969
y_ref = erf(x)
7070
with dg.guard(place) as g:
71-
x_var = dg.to_variable(x)
71+
x_var = paddle.to_tensor(x)
7272
y_var = paddle.erf(x_var)
7373
y_test = y_var.numpy()
7474
np.testing.assert_allclose(y_ref, y_test, rtol=1e-05)

test/legacy_test/test_exception.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_exception_in_dynamic_mode(self):
8484
with base.dygraph.guard(place):
8585
x = numpy.random.random(size=(10, 2)).astype('float32')
8686
linear = paddle.nn.Linear(1, 10)
87-
data = base.dygraph.to_variable(x)
87+
data = paddle.to_tensor(x)
8888
with self.assertRaises(ValueError):
8989
res = linear(data)
9090

test/legacy_test/test_fill_constant_op.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ def test_api(self):
373373
data1 = np.array([1, 2]).astype('int32')
374374
data2 = np.array([1.1]).astype('float32')
375375
data3 = np.array([88]).astype('int32')
376-
shape = base.dygraph.to_variable(data1)
377-
val = base.dygraph.to_variable(data2)
378-
value = base.dygraph.to_variable(data3)
376+
shape = paddle.to_tensor(data1)
377+
val = paddle.to_tensor(data2)
378+
value = paddle.to_tensor(data3)
379379
res1 = paddle.tensor.fill_constant(
380380
shape=[1, 2], dtype='float32', value=1.1
381381
)

test/legacy_test/test_fleet_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def setUp(self):
161161
def test_dygraph_method(self):
162162
paddle.disable_static()
163163
value = np.arange(26).reshape(2, 13).astype("float32")
164-
a = base.dygraph.to_variable(value)
164+
a = paddle.to_tensor(value)
165165
layer = paddle.nn.Linear(13, 5)
166166
adam = paddle.optimizer.Adam(
167167
learning_rate=0.01, parameters=layer.parameters()

test/legacy_test/test_flip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def test_static_graph(self):
5858
def test_dygraph(self):
5959
img = np.array([[1, 2, 3], [4, 5, 6]]).astype(np.float32)
6060
with base.dygraph.guard():
61-
inputs = base.dygraph.to_variable(img)
61+
inputs = paddle.to_tensor(img)
6262
ret = paddle.flip(inputs, [0])
6363
ret = ret.flip(0)
6464
ret = paddle.flip(ret, 1)

test/legacy_test/test_functional_conv1d.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ def setUp(self):
3535

3636
def dygraph_case(self):
3737
with dg.guard():
38-
x = dg.to_variable(self.input, dtype=paddle.float32)
39-
w = dg.to_variable(self.filter, dtype=paddle.float32)
38+
x = paddle.to_tensor(self.input, dtype=paddle.float32)
39+
w = paddle.to_tensor(self.filter, dtype=paddle.float32)
4040
b = (
4141
None
4242
if self.bias is None
43-
else dg.to_variable(self.bias, dtype=paddle.float32)
43+
else paddle.to_tensor(self.bias, dtype=paddle.float32)
4444
)
4545
y = F.conv1d(
4646
x,

test/xpu/test_elementwise_add_op_xpu_kp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@ def test_dygraph(self):
338338
with base.dygraph.guard():
339339
np_x = np.array([2, 3, 4]).astype('float32')
340340
np_y = np.array([1, 5, 2]).astype('float32')
341-
x = base.dygraph.to_variable(np_x)
342-
y = base.dygraph.to_variable(np_y)
341+
x = paddle.to_tensor(np_x)
342+
y = paddle.to_tensor(np_y)
343343
z = paddle.add(x, y)
344344
np_z = z.numpy()
345345
z_expected = np.array([3.0, 8.0, 6.0])

0 commit comments

Comments
 (0)