[Cleanup][B-15]Replace to_variable (#61535)

co63oc · web-flow · commit 9c54560a1242 · 2024-02-04T00:30:40.000+08:00
diff --git a/test/dygraph_to_static/test_partial_program.py b/test/dygraph_to_static/test_partial_program.py
@@ -25,7 +25,6 @@
 from test_fetch_feed import Linear
 
 import paddle
-from paddle import base
 
 SEED = 2020
 
@@ -55,7 +54,7 @@ def nested_output(x, y):
 
 def fake_data(shape):
     x_data = np.random.random(shape).astype('float32')
-    return base.dygraph.to_variable(x_data)
+    return paddle.to_tensor(x_data)
 
 
 class TestWithNestedInput(Dy2StTestBase):
@@ -142,7 +141,7 @@ def test_legacy_ir_switch_eval_and_train(self):
         linear_net = Linear()
         linear_net = paddle.jit.to_static(linear_net, full_graph=True)
         x_data = np.random.random((4, 10)).astype('float32')
-        x = base.dygraph.to_variable(x_data)
+        x = paddle.to_tensor(x_data)
         linear_net(x)
 
         _, train_partial_layer = linear_net.forward.program_cache.last()[-1]
diff --git a/test/dygraph_to_static/test_pylayer.py b/test/dygraph_to_static/test_pylayer.py
@@ -623,9 +623,7 @@ def load_and_inference(self, train_layer, infer_layer):
         train_layer.eval()
         infer_layer.eval()
         # inference & compare
-        x = paddle.base.dygraph.to_variable(
-            np.random.random((1, 784)).astype('float32')
-        )
+        x = paddle.to_tensor(np.random.random((1, 784)).astype('float32'))
         train_layer_result = train_layer(x).numpy()
         infer_layer_result = infer_layer(x).numpy()
 
diff --git a/test/legacy_test/test_one_hot_v2_op.py b/test/legacy_test/test_one_hot_v2_op.py
@@ -193,9 +193,6 @@ def test_api_with_dygraph(self):
             [np.random.randint(0, depth - 1) for i in range(6)]
         ).reshape([6, 1])
         with base.dygraph.guard():
-            one_hot_label = paddle.nn.functional.one_hot(
-                base.dygraph.to_variable(label), depth
-            )
             one_hot_label = paddle.nn.functional.one_hot(
                 paddle.to_tensor(label), depth
             )
diff --git a/test/legacy_test/test_op_function_generator.py b/test/legacy_test/test_op_function_generator.py
@@ -39,8 +39,8 @@ def test_elementwise_add(self):
         with base.dygraph.guard():
             a = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
             b = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
-            x = base.dygraph.to_variable(a)
-            y = base.dygraph.to_variable(b)
+            x = paddle.to_tensor(a)
+            y = paddle.to_tensor(b)
             x.stop_gradient = False
 
             res1 = paddle.add(x, y)
@@ -52,8 +52,8 @@ def test_elementwise_mul(self):
         with base.dygraph.guard():
             a = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
             b = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
-            x = base.dygraph.to_variable(a)
-            y = base.dygraph.to_variable(b)
+            x = paddle.to_tensor(a)
+            y = paddle.to_tensor(b)
 
             res1 = paddle.multiply(x, y)
             res2 = _legacy_C_ops.elementwise_mul(x, y)
@@ -63,7 +63,7 @@ def test_elementwise_mul(self):
     def test_relu(self):
         with base.dygraph.guard():
             a = np.random.uniform(-1, 1, self.shape).astype(self.dtype)
-            x = base.dygraph.to_variable(a)
+            x = paddle.to_tensor(a)
 
             res1 = F.relu(x)
             res2 = _legacy_C_ops.relu(x)
@@ -74,8 +74,8 @@ def test_trace_backward(self):
         with base.dygraph.guard():
             a = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
             b = np.random.uniform(0.1, 1, self.shape).astype(self.dtype)
-            x = base.dygraph.to_variable(a)
-            y = base.dygraph.to_variable(b)
+            x = paddle.to_tensor(a)
+            y = paddle.to_tensor(b)
             x.stop_gradient = False
             y.stop_gradient = False
             x.retain_grads()
