[Cleanup][B-10]Replace to_variable (#61531)

co63oc · web-flow · commit f5c01c785d9b · 2024-02-04T01:07:34.000+08:00
diff --git a/test/legacy_test/test_imperative_hook_for_layer.py b/test/legacy_test/test_imperative_hook_for_layer.py
@@ -20,7 +20,6 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.dygraph import base as imperative_base
 
 call_forward_post_hook = False
 call_forward_pre_hook = False
@@ -78,9 +77,9 @@ def test_forward_hook_return_value(self):
                 )
                 y_data = y_data.reshape((-1, 1))
 
-                input = imperative_base.to_variable(input_word)
-                input1 = imperative_base.to_variable(input_word1)
-                y = imperative_base.to_variable(y_data)
+                input = paddle.to_tensor(input_word)
+                input1 = paddle.to_tensor(input_word1)
+                y = paddle.to_tensor(y_data)
 
                 simplenet = SimpleNet(
                     hidden_size=20,
@@ -160,8 +159,8 @@ def test_forward_hook(self):
                 )
                 y_data = y_data.reshape((-1, 1))
 
-                input = imperative_base.to_variable(input_word)
-                y = imperative_base.to_variable(y_data)
+                input = paddle.to_tensor(input_word)
+                y = paddle.to_tensor(y_data)
 
                 simplenet = SimpleNet(
                     hidden_size=20,
diff --git a/test/legacy_test/test_imperative_layer_trainable.py b/test/legacy_test/test_imperative_layer_trainable.py
@@ -18,15 +18,14 @@
 
 import paddle
 from paddle import base
-from paddle.base import dygraph
 
 
 class TestImperativeLayerTrainable(unittest.TestCase):
     def test_set_trainable(self):
         with base.dygraph.guard():
             label = np.random.uniform(-1, 1, [10, 10]).astype(np.float32)
 
-            label = dygraph.to_variable(label)
+            label = paddle.to_tensor(label)
 
             linear = paddle.nn.Linear(10, 10)
             y = linear(label)
diff --git a/test/legacy_test/test_imperative_lod_tensor_to_selected_rows.py b/test/legacy_test/test_imperative_lod_tensor_to_selected_rows.py
@@ -21,7 +21,6 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.dygraph.base import to_variable
 
 
 class SimpleNet(paddle.nn.Layer):
@@ -133,8 +132,8 @@ def simple_net_float32(self, is_sparse, dtype):
                         x_data = x_data.reshape((-1, num_steps))
                         y_data = y_data.reshape((-1, 1))
 
-                        x = to_variable(x_data)
-                        y = to_variable(y_data)
+                        x = paddle.to_tensor(x_data)
+                        y = paddle.to_tensor(y_data)
                         outs = simple_net(x, y)
                         dy_loss = outs
                         if i == 0:
diff --git a/test/legacy_test/test_imperative_mnist_sorted_gradient.py b/test/legacy_test/test_imperative_mnist_sorted_gradient.py
@@ -21,7 +21,6 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.dygraph.base import to_variable
 
 
 class TestImperativeMnistSortGradient(unittest.TestCase):
@@ -54,8 +53,8 @@ def test_mnist_sort_gradient_float32(self):
                         .reshape(128, 1)
                     )
 
-                    img2 = to_variable(dy_x_data2)
-                    label2 = to_variable(y_data2)
+                    img2 = paddle.to_tensor(dy_x_data2)
+                    label2 = paddle.to_tensor(y_data2)
                     label2.stop_gradient = True
 
                     cost2 = mnist2(img2)
diff --git a/test/legacy_test/test_imperative_named_members.py b/test/legacy_test/test_imperative_named_members.py
@@ -91,7 +91,7 @@ def __init__(self):
                     self.linear2 = paddle.nn.Linear(5, 5)
                     self.conv2d = paddle.nn.Conv2D(3, 2, 3)
                     self.embedding = paddle.nn.Embedding(128, 16)
