fix prim (#64166)

YuanRisheng · web-flow · commit 8d3ed523bbad · 2024-05-13T16:43:28.000+08:00
diff --git a/test/deprecated/prim/prim/flags/CMakeLists.txt b/test/deprecated/prim/prim/flags/CMakeLists.txt
@@ -9,6 +9,7 @@ foreach(TEST_OP ${TEST_OPS})
 endforeach()
 
 if(WITH_CINN)
-  set_tests_properties(test_prim_flags_case PROPERTIES LABELS "RUN_TYPE=CINN")
-  set_tests_properties(test_prim_flags_case PROPERTIES TIMEOUT 300)
+  set_tests_properties(test_prim_flags_case_deprecated
+                       PROPERTIES LABELS "RUN_TYPE=CINN")
+  set_tests_properties(test_prim_flags_case_deprecated PROPERTIES TIMEOUT 300)
 endif()
diff --git a/test/deprecated/prim/prim/flags/test_prim_flags_case_deprecated.py b/test/deprecated/prim/prim/flags/test_prim_flags_case_deprecated.py
diff --git a/test/deprecated/prim/prim/flags/test_prim_flags_deprecated.py b/test/deprecated/prim/prim/flags/test_prim_flags_deprecated.py
diff --git a/test/deprecated/prim/prim/vjp/static/CMakeLists.txt b/test/deprecated/prim/prim/vjp/static/CMakeLists.txt
@@ -8,9 +8,3 @@ set(GC_ENVS FLAGS_eager_delete_tensor_gb=0.0)
 foreach(TEST_OP ${TEST_OPS})
   py_test_modules(${TEST_OP} MODULES ${TEST_OP} ENVS ${GC_ENVS})
 endforeach()
-
-set_tests_properties(test_comp_div_grad PROPERTIES TIMEOUT 60)
-set_tests_properties(test_comp_add_grad PROPERTIES TIMEOUT 60)
-set_tests_properties(test_comp_sub_grad PROPERTIES TIMEOUT 60)
-set_tests_properties(test_comp_add_tanh_grad PROPERTIES TIMEOUT 60)
-set_tests_properties(test_comp_sqrt_grad PROPERTIES TIMEOUT 60)
diff --git a/test/prim/prim/vjp/static/CMakeLists.txt b/test/prim/prim/vjp/static/CMakeLists.txt
@@ -11,3 +11,8 @@ endforeach()
 
 set_tests_properties(test_comp_sum_grad PROPERTIES TIMEOUT 60)
 set_tests_properties(test_comp_tanh_grad PROPERTIES TIMEOUT 60)
+set_tests_properties(test_comp_div_grad PROPERTIES TIMEOUT 60)
+set_tests_properties(test_comp_add_grad PROPERTIES TIMEOUT 60)
+set_tests_properties(test_comp_sub_grad PROPERTIES TIMEOUT 60)
+set_tests_properties(test_comp_add_tanh_grad PROPERTIES TIMEOUT 60)
+set_tests_properties(test_comp_sqrt_grad PROPERTIES TIMEOUT 60)
diff --git a/test/prim/prim/vjp/static/test_comp_add_grad.py b/test/prim/prim/vjp/static/test_comp_add_grad.py
@@ -90,21 +90,9 @@ def train(self, use_prim, use_cinn):
 
         return res
 
-    def test_cinn(self):
-        paddle.disable_static()
-        dy_res = self.train(use_prim=False, use_cinn=False)
-        comp_st_cinn_res = self.train(use_prim=True, use_cinn=True)
-
-        for i in range(len(dy_res)):
-            np.testing.assert_allclose(
-                comp_st_cinn_res[i].numpy(),
-                dy_res[i].numpy(),
-                rtol=1e-7,
-                atol=1e-7,
-            )
+    def test_tanh_grad_comp(self):
         paddle.enable_static()
 
-    def test_tanh_grad_comp(self):
         def actual(primal0, primal1):
             core._set_prim_backward_enabled(True)
             mp, sp = paddle.static.Program(), paddle.static.Program()
@@ -123,7 +111,7 @@ def actual(primal0, primal1):
                     'primal0': primal0,
                     'primal1': primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -149,7 +137,7 @@ def desired(primal0, primal1):
                     'primal0': self.primal0,
                     'primal1': self.primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -170,6 +158,7 @@ def desired(primal0, primal1):
             atol=0,
         )
         core._set_prim_backward_enabled(False)
+        paddle.disable_static()
 
 
 if __name__ == '__main__':