diff --git a/test/legacy_test/test_optimizer_in_control_flow.py b/test/legacy_test/test_optimizer_in_control_flow.py
@@ -185,8 +185,8 @@ def dynamic(train_data, use_cuda=False, use_parallel_exe=False):
 
         for epoch in range(EPOCH_NUM):
             image_data, label = train_data[epoch]
-            var_input = base.dygraph.to_variable(image_data)
-            var_label = base.dygraph.to_variable(label)
+            var_input = paddle.to_tensor(image_data)
+            var_label = paddle.to_tensor(label)
             hidden, prediction = dy_layer(var_input)
 
             if epoch % 2 == 0:
diff --git a/test/legacy_test/test_paddle_imperative_double_grad.py b/test/legacy_test/test_paddle_imperative_double_grad.py
@@ -39,7 +39,7 @@ def __impl__(*args, **kwargs):
 
 def random_var(size, low=-1, high=1, dtype='float32'):
     x_np = np.random.uniform(low=low, high=high, size=size).astype(dtype)
-    return base.dygraph.to_variable(x_np)
+    return paddle.to_tensor(x_np)
 
 
 class TestDygraphDoubleGrad(TestCase):
@@ -152,7 +152,7 @@ def test_none_one_initial_gradient(self):
         )
         np.random.shuffle(x_np)
 
-        x = base.dygraph.to_variable(x_np)
+        x = paddle.to_tensor(x_np)
         x.stop_gradient = False
 
         alpha = 0.2
diff --git a/test/legacy_test/test_reduce_op.py b/test/legacy_test/test_reduce_op.py
@@ -1710,7 +1710,7 @@ def test_static(self):
     def test_dygraph(self):
         np_x = np.random.random([2, 3, 4]).astype('int32')
         with base.dygraph.guard():
-            x = base.dygraph.to_variable(np_x)
+            x = paddle.to_tensor(np_x)
             out0 = paddle.sum(x).numpy()
             out1 = paddle.sum(x, axis=0).numpy()
             out2 = paddle.sum(x, axis=(0, 1)).numpy()
diff --git a/test/legacy_test/test_regularizer.py b/test/legacy_test/test_regularizer.py
@@ -313,9 +313,7 @@ def test_repeated_regularization(self):
             sgd = paddle.optimizer.SGD(learning_rate=0.1, weight_decay=l2)
             sgd.minimize(loss)
         with base.dygraph.guard():
-            input = base.dygraph.to_variable(
-                np.random.randn(3, 2).astype('float32')
-            )
+            input = paddle.to_tensor(np.random.randn(3, 2).astype('float32'))
             paddle.seed(1)
             paddle.framework.random._manual_program_seed(1)
 
diff --git a/test/legacy_test/test_regularizer_api.py b/test/legacy_test/test_regularizer_api.py
@@ -194,9 +194,7 @@ def test_repeated_regularization(self):
             sgd = paddle.optimizer.SGD(learning_rate=0.1, weight_decay=l2)
             sgd.minimize(loss)
         with base.dygraph.guard():
-            input = base.dygraph.to_variable(
-                np.random.randn(3, 2).astype('float32')
-            )
+            input = paddle.to_tensor(np.random.randn(3, 2).astype('float32'))
             paddle.seed(1)
             paddle.framework.random._manual_program_seed(1)
 
diff --git a/test/xpu/test_one_hot_v2_op_xpu.py b/test/xpu/test_one_hot_v2_op_xpu.py
@@ -154,7 +154,7 @@ def test_api_with_dygraph(self):
         ).reshape([6, 1])
         with base.dygraph.guard():
             one_hot_label = paddle.nn.functional.one_hot(
-                x=base.dygraph.to_variable(label), num_classes=depth
+                x=paddle.to_tensor(label), num_classes=depth
             )
 
     def _run(self, depth):

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ def test_api_with_dygraph(self):`
`154`	`154`	`).reshape([6, 1])`
`155`	`155`	`with base.dygraph.guard():`
`156`	`156`	`one_hot_label = paddle.nn.functional.one_hot(`
`157`		`- x=base.dygraph.to_variable(label), num_classes=depth`
	`157`	`+ x=paddle.to_tensor(label), num_classes=depth`
`158`	`158`	`)`
`159`	`159`
`160`	`160`	`def _run(self, depth):`