[PRIM][PIR]Support more test case for prim (#57764)

lxd-cumt · wanghuancoder · web-flow · commit d23b2b0367b4 · 2023-09-27T11:08:20.000+08:00
* fix uniform force gpu

* add composite for dropout_grad op

* add dropout fwd prim rules

* add prim test for dropout

* migrate dropout prim rules to pir

* test dropout prim rules

* fix bugs

* change gpu0 to cpu for testpircompositedropout

* fix bugs

* change uniform place

* add bypass support

* fix bugs, change set_output to by_pass

* support more testcase for dropout op

* fix bugs

* fix bugs

* add prim test for more test case

---------

Co-authored-by: Wang Huan &lt;wanghuan29@baidu.com&gt;
diff --git a/test/legacy_test/test_cast_op.py b/test/legacy_test/test_cast_op.py
@@ -52,7 +52,7 @@ def init_shapes(self):
         self.input_shape = [10, 10]
 
     def test_check_output(self):
-        self.check_output(check_prim_pir=True, check_new_ir=True)
+        self.check_output(check_new_ir=True)
 
     def test_grad(self):
         self.check_grad(
diff --git a/test/legacy_test/test_elementwise_add_op.py b/test/legacy_test/test_elementwise_add_op.py
@@ -56,8 +56,6 @@ def test_check_output(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
         self.check_output(
             check_dygraph=self.check_dygraph(),
-            check_prim=self.check_prim,
-            check_prim_pir=self.check_dygraph(),
             check_new_ir=self.check_dygraph(),
         )
 
@@ -155,8 +153,6 @@ def test_check_output(self):
             place,
             atol=1e-3,
             check_dygraph=self.check_dygraph(),
-            check_prim=self.check_prim,
-            check_prim_pir=self.check_dygraph(),
             check_new_ir=self.check_dygraph(),
         )
 
diff --git a/test/legacy_test/test_elementwise_mul_op.py b/test/legacy_test/test_elementwise_mul_op.py
@@ -49,7 +49,6 @@ def test_check_output(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
         self.check_output(
             check_dygraph=(not self.use_mkldnn),
-            check_prim_pir=(not self.use_mkldnn),
             check_new_ir=(not self.use_mkldnn),
         )
 
@@ -275,7 +274,6 @@ def setUp(self):
     def test_check_output(self):
         self.check_output(
             check_dygraph=self.check_dygraph,
-            check_prim=self.check_prim,
             check_new_ir=self.check_dygraph,
         )
 
diff --git a/test/legacy_test/test_elementwise_pow_op.py b/test/legacy_test/test_elementwise_pow_op.py
@@ -44,7 +44,7 @@ def test_check_output(self):
         if hasattr(self, 'attrs'):
             self.check_output(check_dygraph=False)
         else:
-            self.check_output(check_prim_pir=True, check_new_ir=True)
+            self.check_output(check_new_ir=True)
 
     def test_check_grad_normal(self):
         if hasattr(self, 'attrs'):
@@ -204,7 +204,7 @@ def test_check_output(self):
         if hasattr(self, 'attrs'):
             self.check_output(check_dygraph=False)
         else:
-            self.check_output(check_prim_pir=True, check_new_ir=True)
+            self.check_output(check_new_ir=True)
 
 
 class TestElementwisePowGradOpInt(unittest.TestCase):
@@ -260,7 +260,7 @@ def test_check_output(self):
         if hasattr(self, 'attrs'):
             self.check_output(check_dygraph=False)
         else:
-            self.check_output(check_prim_pir=True, check_new_ir=True)
+            self.check_output(check_new_ir=True)
 
     def test_check_grad(self):
         self.check_grad(
@@ -297,7 +297,7 @@ def setUp(self):
         self.outputs = {'Out': convert_float_to_uint16(out)}
 
     def test_check_output(self):
-        self.check_output(check_prim_pir=True, check_new_ir=True)
+        self.check_output(check_new_ir=True)
 
     def test_check_grad(self):
         self.check_grad(['X', 'Y'], 'Out')
diff --git a/test/legacy_test/test_elementwise_sub_op.py b/test/legacy_test/test_elementwise_sub_op.py
@@ -48,7 +48,11 @@ def test_check_output(self):
 
     def test_check_grad_normal(self):
         self.check_grad(
-            ['X', 'Y'], 'Out', check_prim=self.check_prim, check_new_ir=True
+            ['X', 'Y'],
+            'Out',
+            check_prim=self.check_prim,
+            check_prim_pir=self.check_prim_pir,
+            check_new_ir=True,
         )
 
     def test_check_grad_ingore_x(self):
@@ -58,6 +62,7 @@ def test_check_grad_ingore_x(self):
             max_relative_error=0.005,
             no_grad_set=set("X"),
             check_prim=self.check_prim,
+            check_prim_pir=self.check_prim_pir,
             check_new_ir=True,
         )
 
@@ -68,11 +73,13 @@ def test_check_grad_ingore_y(self):
             max_relative_error=0.005,
             no_grad_set=set('Y'),
             check_prim=self.check_prim,
+            check_prim_pir=self.check_prim_pir,
             check_new_ir=True,
         )
 
     def if_check_prim(self):
         self.check_prim = True
+        self.check_prim_pir = True
 
     def if_enable_cinn(self):
         pass
@@ -125,6 +132,8 @@ def test_check_grad_ingore_x(self):
             'Out',
             no_grad_set=set("X"),
             max_relative_error=0.1,
+            check_prim=True,
+            check_prim_pir=True,
             check_new_ir=True,
         )
 
@@ -137,6 +146,7 @@ def test_check_grad_ingore_y(self):
             no_grad_set=set('Y'),
             max_relative_error=0.1,
             check_prim=True,
+            check_prim_pir=True,
             check_new_ir=True,
         )
 