diff --git a/test/prim/prim/vjp/static/test_comp_add_tanh_grad.py b/test/prim/prim/vjp/static/test_comp_add_tanh_grad.py
@@ -91,20 +91,6 @@ def train(self, use_prim, use_cinn):
 
         return res
 
-    def test_cinn(self):
-        paddle.disable_static()
-        dy_res = self.train(use_prim=False, use_cinn=False)
-        comp_st_cinn_res = self.train(use_prim=True, use_cinn=True)
-
-        for i in range(len(dy_res)):
-            np.testing.assert_allclose(
-                comp_st_cinn_res[i].numpy(),
-                dy_res[i].numpy(),
-                rtol=1e-7,
-                atol=1e-7,
-            )
-        paddle.enable_static()
-
     def test_tanh_grad_comp(self):
         paddle.enable_static()
 
@@ -127,7 +113,7 @@ def actual(primal0, primal1):
                     'primal0': primal0,
                     'primal1': primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -154,7 +140,7 @@ def desired(primal0, primal1):
                     'primal0': self.primal0,
                     'primal1': self.primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
diff --git a/test/prim/prim/vjp/static/test_comp_div_grad.py b/test/prim/prim/vjp/static/test_comp_div_grad.py
@@ -90,21 +90,9 @@ def train(self, use_prim, use_cinn):
 
         return res
 
-    def test_cinn(self):
-        paddle.disable_static()
-        dy_res = self.train(use_prim=False, use_cinn=False)
-        comp_st_cinn_res = self.train(use_prim=True, use_cinn=True)
-
-        for i in range(len(dy_res)):
-            np.testing.assert_allclose(
-                comp_st_cinn_res[i].numpy(),
-                dy_res[i].numpy(),
-                rtol=1e-6,
-                atol=1e-6,
-            )
+    def test_tanh_grad_comp(self):
         paddle.enable_static()
 
-    def test_tanh_grad_comp(self):
         def actual(primal0, primal1):
             core._set_prim_backward_enabled(True)
             mp, sp = paddle.static.Program(), paddle.static.Program()
@@ -123,7 +111,7 @@ def actual(primal0, primal1):
                     'primal0': primal0,
                     'primal1': primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -149,7 +137,7 @@ def desired(primal0, primal1):
                     'primal0': self.primal0,
                     'primal1': self.primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -170,6 +158,7 @@ def desired(primal0, primal1):
             atol=0,
         )
         core._set_prim_backward_enabled(False)
+        paddle.disable_static()
 
 
 if __name__ == '__main__':
diff --git a/test/prim/prim/vjp/static/test_comp_exp_grad.py b/test/prim/prim/vjp/static/test_comp_exp_grad.py
@@ -101,6 +101,8 @@ def actual(primal, cotangent):
                 )
                 y = paddle.exp(x)
                 x_cotangent = paddle.static.gradients(y, x, v)
+            if x_cotangent == [None]:
+                x_cotangent = []
             exe = paddle.static.Executor()
             exe.run(sp)
             return exe.run(
diff --git a/test/prim/prim/vjp/static/test_comp_matmul_double_grad.py b/test/prim/prim/vjp/static/test_comp_matmul_double_grad.py
@@ -238,9 +238,9 @@ def actual(primal0, primal1, primal2, trans_0, trans_1):
                         'primal2': primal2,
                     },
                     fetch_list=[
-                        res_double[0].name,
-                        res_double[1].name,
-                        res_double[2].name,
+                        res_double[0],
+                        res_double[1],
+                        res_double[2],
                     ],
                 )
 
@@ -271,9 +271,9 @@ def desired(primal0, primal1, primal2, trans_0, trans_1):
                         'primal2': primal2,
                     },
                     fetch_list=[
-                        res_double[0].name,
-                        res_double[1].name,
-                        res_double[2].name,
+                        res_double[0],
+                        res_double[1],
+                        res_double[2],
                     ],
                 )
 
diff --git a/test/prim/prim/vjp/static/test_comp_sigmoid_grad.py b/test/prim/prim/vjp/static/test_comp_sigmoid_grad.py
@@ -66,7 +66,7 @@ def actual(primal, cotangent):
                         'cotangent': cotangent,
                     },
                     fetch_list=[
-                        x_grad[0].name,
+                        x_grad[0],
                     ],
                 )
 
@@ -95,7 +95,7 @@ def desired(primal, cotangent):
                         'cotangent': cotangent,
                     },
                     fetch_list=[
-                        x_grad[0].name,
+                        x_grad[0],
                     ],
                 )
 
