[PIR] Use value in Executor fetch_list (part1) (#64235)

SigureMo · web-flow · commit 52f7da8a04c5 · 2024-05-13T09:14:21.000+08:00
diff --git a/test/amp/test_amp_api.py b/test/amp/test_amp_api.py
@@ -293,7 +293,7 @@ def run_example_code():
 
             x_fp32 = np.random.random(size=[1, 1, 28, 28]).astype("float32")
             (loss_data,) = exe.run(
-                main_program, feed={"X": x_fp32}, fetch_list=[loss.name]
+                main_program, feed={"X": x_fp32}, fetch_list=[loss]
             )
 
             self.assertEqual(
diff --git a/test/auto_parallel/test_fuse_adamw_pass.py b/test/auto_parallel/test_fuse_adamw_pass.py
@@ -116,7 +116,7 @@ def get_loss_data(self, place, x, use_amp=False, use_apply_passes=False):
 
         for i in range(5):
             loss_data = exe.run(
-                train_program, feed={"X": x[i]}, fetch_list=[loss.name]
+                train_program, feed={"X": x[i]}, fetch_list=[loss]
             )
         return loss_data
 
diff --git a/test/collective/collective_global_gather.py b/test/collective/collective_global_gather.py
@@ -126,7 +126,7 @@ def run_trainer(self, args):
         (global_expert_count,) = exe.run(
             tmp_main_prog,
             feed={"local_expert_count": local_expert_count},
-            fetch_list=[global_expert_count.name],
+            fetch_list=[global_expert_count],
         )
 
         fwd_expert_count = sum(global_expert_count)
diff --git a/test/collective/fleet/test_fleet_amp_init.py b/test/collective/fleet/test_fleet_amp_init.py
@@ -85,7 +85,7 @@ def test_fleet_amp_init(self):
         step = 1
         for i in range(step):
             cost_val = exe.run(
-                program=main_program, feed=gen_data(), fetch_list=[cost.name]
+                program=main_program, feed=gen_data(), fetch_list=[cost]
             )
 
     def test_fleet_amp_meta_optimizer_init(self):
@@ -135,7 +135,7 @@ def test_fleet_amp_meta_optimizer_init(self):
         step = 3
         for i in range(step):
             cost_val = exe.run(
-                program=main_program, feed=gen_data(), fetch_list=[cost.name]
+                program=main_program, feed=gen_data(), fetch_list=[cost]
             )
             print(cost_val)
 
diff --git a/test/contrib/test_correlation.py b/test/contrib/test_correlation.py
@@ -129,9 +129,7 @@ def test_check_output(self):
 
         place = base.CUDAPlace(0)
         exe = base.Executor(place)
-        res = exe.run(
-            feed={'x1': x1_np, 'x2': x2_np}, fetch_list=[out.name, loss.name]
-        )
+        res = exe.run(feed={'x1': x1_np, 'x2': x2_np}, fetch_list=[out, loss])
 
         np.testing.assert_allclose(res[0], out_np, rtol=1e-05, atol=1e-8)
 
diff --git a/test/custom_op/test_custom_relu_op_xpu_setup.py b/test/custom_op/test_custom_relu_op_xpu_setup.py
@@ -54,7 +54,7 @@ def custom_relu_static(
             out_v = exe.run(
                 static.default_main_program(),
                 feed={'X': np_x},
-                fetch_list=[out.name],
+                fetch_list=[out],
             )
 
     paddle.disable_static()
diff --git a/test/deprecated/cpp_extension/test_mixed_extension_setup.py b/test/deprecated/cpp_extension/test_mixed_extension_setup.py
@@ -43,7 +43,7 @@ def custom_relu_static(
             out_v = exe.run(
                 static.default_main_program(),
                 feed={'X': np_x},
-                fetch_list=[out.name],
+                fetch_list=[out],
             )
 
     paddle.disable_static()
diff --git a/test/deprecated/custom_runtime/test_custom_op_setup.py b/test/deprecated/custom_runtime/test_custom_op_setup.py
@@ -62,7 +62,7 @@ def custom_relu_static(func, device, dtype, np_x, use_func=True):
             out_v = exe.run(
                 static.default_main_program(),
                 feed={"X": np_x},
-                fetch_list=[out.name],
+                fetch_list=[out],
             )
 
     paddle.disable_static()
diff --git a/test/deprecated/ir/pir/test_special_op_translator.py b/test/deprecated/ir/pir/test_special_op_translator.py
@@ -127,7 +127,7 @@ def test_elementwise_without_y_grad(self):
                 mean = paddle.mean(out1)
                 paddle.static.append_backward(mean)
 
-                out = exe.run(main_program, {}, fetch_list=[out1.name])
+                out = exe.run(main_program, {}, fetch_list=[out1])
                 np.testing.assert_allclose(
                     out[0],
                     x_data + y_data.reshape(100, 1, 1),
@@ -158,7 +158,7 @@ def test_elementwise_with_y_grad(self):
                 mean = paddle.mean(out1)
                 paddle.static.append_backward(mean)
 
-                out = exe.run(main_program, {}, fetch_list=[out1.name])
+                out = exe.run(main_program, {}, fetch_list=[out1])
                 np.testing.assert_allclose(
                     out[0],
                     x_data + y_data.reshape(100, 1, 1),
@@ -325,7 +325,7 @@ def test_reduce_all(self):
                 x = paddle.to_tensor(arr, dtype='int32')
                 out1 = paddle.all(x)
 
-                out = exe.run(main_program, {}, fetch_list=[out1.name])
+                out = exe.run(main_program, {}, fetch_list=[out1])
                 np.testing.assert_array_equal(out[0], np.all(arr))
 
     def test_with_axis(self):
@@ -341,7 +341,7 @@ def test_with_axis(self):
                 x = paddle.to_tensor(arr, dtype='int32')
                 out1 = paddle.all(x, axis=0)
 
-                out = exe.run(main_program, {}, fetch_list=[out1.name])
+                out = exe.run(main_program, {}, fetch_list=[out1])
                 np.testing.assert_array_equal(out[0], np.all(arr, axis=0))
 
 
@@ -424,7 +424,7 @@ def test_no_mutable_attribute(self):
             with paddle.static.program_guard(main_program):
                 x = paddle.ones(shape=[2, 3, 4], dtype="float32")
                 x = paddle.static.setitem(x, (0, 0), 6)
-        ret = exe.run(main_program, fetch_list=x.name)
+        ret = exe.run(main_program, fetch_list=[x])
 
         x_data = np.ones([2, 3, 4]).astype("float32")
         x_data[0, 0] = 6
@@ -442,7 +442,7 @@ def test_with_mutable_attribute(self):
                 x = paddle.ones(shape=[2, 3, 4], dtype="float32")
                 zero = paddle.full([], 0, dtype="int32")
                 x = paddle.static.setitem(x, zero, 6)
-        ret = exe.run(main_program, fetch_list=x.name)
+        ret = exe.run(main_program, fetch_list=[x])
 
         x_data = np.ones([2, 3, 4]).astype("float32")
         x_data[0] = 6
diff --git a/test/deprecated/ir/pir/test_standalone_pir.py b/test/deprecated/ir/pir/test_standalone_pir.py
@@ -39,7 +39,7 @@ def test_with_pir(self):
                 y = paddle.ones([2, 2], dtype="float32")
 
                 z = x + y
-            out = exe.run(main_program, {}, fetch_list=[z.name])
+            out = exe.run(main_program, {}, fetch_list=[z])
 
         gold_res = np.ones([2, 2], dtype="float32") * 2
 
@@ -65,7 +65,7 @@ def test_with_pir(self):
                 y = paddle.ones([2, 2], dtype="float32")
 
                 z = paddle.linalg.multi_dot([x, y])
-            out = exe.run(main_program, {}, fetch_list=[z.name])
+            out = exe.run(main_program, {}, fetch_list=[z])
 
         gold_res = np.ones([2, 2], dtype="float32") * 2
 
@@ -96,7 +96,7 @@ def test_with_pir(self):
             out = exe.run(
                 main_program,
                 feed={"x": np_a, "y": np_b},
-                fetch_list=[z.name],
+                fetch_list=[z],
             )
 
         gold_res = np_a + np_b
@@ -124,7 +124,7 @@ def test_with_pir(self):
 
             out = exe.run(
                 main_program,
-                fetch_list=[loss.name],
+                fetch_list=[loss],
             )
 
 
@@ -155,7 +155,7 @@ def test_with_pir(self):
             out = exe.run(
                 main_program,
                 feed={"x": np_a, "y": np_b},
-                fetch_list=[z.name],
+                fetch_list=[z],
             )
 
         gold_res = np_a * np_b
@@ -254,7 +254,7 @@ def test_with_pir(self):
             out = exe.run(
                 main_program,
                 feed={"x": np_a},
-                fetch_list=[out0.name],
+                fetch_list=[out0],
             )
 
             np.testing.assert_array_equal(out[0], np_a[0:2])
@@ -280,7 +280,7 @@ def test_with_pir(self):
                 z = x + y
                 z = paddle.static.Print(z)
 
-            out = exe.run(main_program, {}, fetch_list=[z.name])
+            out = exe.run(main_program, {}, fetch_list=[z])
 
         gold_res = np.ones([2, 2], dtype="float32") * 2
 
diff --git a/test/deprecated/ir/test_ir_generate_pass.py b/test/deprecated/ir/test_ir_generate_pass.py
@@ -282,10 +282,8 @@ def check_multi_add_to_sum(self, pass_type):
             "y": np.random.random([10, 10, 10]).astype("float32"),
             "z": np.random.random([10, 10, 10]).astype("float32"),
         }
-        before_out = executor.run(program, feed=feed, fetch_list=[out.name])
-        after_out = executor.run(
-            after_program, feed=feed, fetch_list=[out.name]
-        )
+        before_out = executor.run(program, feed=feed, fetch_list=[out])
+        after_out = executor.run(after_program, feed=feed, fetch_list=[out])
         np.testing.assert_allclose(before_out, after_out, rtol=1e-05)
 
     def test_multi_add_to_sum(self):
@@ -318,10 +316,10 @@ def test_generate_combine_mul_v1(self):
             "z": np.random.random([32, 48]).astype("float32"),
         }
         before_out1, before_out2 = executor.run(
-            program, feed=feed, fetch_list=[out1.name, out2.name]
+            program, feed=feed, fetch_list=[out1, out2]
         )
         after_out1, after_out2 = executor.run(
-            after_program, feed=feed, fetch_list=[out1.name, out2.name]
+            after_program, feed=feed, fetch_list=[out1, out2]
         )
         np.testing.assert_allclose(before_out1, after_out1, rtol=1e-05)
         np.testing.assert_allclose(before_out2, after_out2, rtol=1e-05)
@@ -361,10 +359,8 @@ def check_generate_simplify_inference(self, pass_type):
         executor = paddle.static.Executor(paddle.CPUPlace())
         executor.run(startup_program)
         feed = {"x": np.random.random([10, 16, 16]).astype("float32")}
-        before_out = executor.run(program, feed=feed, fetch_list=[out.name])
-        after_out = executor.run(
-            after_program, feed=feed, fetch_list=[out.name]
-        )
+        before_out = executor.run(program, feed=feed, fetch_list=[out])
+        after_out = executor.run(after_program, feed=feed, fetch_list=[out])
         np.testing.assert_allclose(before_out, after_out, rtol=1e-05)
 
     def test_generate_simplify_inference(self):
@@ -397,8 +393,6 @@ def test_generate_layer_norm_fuse_pass(self):
         executor = paddle.static.Executor(paddle.CPUPlace())
         executor.run(startup_program)
         feed = {"x": np.random.random([3, 64, 120]).astype("float32")}
-        before_out = executor.run(program, feed=feed, fetch_list=[out.name])
-        after_out = executor.run(
-            after_program, feed=feed, fetch_list=[out.name]
-        )
+        before_out = executor.run(program, feed=feed, fetch_list=[out])
+        after_out = executor.run(after_program, feed=feed, fetch_list=[out])
         np.testing.assert_allclose(before_out, after_out, rtol=1e-05)
diff --git a/test/deprecated/legacy_test/check_nan_inf_base.py b/test/deprecated/legacy_test/check_nan_inf_base.py
@@ -90,7 +90,7 @@ def check(use_cuda):
                 outs = exe.run(
                     main,
                     feed={'x': train_data, 'y': y_label},
-                    fetch_list=[y_predict.name, avg_cost.name, acc_top1.name],
+                    fetch_list=[y_predict, avg_cost, acc_top1],
                 )
                 step += 1
                 print(f'iter={step:.0f},cost={outs[1]},acc1={outs[2]}')
diff --git a/test/deprecated/legacy_test/dist_fleet_ctr.py b/test/deprecated/legacy_test/dist_fleet_ctr.py
@@ -198,7 +198,7 @@ def do_distributed_testing(self, fleet):
                 batch_idx += 1
                 loss_val = exe.run(
                     program=paddle.static.default_main_program(),
-                    fetch_list=[self.avg_cost.name],
+                    fetch_list=[self.avg_cost],
                 )
                 loss_val = np.mean(loss_val)
                 message = f"TEST ---> batch_idx: {batch_idx} loss: {loss_val}\n"
@@ -231,7 +231,7 @@ def do_pyreader_training(self, fleet):
                 while True:
                     loss_val = exe.run(
                         program=base.default_main_program(),
-                        fetch_list=[self.avg_cost.name],
+                        fetch_list=[self.avg_cost],
                     )
                     loss_val = np.mean(loss_val)
                     # TODO(randomly fail)
diff --git a/test/deprecated/legacy_test/test_calc_gradient.py b/test/deprecated/legacy_test/test_calc_gradient.py
@@ -59,7 +59,7 @@ def test1(self):
         place = base.CPUPlace()
         exe = base.Executor(place)
         exe.run(startup)
-        out = exe.run(main, fetch_list=[grad1.name, grad2.name])
+        out = exe.run(main, fetch_list=[grad1, grad2])
         self.assertEqual(6, out[0][0])
         self.assertEqual(6, out[1][0])
 
diff --git a/test/deprecated/legacy_test/test_compiled_program.py b/test/deprecated/legacy_test/test_compiled_program.py
@@ -49,7 +49,7 @@ def setUp(self):
             (loss_data,) = exe.run(
                 base.default_main_program(),
                 feed={"image": self.img, "label": self.label},
-                fetch_list=[loss.name],
+                fetch_list=[loss],
             )
             self.loss = float(loss_data)
 
@@ -71,7 +71,7 @@ def test_compiled_program_base(self):
             (loss_data,) = exe.run(
                 compiled_prog,
                 feed={"image": self.img, "label": self.label},
-                fetch_list=[loss.name],
+                fetch_list=[loss],
             )
             np.testing.assert_array_equal(float(loss_data), self.loss)
 
diff --git a/test/deprecated/legacy_test/test_executor_and_use_program_cache.py b/test/deprecated/legacy_test/test_executor_and_use_program_cache.py
@@ -52,7 +52,7 @@ def _train(use_program_cache, max_iters=1):
                 outs = exe.run(
                     program=main_program,
                     feed={'a': a_np, 'b': b_np},
-                    fetch_list=[output.name],
+                    fetch_list=[output],
                     use_program_cache=use_program_cache,
                 )
                 end = time.time()
diff --git a/test/deprecated/legacy_test/test_feed_data_check_shape_type.py b/test/deprecated/legacy_test/test_feed_data_check_shape_type.py
@@ -250,7 +250,7 @@ def _feed_data_in_executor(
             fetches = exe.run(
                 train_program,
                 feed={in_data.name: feed_in_data, label.name: feed_label},
-                fetch_list=[loss.name],
+                fetch_list=[loss],
             )
 
 
diff --git a/test/deprecated/legacy_test/test_fuse_elewise_add_act_pass.py b/test/deprecated/legacy_test/test_fuse_elewise_add_act_pass.py
@@ -59,7 +59,7 @@ def check(self, place):
             loss_data_fused = exe.run(
                 compiled_prog_fused,
                 feed={"X": x, "Y": y},
-                fetch_list=[loss.name],
+                fetch_list=[loss],
             )
 
         # close fused_pass
@@ -72,7 +72,7 @@ def check(self, place):
         with base.scope_guard(scope):
             exe.run(startup_program)
             loss_data = exe.run(
-                compiled_prog, feed={"X": x, "Y": y}, fetch_list=[loss.name]
+                compiled_prog, feed={"X": x, "Y": y}, fetch_list=[loss]
             )
 
         self.assertEqual(loss_data_fused, loss_data)
diff --git a/test/deprecated/legacy_test/test_inplace_addto_strategy.py b/test/deprecated/legacy_test/test_inplace_addto_strategy.py
@@ -104,9 +104,7 @@ def run_program(enable_addto):
                 np.float32
             )
             for i in range(10):
-                res = exe.run(
-                    compiled, feed={'img': img}, fetch_list=[loss.name, w.name]
-                )
+                res = exe.run(compiled, feed={'img': img}, fetch_list=[loss, w])
             return res
 
         res1, w1 = run_program(True)

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ def run_example_code():`
`293`	`293`
`294`	`294`	`x_fp32 = np.random.random(size=[1, 1, 28, 28]).astype("float32")`
`295`	`295`	`(loss_data,) = exe.run(`
`296`		`- main_program, feed={"X": x_fp32}, fetch_list=[loss.name]`
	`296`	`+ main_program, feed={"X": x_fp32}, fetch_list=[loss]`
`297`	`297`	`)`
`298`	`298`
`299`	`299`	`self.assertEqual(`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ def get_loss_data(self, place, x, use_amp=False, use_apply_passes=False):`
`116`	`116`
`117`	`117`	`for i in range(5):`
`118`	`118`	`loss_data = exe.run(`
`119`		`- train_program, feed={"X": x[i]}, fetch_list=[loss.name]`
	`119`	`+ train_program, feed={"X": x[i]}, fetch_list=[loss]`
`120`	`120`	`)`
`121`	`121`	`return loss_data`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def run_trainer(self, args):`
`126`	`126`	`(global_expert_count,) = exe.run(`
`127`	`127`	`tmp_main_prog,`
`128`	`128`	`feed={"local_expert_count": local_expert_count},`
`129`		`- fetch_list=[global_expert_count.name],`
	`129`	`+ fetch_list=[global_expert_count],`
`130`	`130`	`)`
`131`	`131`
`132`	`132`	`fwd_expert_count = sum(global_expert_count)`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ def custom_relu_static(`
`54`	`54`	`out_v = exe.run(`
`55`	`55`	`static.default_main_program(),`
`56`	`56`	`feed={'X': np_x},`
`57`		`- fetch_list=[out.name],`
	`57`	`+ fetch_list=[out],`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	`paddle.disable_static()`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ def custom_relu_static(`
`43`	`43`	`out_v = exe.run(`
`44`	`44`	`static.default_main_program(),`
`45`	`45`	`feed={'X': np_x},`
`46`		`- fetch_list=[out.name],`
	`46`	`+ fetch_list=[out],`
`47`	`47`	`)`
`48`	`48`
`49`	`49`	`paddle.disable_static()`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def custom_relu_static(func, device, dtype, np_x, use_func=True):`
`62`	`62`	`out_v = exe.run(`
`63`	`63`	`static.default_main_program(),`
`64`	`64`	`feed={"X": np_x},`
`65`		`- fetch_list=[out.name],`
	`65`	`+ fetch_list=[out],`
`66`	`66`	`)`
`67`	`67`
`68`	`68`	`paddle.disable_static()`