[PIR] Use value in Executor fetch_list (part2) (#64237)

SigureMo · web-flow · commit 3986b306030a · 2024-05-13T11:41:43.000+08:00
diff --git a/test/deprecated/legacy_test/test_lr_scheduler.py b/test/deprecated/legacy_test/test_lr_scheduler.py
@@ -124,9 +124,7 @@ def _test_static(self, place, kwargs):
 
         for epoch in range(20):
             for batch_id in range(1):
-                out, actual_lr = exe.run(
-                    main_prog, fetch_list=[loss.name, lr_var.name]
-                )
+                out, actual_lr = exe.run(main_prog, fetch_list=[loss, lr_var])
                 expected_lr = reduce_lr_on_plateau(
                     kwargs['factor'],
                     kwargs['threshold'],
@@ -144,9 +142,7 @@ def _test_static(self, place, kwargs):
 
         for epoch in range(10):
             for batch_id in range(1):
-                out, actual_lr = exe.run(
-                    test_prog, fetch_list=[loss.name, lr_var.name]
-                )
+                out, actual_lr = exe.run(test_prog, fetch_list=[loss, lr_var])
                 expected_lr = reduce_lr_on_plateau(
                     kwargs['factor'],
                     kwargs['threshold'],
@@ -343,7 +339,7 @@ def _test_static(self, place, kwargs):
                 out = exe.run(
                     main_prog,
                     feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                    fetch_list=lr_var.name,
+                    fetch_list=[lr_var],
                 )
             expected_lr = np.array(
                 cosine_annealing_warm_restarts_lr(epoch, v_l)
@@ -356,7 +352,7 @@ def _test_static(self, place, kwargs):
                 out = exe.run(
                     test_prog,
                     feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                    fetch_list=lr_var.name,
+                    fetch_list=[lr_var],
                 )
             expected_lr = np.array(
                 cosine_annealing_warm_restarts_lr(epoch_num=None, v_l=v_l)
@@ -711,7 +707,7 @@ def _test_static(self, python_func, paddle_api, kwarg, place):
                 out = exe.run(
                     main_prog,
                     feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                    fetch_list=lr_var.name,
+                    fetch_list=[lr_var],
                 )
             self.assertEqual(out, np.array(python_func(num, **kwarg)))
             scheduler.step()
@@ -722,7 +718,7 @@ def _test_static(self, python_func, paddle_api, kwarg, place):
                 out = exe.run(
                     test_prog,
                     feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                    fetch_list=lr_var.name,
+                    fetch_list=[lr_var],
                 )
             self.assertEqual(out, np.array(python_func(num, **kwarg)))
             scheduler.step()
@@ -736,7 +732,7 @@ def _test_static(self, python_func, paddle_api, kwarg, place):
                     out = exe.run(
                         compiled_train_prog,
                         feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                        fetch_list=lr_var.name,
+                        fetch_list=[lr_var],
                     )
                 self.assertEqual(out, np.array(python_result))
                 scheduler.step()
@@ -749,7 +745,7 @@ def _test_static(self, python_func, paddle_api, kwarg, place):
                     out = exe.run(
                         compiled_test_prog,
                         feed={'x': np.random.randn(3, 4, 5).astype('float32')},
-                        fetch_list=lr_var.name,
+                        fetch_list=[lr_var],
                     )
                 self.assertEqual(out, np.array(python_result))
                 scheduler.step()
diff --git a/test/deprecated/legacy_test/test_memory_reuse_exclude_feed_var.py b/test/deprecated/legacy_test/test_memory_reuse_exclude_feed_var.py
@@ -53,7 +53,7 @@ def main_impl(self, place):
         feed_dict = [{image.name: image_tensor}]
 
         for _ in range(self.iteration):
-            exe.run(compiled_prog, feed=feed_dict, fetch_list=[loss.name])
+            exe.run(compiled_prog, feed=feed_dict, fetch_list=[loss])
             np.testing.assert_array_equal(np.array(image_tensor), np_image)
 
     def test_main(self):
diff --git a/test/deprecated/legacy_test/test_metrics.py b/test/deprecated/legacy_test/test_metrics.py
@@ -221,7 +221,7 @@ def test_main(self):
             state_ret = exe.run(
                 compiled_main_prog,
                 feed={'pred': pred, 'label': label},
-                fetch_list=[s.name for s in to_list(state)],
+                fetch_list=to_list(state),
                 return_numpy=True,
             )
             acc.update(*state_ret)
diff --git a/test/deprecated/legacy_test/test_momentum_op.py b/test/deprecated/legacy_test/test_momentum_op.py
@@ -1081,7 +1081,7 @@ def _momentum_optimize_static(
         out = []
         for idx in range(5):
             (loss_data,) = exe.run(
-                train_program, feed={"X": x}, fetch_list=[loss.name]
+                train_program, feed={"X": x}, fetch_list=[loss]
             )
             out.append(loss_data)
         return out
diff --git a/test/deprecated/legacy_test/test_nce.py b/test/deprecated/legacy_test/test_nce.py
@@ -263,7 +263,7 @@ def test_input_is_selected_rows(self):
                     loss_val = exe.run(
                         dense_train_program,
                         feed=feeder.feed(data),
-                        fetch_list=[cost.name],
+                        fetch_list=[cost],
                     )
                     rets.append(np.mean(loss_val))
 
@@ -284,7 +284,7 @@ def test_input_is_selected_rows(self):
                     loss_val = exe.run(
                         sparse_train_program,
                         feed=feeder.feed(data),
-                        fetch_list=[cost.name],
+                        fetch_list=[cost],
                     )
                     rets.append(np.mean(loss_val))
 
diff --git a/test/deprecated/legacy_test/test_nonzero_api.py b/test/deprecated/legacy_test/test_nonzero_api.py
@@ -41,7 +41,7 @@ def test_nonzero_api_as_tuple(self):
             exe = base.Executor(base.CPUPlace())
 
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[z.name], return_numpy=False
+                feed={'x': data}, fetch_list=[z], return_numpy=False
             )
         expect_out = np.array([[0, 0], [1, 1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
@@ -56,7 +56,7 @@ def test_nonzero_api_as_tuple(self):
             z = paddle.concat(list(y), axis=1)
             exe = base.Executor(base.CPUPlace())
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[z.name], return_numpy=False
+                feed={'x': data}, fetch_list=[z], return_numpy=False
             )
         expect_out = np.array([[0], [1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
@@ -70,7 +70,7 @@ def test_nonzero_api(self):
             y = paddle.nonzero(x)
             exe = base.Executor(base.CPUPlace())
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[y.name], return_numpy=False
+                feed={'x': data}, fetch_list=[y], return_numpy=False
             )
         expect_out = np.array([[0, 0], [1, 1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
@@ -82,7 +82,7 @@ def test_nonzero_api(self):
             y = paddle.nonzero(x)
             exe = base.Executor(base.CPUPlace())
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[y.name], return_numpy=False
+                feed={'x': data}, fetch_list=[y], return_numpy=False
             )
         expect_out = np.array([[0], [1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
diff --git a/test/deprecated/legacy_test/test_pass_builder.py b/test/deprecated/legacy_test/test_pass_builder.py
@@ -55,12 +55,12 @@ def check_network_convergence(self, use_cuda, build_strategy=None):
             )
 
             for i in range(5):
-                _ = exe.run(train_cp, fetch_list=[loss.name], feed=feed_dict)
+                _ = exe.run(train_cp, fetch_list=[loss], feed=feed_dict)
                 (test_loss,) = exe.run(
-                    test_cp, fetch_list=[loss.name], feed=feed_dict
+                    test_cp, fetch_list=[loss], feed=feed_dict
                 )
                 (train_loss,) = exe.run(
-                    train_cp, fetch_list=[loss.name], feed=feed_dict
+                    train_cp, fetch_list=[loss], feed=feed_dict
                 )
 
                 avg_test_loss_val = np.array(test_loss).mean()
diff --git a/test/deprecated/legacy_test/test_program_prune_backward.py b/test/deprecated/legacy_test/test_program_prune_backward.py
@@ -399,10 +399,10 @@ def check_prune_correctness(self, method, feed_dict, optimizer):
             exe.run(base.default_startup_program())
 
             (loss_data_prune,) = exe.run(
-                test_prog_prune, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_prune, feed=feed_dict, fetch_list=[loss]
             )
             (loss_data_orig,) = exe.run(
-                test_prog_orig, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_orig, feed=feed_dict, fetch_list=[loss]
             )
             self.assertEqual(loss_data_orig, loss_data_prune)
 
@@ -517,7 +517,7 @@ def test_optimization_in_cond(self):
             exe = base.Executor(place)
             exe.run(base.default_startup_program())
             (loss_data_orig,) = exe.run(
-                test_prog_orig, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_orig, feed=feed_dict, fetch_list=[loss]
             )
 
         with self.program_scope_guard():
@@ -529,7 +529,7 @@ def test_optimization_in_cond(self):
             exe = base.Executor(place)
             exe.run(base.default_startup_program())
             (loss_data_prune,) = exe.run(
-                test_prog_prune, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_prune, feed=feed_dict, fetch_list=[loss]
             )
 
         self.program_compare(test_prog_orig, test_prog_prune)
@@ -547,7 +547,7 @@ def test_optimization_in_pylayer(self):
             exe = base.Executor(place)
             exe.run(base.default_startup_program())
             (loss_data_orig,) = exe.run(
-                test_prog_orig, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_orig, feed=feed_dict, fetch_list=[loss]
             )
 
         with self.program_scope_guard():
@@ -559,7 +559,7 @@ def test_optimization_in_pylayer(self):
             exe = base.Executor(place)
             exe.run(base.default_startup_program())
             (loss_data_prune,) = exe.run(
-                test_prog_prune, feed=feed_dict, fetch_list=[loss.name]
+                test_prog_prune, feed=feed_dict, fetch_list=[loss]
             )
 
         self.program_compare(test_prog_orig, test_prog_prune)
diff --git a/test/deprecated/legacy_test/test_sgd_op.py b/test/deprecated/legacy_test/test_sgd_op.py
@@ -392,7 +392,7 @@ def static_sgd_mp(self, mp):
         out = []
         for idx in range(5):
             (loss_data,) = exe.run(
-                train_program, feed={"X": x}, fetch_list=[loss.name]
+                train_program, feed={"X": x}, fetch_list=[loss]
             )
             out.append(loss_data)
         return out
diff --git a/test/deprecated/legacy_test/test_tensor_scalar_type_promotion_static.py b/test/deprecated/legacy_test/test_tensor_scalar_type_promotion_static.py
@@ -54,7 +54,7 @@ def check_operation(self, a, b, c, op):
         else:
             raise ValueError("Unsupported operation.")
 
-        rlt = exe.run(fetch_list=[c_rlt.name, c.name])
+        rlt = exe.run(fetch_list=[c_rlt, c])
 
         self.assertEqual(rlt[0].dtype, rlt[1].dtype)
         np.testing.assert_array_equal(rlt[0], rlt[1])
diff --git a/test/deprecated/legacy_test/test_where_op.py b/test/deprecated/legacy_test/test_where_op.py
@@ -763,7 +763,7 @@ def test_where_condition(self):
             z = paddle.concat(list(y), axis=1)
             exe = base.Executor(base.CPUPlace())
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[z.name], return_numpy=False
+                feed={'x': data}, fetch_list=[z], return_numpy=False
             )
         expect_out = np.array([[0, 0], [1, 1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
@@ -777,7 +777,7 @@ def test_where_condition(self):
             z = paddle.concat(list(y), axis=1)
             exe = base.Executor(base.CPUPlace())
             (res,) = exe.run(
-                feed={'x': data}, fetch_list=[z.name], return_numpy=False
+                feed={'x': data}, fetch_list=[z], return_numpy=False
             )
         expect_out = np.array([[0], [1]])
         np.testing.assert_allclose(expect_out, np.array(res), rtol=1e-05)
diff --git a/test/deprecated/quantization/test_graph.py b/test/deprecated/quantization/test_graph.py
@@ -93,7 +93,7 @@ def _train(binary):
             for _ in range(iters):
                 data = next(train_reader())
                 loss_v = exe.run(
-                    binary, feed=feeder.feed(data), fetch_list=[loss.name]
+                    binary, feed=feeder.feed(data), fetch_list=[loss]
                 )
                 if not for_ci:
                     print('{}: {}'.format('loss', loss_v))
diff --git a/test/deprecated/standalone_executor/test_standalone_sequentail_run.py b/test/deprecated/standalone_executor/test_standalone_sequentail_run.py
@@ -52,7 +52,7 @@ def run_program(self, sequential_run=False):
             ret = exe.run(
                 compiled_program,
                 feed={"data": data},
-                fetch_list=[v.name for v in outs],
+                fetch_list=list(outs),
             )
             return ret
 
diff --git a/test/ir/inference/test_yolo_box_post.py b/test/ir/inference/test_yolo_box_post.py
@@ -99,7 +99,7 @@ def test_yolo_box_post(self):
             "im_shape": np.array([[608.0, 608.0]], "float32"),
             "im_scale": np.array([[1.0, 1.0]], "float32"),
         }
-        outs = exe.run(program, feed=feed, fetch_list=[out.name, rois_num.name])
+        outs = exe.run(program, feed=feed, fetch_list=[out, rois_num])
 
 
 if __name__ == '__main__':
diff --git a/test/ir/test_fuse_resnet_unit.py b/test/ir/test_fuse_resnet_unit.py
@@ -61,8 +61,8 @@ def test_fuse_resnet_unit(self):
             place, after_program, to_fp16_var_names=after_params
         )
         feed = {"x": np.random.randn(1, 64, 64, 8).astype("float16")}
-        before_out = exe.run(program, feed=feed, fetch_list=[out.name])
-        after_out = exe.run(after_program, feed=feed, fetch_list=[out.name])
+        before_out = exe.run(program, feed=feed, fetch_list=[out])
+        after_out = exe.run(after_program, feed=feed, fetch_list=[out])
         np.testing.assert_allclose(
             before_out[0], after_out[0], rtol=1e-05, atol=0.005
         )

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ def test_main(self):`
`221`	`221`	`state_ret = exe.run(`
`222`	`222`	`compiled_main_prog,`
`223`	`223`	`feed={'pred': pred, 'label': label},`
`224`		`- fetch_list=[s.name for s in to_list(state)],`
	`224`	`+ fetch_list=to_list(state),`
`225`	`225`	`return_numpy=True,`
`226`	`226`	`)`
`227`	`227`	`acc.update(*state_ret)`
Original file line number	Diff line number	Diff line change
`@@ -1081,7 +1081,7 @@ def _momentum_optimize_static(`
`1081`	`1081`	`out = []`
`1082`	`1082`	`for idx in range(5):`
`1083`	`1083`	`(loss_data,) = exe.run(`
`1084`		`- train_program, feed={"X": x}, fetch_list=[loss.name]`
	`1084`	`+ train_program, feed={"X": x}, fetch_list=[loss]`
`1085`	`1085`	`)`
`1086`	`1086`	`out.append(loss_data)`
`1087`	`1087`	`return out`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ def check_network_convergence(self, use_cuda, build_strategy=None):`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`for i in range(5):`
`58`		`- _ = exe.run(train_cp, fetch_list=[loss.name], feed=feed_dict)`
	`58`	`+ _ = exe.run(train_cp, fetch_list=[loss], feed=feed_dict)`
`59`	`59`	`(test_loss,) = exe.run(`
`60`		`- test_cp, fetch_list=[loss.name], feed=feed_dict`
	`60`	`+ test_cp, fetch_list=[loss], feed=feed_dict`
`61`	`61`	`)`
`62`	`62`	`(train_loss,) = exe.run(`
`63`		`- train_cp, fetch_list=[loss.name], feed=feed_dict`
	`63`	`+ train_cp, fetch_list=[loss], feed=feed_dict`
`64`	`64`	`)`
`65`	`65`
`66`	`66`	`avg_test_loss_val = np.array(test_loss).mean()`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ def static_sgd_mp(self, mp):`
`392`	`392`	`out = []`
`393`	`393`	`for idx in range(5):`
`394`	`394`	`(loss_data,) = exe.run(`
`395`		`- train_program, feed={"X": x}, fetch_list=[loss.name]`
	`395`	`+ train_program, feed={"X": x}, fetch_list=[loss]`
`396`	`396`	`)`
`397`	`397`	`out.append(loss_data)`
`398`	`398`	`return out`