diff --git a/test/prim/prim/vjp/static/test_comp_sqrt_grad.py b/test/prim/prim/vjp/static/test_comp_sqrt_grad.py
@@ -69,21 +69,9 @@ def train(self, use_prim, use_cinn):
 
         return res
 
-    def test_cinn(self):
-        paddle.disable_static()
-        dy_res = self.train(use_prim=False, use_cinn=False)
-        comp_st_cinn_res = self.train(use_prim=True, use_cinn=True)
-
-        for i in range(len(dy_res)):
-            np.testing.assert_allclose(
-                comp_st_cinn_res[i].numpy(),
-                dy_res[i].numpy(),
-                rtol=1e-7,
-                atol=1e-7,
-            )
+    def test_sqrt_grad_comp(self):
         paddle.enable_static()
 
-    def test_sqrt_grad_comp(self):
         def actual(primal, cotangent):
             mp, sp = paddle.static.Program(), paddle.static.Program()
             with paddle.static.program_guard(mp, sp):
@@ -99,7 +87,7 @@ def actual(primal, cotangent):
             return exe.run(
                 program=mp,
                 feed={'primal': primal, 'cotangent': cotangent},
-                fetch_list=[x_cotangent[0].name],
+                fetch_list=[x_cotangent[0]],
             )[0]
 
         def desired(primal, cotangent):
@@ -112,6 +100,7 @@ def desired(primal, cotangent):
             atol=0,
         )
         core._set_prim_backward_enabled(False)
+        paddle.disable_static()
 
 
 if __name__ == '__main__':
diff --git a/test/prim/prim/vjp/static/test_comp_sub_grad.py b/test/prim/prim/vjp/static/test_comp_sub_grad.py
@@ -91,21 +91,9 @@ def train(self, use_prim, use_cinn):
 
         return res
 
-    def test_cinn(self):
-        paddle.disable_static()
-        dy_res = self.train(use_prim=False, use_cinn=False)
-        comp_st_cinn_res = self.train(use_prim=True, use_cinn=True)
-
-        for i in range(len(dy_res)):
-            np.testing.assert_allclose(
-                comp_st_cinn_res[i].numpy(),
-                dy_res[i].numpy(),
-                rtol=1e-7,
-                atol=1e-7,
-            )
+    def test_tanh_grad_comp(self):
         paddle.enable_static()
 
-    def test_tanh_grad_comp(self):
         def actual(primal0, primal1):
             core._set_prim_backward_enabled(True)
             mp, sp = paddle.static.Program(), paddle.static.Program()
@@ -124,7 +112,7 @@ def actual(primal0, primal1):
                     'primal0': primal0,
                     'primal1': primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -150,7 +138,7 @@ def desired(primal0, primal1):
                     'primal0': self.primal0,
                     'primal1': self.primal1,
                 },
-                fetch_list=[res[0].name, res[1].name],
+                fetch_list=[res[0], res[1]],
             )
             return out[0], out[1]
 
@@ -171,6 +159,7 @@ def desired(primal0, primal1):
             atol=0,
         )
         core._set_prim_backward_enabled(False)
+        paddle.disable_static()
 
 
 if __name__ == '__main__':
diff --git a/test/prim/prim/vjp/static/test_comp_transpose_grad.py b/test/prim/prim/vjp/static/test_comp_transpose_grad.py
@@ -182,7 +182,7 @@ def actual(primal, axis, cotangent):
             return exe.run(
                 program=mp,
                 feed={'primal': primal, 'cotangent': cotangent},
-                fetch_list=[x_cotangent[0].name],
+                fetch_list=[x_cotangent[0]],
             )[0]
 
         def desired(primal, axis, cotangent):
@@ -207,7 +207,7 @@ def desired(primal, axis, cotangent):
             return exe.run(
                 program=mp,
                 feed={'primal': primal, 'cotangent': cotangent},
-                fetch_list=[x_cotangent[0].name],
+                fetch_list=[x_cotangent[0]],
             )[0]
 
         if (self.dtype == np.float16) and isinstance(

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ def actual(primal, cotangent):`
`101`	`101`	`)`
`102`	`102`	`y = paddle.exp(x)`
`103`	`103`	`x_cotangent = paddle.static.gradients(y, x, v)`
	`104`	`+ if x_cotangent == [None]:`
	`105`	`+ x_cotangent = []`
`104`	`106`	`exe = paddle.static.Executor()`
`105`	`107`	`exe.run(sp)`
`106`	`108`	`return exe.run(`