-                    self.h_0 = base.dygraph.to_variable(
+                    self.h_0 = paddle.to_tensor(
                         np.zeros([10, 10]).astype('float32')
                     )
                     self.weight = self.create_parameter(
diff --git a/test/legacy_test/test_imperative_ocr_attention_model.py b/test/legacy_test/test_imperative_ocr_attention_model.py
@@ -20,7 +20,6 @@
 import paddle
 from paddle import base
 from paddle.base import core
-from paddle.base.dygraph.base import to_variable
 from paddle.nn import BatchNorm, Linear
 
 
@@ -210,7 +209,7 @@ def __init__(
             h_0 = np.zeros(
                 (Config.batch_size, rnn_hidden_size), dtype="float32"
             )
-            h_0 = to_variable(h_0)
+            h_0 = paddle.to_tensor(h_0)
         else:
             h_0 = paddle.tensor.fill_constant(
                 shape=[Config.batch_size, rnn_hidden_size],
@@ -464,10 +463,10 @@ def run_dygraph():
                 dy_param_init_value[param.name] = param.numpy()
             for epoch in range(epoch_num):
                 for batch_id in range(batch_num):
-                    label_in = to_variable(label_in_np)
-                    label_out = to_variable(label_out_np)
+                    label_in = paddle.to_tensor(label_in_np)
+                    label_out = paddle.to_tensor(label_out_np)
                     label_out.stop_gradient = True
-                    img = to_variable(image_np)
+                    img = paddle.to_tensor(image_np)
                     dy_prediction = ocr_attention(img, label_in)
                     label_out = paddle.reshape(label_out, [-1, 1])
                     dy_prediction = paddle.reshape(
diff --git a/test/legacy_test/test_imperative_optimizer.py b/test/legacy_test/test_imperative_optimizer.py
@@ -234,7 +234,7 @@ def test_constant_lr(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -258,7 +258,7 @@ def test_lr_decay(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -289,7 +289,7 @@ def test_lr_decay_natural_exp(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -324,7 +324,7 @@ def test_set_lr(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
diff --git a/test/legacy_test/test_imperative_optimizer_v2.py b/test/legacy_test/test_imperative_optimizer_v2.py
@@ -533,7 +533,7 @@ def test_constant_lr(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -557,7 +557,7 @@ def test_lr_decay(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -585,7 +585,7 @@ def test_lr_scheduler_natural_exp(self):
             a = np.random.uniform(-0.1, 0.1, [10, 10]).astype("float32")
 
             linear = paddle.nn.Linear(10, 10)
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
             b = linear(a)
 
             loss = paddle.mean(b)
@@ -611,7 +611,7 @@ def test_set_lr(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -647,7 +647,7 @@ def test_set_lr_scheduler(self):
 
             linear = paddle.nn.Linear(10, 10)
 
-            a = base.dygraph.to_variable(a)
+            a = paddle.to_tensor(a)
 
             b = linear(a)
 
@@ -879,7 +879,7 @@ def test_parameter_list(self):
             )
 
             in_np = np.random.uniform(-0.1, 0.1, [10, 10]).astype("float32")
-            in_data = base.dygraph.to_variable(in_np)
+            in_data = paddle.to_tensor(in_np)
 
             y = linear_1(in_data)
             y = linear_2(y)
diff --git a/test/legacy_test/test_imperative_parallel_coalesce_split.py b/test/legacy_test/test_imperative_parallel_coalesce_split.py
@@ -21,7 +21,6 @@
 import paddle.nn.functional as F
 from paddle import base
 from paddle.base import core
-from paddle.base.dygraph.base import to_variable
 
 
 class MyLayer(paddle.nn.Layer):
@@ -49,10 +48,14 @@ def test_coalesce_split(self):
 
             # test variables prepare
             vars = []
-            vars.append(to_variable(np.random.random([2, 3]).astype("float32")))
-            vars.append(to_variable(np.random.random([4, 9]).astype("float32")))
             vars.append(
-                to_variable(np.random.random([10, 1]).astype("float32"))
+                paddle.to_tensor(np.random.random([2, 3]).astype("float32"))
+            )
+            vars.append(
+                paddle.to_tensor(np.random.random([4, 9]).astype("float32"))
+            )
+            vars.append(
+                paddle.to_tensor(np.random.random([10, 1]).astype("float32"))
             )
             var_groups = OrderedDict()
             var_groups.setdefault(0, vars)
@@ -81,7 +84,7 @@ def test_reshape_inplace(self):
             ori_shape = [2, 25]
             new_shape = [5, 10]
             x_data = np.random.random(ori_shape).astype("float32")
-            x = to_variable(x_data)
+            x = paddle.to_tensor(x_data)
             _reshape_inplace(x, new_shape)
             self.assertEqual(x.shape, new_shape)
 
diff --git a/test/legacy_test/test_imperative_partitial_backward.py b/test/legacy_test/test_imperative_partitial_backward.py
@@ -24,7 +24,7 @@ class TestImperativePartitialBackward(unittest.TestCase):
     def test_partitial_backward(self):
         with base.dygraph.guard():
             x = np.random.randn(2, 4, 5).astype("float32")
-            x = base.dygraph.to_variable(x)
+            x = paddle.to_tensor(x)
             linear1 = paddle.nn.Linear(5, 10)
             linear2 = paddle.nn.Linear(5, 10)
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def __init__(self):`
`91`	`91`	`self.linear2 = paddle.nn.Linear(5, 5)`
`92`	`92`	`self.conv2d = paddle.nn.Conv2D(3, 2, 3)`
`93`	`93`	`self.embedding = paddle.nn.Embedding(128, 16)`
`94`		`- self.h_0 = base.dygraph.to_variable(`
	`94`	`+ self.h_0 = paddle.to_tensor(`
`95`	`95`	`np.zeros([10, 10]).astype('float32')`
`96`	`96`	`)`
`97`	`97`	`self.weight = self.create_parameter(`