[PIR]Migrate Conv3D into pir (#58418)

0x45f · web-flow · commit dd1fa3c09941 · 2023-10-30T15:11:16.000+08:00
diff --git a/test/legacy_test/test_conv3d_layer.py b/test/legacy_test/test_conv3d_layer.py
@@ -137,13 +137,16 @@ def functional(self, place):
                 w_var = paddle.static.data(
                     "weight", self.weight_shape, dtype=self.dtype
                 )
-                b_var = paddle.static.data(
-                    "bias", (self.num_filters,), dtype=self.dtype
-                )
+                if not self.no_bias:
+                    b_var = paddle.static.data(
+                        "bias", (self.num_filters,), dtype=self.dtype
+                    )
+                else:
+                    b_var = None
                 y_var = F.conv3d(
                     x_var,
                     w_var,
-                    None if self.no_bias else b_var,
+                    b_var,
                     padding=self.padding,
                     stride=self.stride,
                     dilation=self.dilation,
@@ -181,21 +184,29 @@ def paddle_nn_layer(self):
         return y_np, t1
 
     def _test_equivalence(self, place):
-        place = base.CPUPlace()
         result1 = self.base_layer(place)
         result2 = self.functional(place)
         with dg.guard(place):
             result3, g1 = self.paddle_nn_layer()
         np.testing.assert_array_almost_equal(result1, result2)
         np.testing.assert_array_almost_equal(result2, result3)
 
+    def _test_pir_equivalence(self, place):
+        with paddle.pir_utils.IrGuard():
+            result1 = self.functional(place)
+        with dg.guard(place):
+            result2, g1 = self.paddle_nn_layer()
+        np.testing.assert_array_almost_equal(result1, result2)
+
     def runTest(self):
         place = base.CPUPlace()
         self._test_equivalence(place)
+        self._test_pir_equivalence(place)
 
         if base.core.is_compiled_with_cuda():
             place = base.CUDAPlace(0)
             self._test_equivalence(place)
+            self._test_pir_equivalence(place)
 
 
 class Conv3DErrorTestCase(Conv3DTestCase):
diff --git a/test/legacy_test/test_conv3d_op.py b/test/legacy_test/test_conv3d_op.py
@@ -208,7 +208,7 @@ def init_kernel_type(self):
         def test_check_output(self):
             place = core.CUDAPlace(0)
             self.check_output_with_place(
-                place, check_dygraph=(not self.use_mkldnn)
+                place, check_dygraph=(not self.use_mkldnn), check_pir=True
             )
 
         def test_check_grad_no_filter(self):
@@ -222,6 +222,7 @@ def test_check_grad_no_filter(self):
                 no_grad_set={'Filter'},
                 check_dygraph=(not self.use_mkldnn),
                 user_defined_grads=[numeric_grads],
+                check_pir=True,
             )
 
         def test_check_grad_no_input(self):
@@ -235,6 +236,7 @@ def test_check_grad_no_input(self):
                 no_grad_set={'Input'},
                 check_dygraph=(not self.use_mkldnn),
                 user_defined_grads=[numeric_grads],
+                check_pir=True,
             )
 
         def test_check_grad(self):
@@ -248,6 +250,7 @@ def test_check_grad(self):
                 'Output',
                 user_defined_grads=[numeric_input_grads, numeric_fliter_grads],
                 check_dygraph=(not self.use_mkldnn),
+                check_pir=True,
             )
 
     cls_name = "{}_{}".format(parent.__name__, "CUDNNBF16OP")
@@ -448,7 +451,10 @@ def test_check_output(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
         place = core.CUDAPlace(0) if self.has_cudnn() else core.CPUPlace()
         self.check_output_with_place(
-            place, atol=1e-5, check_dygraph=(not self.use_mkldnn)
+            place,
+            atol=1e-5,
+            check_dygraph=(not self.use_mkldnn),
+            check_pir=True,
         )
 
     def test_check_grad(self):
@@ -460,6 +466,7 @@ def test_check_grad(self):
             'Output',
             max_relative_error=0.03,
             check_dygraph=(not self.use_mkldnn),
+            check_pir=True,
         )
 
     def test_check_grad_no_filter(self):
@@ -472,6 +479,7 @@ def test_check_grad_no_filter(self):
             max_relative_error=0.03,
             no_grad_set={'Filter'},
             check_dygraph=(not self.use_mkldnn),
+            check_pir=True,
         )
 
     def test_check_grad_no_input(self):
@@ -484,6 +492,7 @@ def test_check_grad_no_input(self):
             max_relative_error=0.03,
             no_grad_set={'Input'},
             check_dygraph=(not self.use_mkldnn),
+            check_pir=True,
         )
 
     def init_test_case(self):
@@ -599,7 +608,7 @@ def test_check_output(self):
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
             if core.is_float16_supported(place):
-                self.check_output_with_place(place, atol=2e-2)
+                self.check_output_with_place(place, atol=2e-2, check_pir=True)
 
 
 @unittest.skipIf(
@@ -623,7 +632,7 @@ def test_check_output(self):
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
             if core.is_float16_supported(place):
-                self.check_output_with_place(place, atol=2e-2)
+                self.check_output_with_place(place, atol=2e-2, check_pir=True)
 
 
 @unittest.skipIf(
@@ -647,7 +656,7 @@ def test_check_output(self):
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
             if core.is_float16_supported(place):
-                self.check_output_with_place(place, atol=2e-2)
+                self.check_output_with_place(place, atol=2e-2, check_pir=True)
 
 
 @unittest.skipIf(
@@ -671,7 +680,7 @@ def test_check_output(self):
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
             if core.is_float16_supported(place):
-                self.check_output_with_place(place, atol=2e-2)
+                self.check_output_with_place(place, atol=2e-2, check_pir=True)
 
 
 @unittest.skipIf(
@@ -695,7 +704,7 @@ def test_check_output(self):
         if core.is_compiled_with_cuda():
             place = core.CUDAPlace(0)
             if core.is_float16_supported(place):
-                self.check_output_with_place(place, atol=2e-2)
+                self.check_output_with_place(place, atol=2e-2, check_pir=True)
 
 
 class TestCUDNNExhaustiveSearch(TestCUDNN):
@@ -771,14 +780,18 @@ def has_cudnn(self):
 
     def test_check_output(self):
         place = core.CUDAPlace(0) if self.has_cudnn() else core.CPUPlace()
-        self.check_output_with_place(place, atol=1e-5)
+        self.check_output_with_place(place, atol=1e-5, check_pir=True)
 
     def test_check_grad(self):
         if self.dtype == np.float16:
             return
         place = core.CUDAPlace(0) if self.has_cudnn() else core.CPUPlace()
         self.check_grad_with_place(
-            place, {'Input', 'Filter'}, 'Output', max_relative_error=0.03
+            place,
+            {'Input', 'Filter'},
+            'Output',
+            max_relative_error=0.03,
+            check_pir=True,
         )
 
     def test_check_grad_no_filter(self):
@@ -791,6 +804,7 @@ def test_check_grad_no_filter(self):
             'Output',
             max_relative_error=0.03,
             no_grad_set={'Filter'},
+            check_pir=True,
         )
 
     def test_check_grad_no_input(self):
@@ -803,6 +817,7 @@ def test_check_grad_no_input(self):
             'Output',
             max_relative_error=0.03,
             no_grad_set={'Input'},
+            check_pir=True,
         )
 
     def init_test_case(self):