diff --git a/test/legacy_test/test_mean_op.py b/test/legacy_test/test_mean_op.py
@@ -195,7 +195,10 @@ def test_check_output(self):
         else:
             place = paddle.CUDAPlace(0)
             self.check_output_with_place(
-                place=place, check_prim=True, check_new_ir=True
+                place=place,
+                check_prim=True,
+                check_prim_pir=True,
+                check_new_ir=True,
             )
 
     def test_check_grad(self):
diff --git a/test/legacy_test/test_reshape_op.py b/test/legacy_test/test_reshape_op.py
@@ -188,7 +188,9 @@ class TestReshapeOpWithInputShape(OpTest):
     def setUp(self):
         self.init_data()
         self.op_type = "reshape2"
+        self.prim_op_type = "prim"
         self.python_api = paddle.tensor.reshape
+        self.public_python_api = paddle.tensor.reshape
         self.python_out_sig = ['Out']
 
         self.inputs = {
@@ -210,7 +212,13 @@ def test_check_output(self):
         self.check_output(no_check_set=['XShape'], check_new_ir=True)
 
     def test_check_grad(self):
-        self.check_grad(["X"], "Out", check_new_ir=True)
+        self.check_grad(
+            ["X"],
+            "Out",
+            check_prim=True,
+            check_prim_pir=True,
+            check_new_ir=True,
+        )
 
 
 # Situation 3: have shape(list, have tensor), no actual shape(Tensor)
@@ -219,6 +227,8 @@ def setUp(self):
         self.init_data()
         self.op_type = "reshape2"
         self.python_api = paddle.tensor.reshape
+        self.public_python_api = paddle.tensor.reshape
+        self.prim_op_type = "prim"
         self.python_out_sig = ['Out']
 
         shape_tensor = []
@@ -247,7 +257,13 @@ def test_check_output(self):
         self.check_output(no_check_set=['XShape'], check_new_ir=True)
 
     def test_check_grad(self):
-        self.check_grad(["X"], "Out", check_new_ir=True)
+        self.check_grad(
+            ["X"],
+            "Out",
+            check_prim=True,
+            check_prim_pir=True,
+            check_new_ir=True,
+        )
 
 
 class TestReshapeOpDimInfer1_attr_ShapeTensor(TestReshapeOp_attr_ShapeTensor):
@@ -272,6 +288,8 @@ def setUp(self):
         self.init_data()
         self.op_type = "reshape2"
         self.python_api = paddle.tensor.reshape
+        self.public_python_api = paddle.tensor.reshape
+        self.prim_op_type = "prim"
         self.python_out_sig = ['Out']
 
         self.inputs = {
@@ -293,7 +311,13 @@ def test_check_output(self):
         self.check_output(no_check_set=['XShape'], check_new_ir=True)
 
     def test_check_grad(self):
-        self.check_grad(["X"], "Out", check_new_ir=True)
+        self.check_grad(
+            ["X"],
+            "Out",
+            check_prim=True,
+            check_prim_pir=True,
+            check_new_ir=True,
+        )
 
 
 class TestReshapeOpDimInfer1_attr_OnlyShape(TestReshapeOp_attr_OnlyShape):
diff --git a/test/legacy_test/test_sum_op.py b/test/legacy_test/test_sum_op.py
@@ -306,7 +306,11 @@ def test_check_output(self):
         place = core.CUDAPlace(0)
         if core.is_float16_supported(place):
             self.check_output_with_place(
-                place, check_cinn=True, check_new_ir=True
+                place,
+                check_cinn=True,
+                check_prim=True,
+                check_prim_pir=True,
+                check_new_ir=True,
             )
 
     # FIXME: Because of the precision fp16, max_relative_error
@@ -318,6 +322,7 @@ def test_check_grad(self):
                 ['x0'],
                 'Out',
                 check_cinn=True,
+                check_prim=True,
                 check_prim_pir=True,
                 check_new_ir=True,
             )
@@ -368,14 +373,20 @@ def init_kernel_type(self):
 
     def test_check_output(self):
         # new dynamic graph mode does not support unit16 type
-        self.check_output(check_dygraph=False, check_new_ir=True)
+        self.check_output(
+            check_dygraph=False,
+            check_prim=True,
+            check_prim_pir=True,
+            check_new_ir=True,
+        )
 
     def test_check_grad(self):
         # new dynamic graph mode does not support unit16 type
         self.check_grad(
             ['x0'],
             'Out',
             check_dygraph=False,
+            check_prim=True,
             check_prim_pir=True,
             check_new_ir=True,
         )

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ def test_check_output(self):`
`49`	`49`	`# TODO(wangzhongpu): support mkldnn op in dygraph mode`
`50`	`50`	`self.check_output(`
`51`	`51`	`check_dygraph=(not self.use_mkldnn),`
`52`		`- check_prim_pir=(not self.use_mkldnn),`
`53`	`52`	`check_new_ir=(not self.use_mkldnn),`
`54`	`53`	`)`
`55`	`54`
`@@ -275,7 +274,6 @@ def setUp(self):`
`275`	`274`	`def test_check_output(self):`
`276`	`275`	`self.check_output(`
`277`	`276`	`check_dygraph=self.check_dygraph,`
`278`		`- check_prim=self.check_prim,`
`279`	`277`	`check_new_ir=self.check_dygraph,`
`280`	`278`	`)`
`281`	`279`