【PIR API adaptor No.150、151、155、157、173】 Migrate qr,mv etc. into pir (#58740)

DrRyanHuang · web-flow · commit 0dcc072f719f · 2023-11-15T11:38:33.000+08:00
diff --git a/paddle/fluid/ir_adaptor/translator/op_translator.cc b/paddle/fluid/ir_adaptor/translator/op_translator.cc
@@ -1642,10 +1642,6 @@ struct MulGradOpTranscriber : public OpTranscriber {
       gradReshape("X@GRAD");
     }
 
-    if (y_grad_output.size() < 1) {
-      return;
-    }
-
     if (y_grad_output.size()) {
       gradReshape("Y@GRAD");
     }
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -1202,7 +1202,7 @@ def _check_attr(attr, message):
     else:
         num_columns = num_rows
 
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         out = _C_ops.eye(
             num_rows, num_columns, dtype, _current_expected_place()
         )
diff --git a/python/paddle/tensor/linalg.py b/python/paddle/tensor/linalg.py
@@ -1595,8 +1595,8 @@ def matrix_rank(x, tol=None, hermitian=False, name=None):
              [1, 1, 1, 1]])
 
     """
-    if in_dynamic_mode():
-        if isinstance(tol, Variable):
+    if in_dynamic_or_pir_mode():
+        if isinstance(tol, (Variable, paddle.pir.OpResult)):
             if tol.dtype != x.dtype:
                 tol_tensor = cast(tol, x.dtype)
             else:
@@ -1850,7 +1850,7 @@ def mv(x, vec, name=None):
             Tensor(shape=[2], dtype=float64, place=Place(cpu), stop_gradient=True,
             [14., 10.])
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.mv(x, vec)
     else:
 
@@ -2288,7 +2288,7 @@ def matrix_power(x, n, name=None):
              [-7.66666667 ,  8.         , -1.83333333 ],
              [ 1.80555556 , -1.91666667 ,  0.44444444 ]])
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.matrix_power(x, n)
     else:
         check_variable_and_dtype(
@@ -2348,7 +2348,7 @@ def qr(x, mode="reduced", name=None):
 
             >>> # one can verify : X = Q * R ;
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         q, r = _C_ops.qr(x, mode)
         if mode == "r":
             return r
@@ -2762,7 +2762,7 @@ def multi_dot(x, name=None):
             [10, 7]
 
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.multi_dot(x)
     else:
         check_type(x, 'x', (list, tuple), 'multi_dot')
diff --git a/test/legacy_test/test_matrix_power_op.py b/test/legacy_test/test_matrix_power_op.py
@@ -18,8 +18,9 @@
 from op_test import OpTest
 
 import paddle
-from paddle import base
+from paddle import base, static
 from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 paddle.enable_static()
 
@@ -44,11 +45,15 @@ def setUp(self):
         self.attrs = {"n": self.n}
 
     def test_check_output(self):
-        self.check_output()
+        self.check_output(check_pir=True)
 
     def test_grad(self):
         self.check_grad(
-            ["X"], "Out", numeric_grad_delta=1e-5, max_relative_error=1e-7
+            ["X"],
+            "Out",
+            numeric_grad_delta=1e-5,
+            max_relative_error=1e-7,
+            check_pir=True,
         )
 
 
@@ -109,7 +114,11 @@ def config(self):
 
     def test_grad(self):
         self.check_grad(
-            ["X"], "Out", numeric_grad_delta=1e-5, max_relative_error=1e-6
+            ["X"],
+            "Out",
+            numeric_grad_delta=1e-5,
+            max_relative_error=1e-6,
+            check_pir=True,
         )
 
 
@@ -156,7 +165,11 @@ def config(self):
 
     def test_grad(self):
         self.check_grad(
-            ["X"], "Out", numeric_grad_delta=1e-5, max_relative_error=1e-6
+            ["X"],
+            "Out",
+            numeric_grad_delta=1e-5,
+            max_relative_error=1e-6,
+            check_pir=True,
         )
 
 
@@ -209,7 +222,7 @@ def config(self):
         self.n = 2
 
     def test_grad(self):
-        self.check_grad(["X"], "Out", max_relative_error=1e-2)
+        self.check_grad(["X"], "Out", max_relative_error=1e-2, check_pir=True)
 
 
 class TestMatrixPowerOpBatchedFP32(TestMatrixPowerOpFP32):
@@ -248,7 +261,7 @@ def setUp(self):
             self.places.append(base.CUDAPlace(0))
 
     def check_static_result(self, place):
-        with base.program_guard(base.Program(), base.Program()):
+        with static.program_guard(static.Program(), static.Program()):
             input_x = paddle.static.data(
                 name="input_x", shape=[4, 4], dtype="float64"
             )
@@ -258,14 +271,14 @@ def check_static_result(self, place):
 
             exe = base.Executor(place)
             fetches = exe.run(
-                base.default_main_program(),
                 feed={"input_x": input_np},
                 fetch_list=[result],
             )
             np.testing.assert_allclose(
                 fetches[0], np.linalg.matrix_power(input_np, -2), rtol=1e-05
             )
 
+    @test_with_pir_api
     def test_static(self):
         for place in self.places:
             self.check_static_result(place=place)
@@ -343,7 +356,7 @@ def setUp(self):
             self.places.append(base.CUDAPlace(0))
 
     def check_static_result(self, place):
-        with base.program_guard(base.Program(), base.Program()):
+        with static.program_guard(static.Program(), static.Program()):
             input = paddle.static.data(
                 name="input", shape=[4, 4], dtype="float64"
             )
@@ -354,7 +367,6 @@ def check_static_result(self, place):
             exe = base.Executor(place)
             try:
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"input": input_np},
                     fetch_list=[result],
                 )
@@ -363,6 +375,7 @@ def check_static_result(self, place):
             except ValueError as ex:
                 print("The mat is singular")
 
+    @test_with_pir_api
     def test_static(self):
         paddle.enable_static()
         for place in self.places:
diff --git a/test/legacy_test/test_matrix_rank_op.py b/test/legacy_test/test_matrix_rank_op.py
@@ -18,8 +18,9 @@
 from op_test import OpTest
 
 import paddle
-from paddle import base
+from paddle import base, static
 from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 paddle.enable_static()
 SEED = 2049
@@ -45,7 +46,7 @@ def setUp(self):
         self.outputs = {'Out': self.out}
 
     def test_check_output(self):
-        self.check_output()
+        self.check_output(check_pir=True)
 
     def init_data(self):
         self.x = np.eye(3, dtype=np.float32)
@@ -165,14 +166,15 @@ def test_dygraph(self):
         rank_pd = paddle.linalg.matrix_rank(x_pd, tol, hermitian=False)
         np.testing.assert_allclose(rank_np, rank_pd, rtol=1e-05)
 
+    @test_with_pir_api
     def test_static(self):
         paddle.enable_static()
         places = [base.CPUPlace()]
         if core.is_compiled_with_cuda():
             places.append(base.CUDAPlace(0))
 
         for place in places:
-            with base.program_guard(base.Program(), base.Program()):
+            with static.program_guard(static.Program(), static.Program()):
                 x_np = np.random.rand(3, 4, 7, 7).astype(np.float64)
                 tol_np = np.random.random([3, 4]).astype(np.float32)
                 x_pd = paddle.static.data(
@@ -187,14 +189,13 @@ def test_static(self):
                 )
                 exe = base.Executor(place)
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"X": x_np, "TolTensor": tol_np},
                     fetch_list=[rank_pd],
                 )
                 np.testing.assert_allclose(fetches[0], rank_np, rtol=1e-05)
 
         for place in places:
-            with base.program_guard(base.Program(), base.Program()):
+            with static.program_guard(static.Program(), static.Program()):
                 x_np = np.random.rand(3, 4, 7, 7).astype(np.float64)
                 x_pd = paddle.static.data(
                     name="X", shape=[3, 4, 7, 7], dtype='float64'
@@ -203,14 +204,13 @@ def test_static(self):
                 rank_pd = paddle.linalg.matrix_rank(x_pd, hermitian=True)
                 exe = base.Executor(place)
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"X": x_np},
                     fetch_list=[rank_pd],
                 )
                 np.testing.assert_allclose(fetches[0], rank_np, rtol=1e-05)
 
         for place in places:
-            with base.program_guard(base.Program(), base.Program()):
+            with static.program_guard(static.Program(), static.Program()):
                 x_np = np.random.rand(3, 4, 7, 7).astype(np.float64)
                 x_pd = paddle.static.data(
                     name="X", shape=[3, 4, 7, 7], dtype='float64'
@@ -219,7 +219,6 @@ def test_static(self):
                 rank_pd = paddle.linalg.matrix_rank(x_pd, 0.1, hermitian=False)
                 exe = base.Executor(place)
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"X": x_np},
                     fetch_list=[rank_pd],
                 )
diff --git a/test/legacy_test/test_multi_dot_op.py b/test/legacy_test/test_multi_dot_op.py
@@ -20,6 +20,7 @@
 
 import paddle
 from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 paddle.enable_static()
 
@@ -43,11 +44,11 @@ def get_inputs_and_outputs(self):
         self.outputs = {'Out': multi_dot([self.A, self.B])}
 
     def test_check_output(self):
-        self.check_output()
+        self.check_output(check_pir=True)
 
     def test_check_grad(self):
-        self.check_grad(['x0'], 'Out')
-        self.check_grad(['x1'], 'Out')
+        self.check_grad(['x0'], 'Out', check_pir=True)
+        self.check_grad(['x1'], 'Out', check_pir=True)
 
 
 class TestMultiDotFP16Op(TestMultiDotOp):
@@ -86,14 +87,14 @@ def get_inputs_and_outputs(self):
         }
 
     def test_check_output(self):
-        self.check_output_with_place(self.place)
+        self.check_output_with_place(self.place, check_pir=True)
 
     def test_check_grad(self):
         self.check_grad_with_place(
-            self.place, ['x0'], 'Out', numeric_grad_delta=0.01
+            self.place, ['x0'], 'Out', numeric_grad_delta=0.01, check_pir=True
         )
         self.check_grad_with_place(
-            self.place, ['x1'], 'Out', numeric_grad_delta=0.01
+            self.place, ['x1'], 'Out', numeric_grad_delta=0.01, check_pir=True
         )
 
 
@@ -107,9 +108,9 @@ def get_inputs_and_outputs(self):
         self.outputs = {'Out': multi_dot([self.A, self.B, self.C])}
 
     def test_check_grad(self):
-        self.check_grad(['x0'], 'Out')
-        self.check_grad(['x1'], 'Out')
-        self.check_grad(['x2'], 'Out')
+        self.check_grad(['x0'], 'Out', check_pir=True)
+        self.check_grad(['x1'], 'Out', check_pir=True)
+        self.check_grad(['x2'], 'Out', check_pir=True)
 
 
 # A*(B*C)
@@ -122,9 +123,9 @@ def get_inputs_and_outputs(self):
         self.outputs = {'Out': multi_dot([self.A, self.B, self.C])}
 
     def test_check_grad(self):
-        self.check_grad(['x0'], 'Out')
-        self.check_grad(['x1'], 'Out')
-        self.check_grad(['x2'], 'Out')
+        self.check_grad(['x0'], 'Out', check_pir=True)
+        self.check_grad(['x1'], 'Out', check_pir=True)
+        self.check_grad(['x2'], 'Out', check_pir=True)
 
 
 class TestMultiDotOp4Mat(TestMultiDotOp):
@@ -144,10 +145,10 @@ def get_inputs_and_outputs(self):
         self.outputs = {'Out': multi_dot([self.A, self.B, self.C, self.D])}
 
     def test_check_grad(self):
-        self.check_grad(['x0'], 'Out')
-        self.check_grad(['x1'], 'Out')
-        self.check_grad(['x2'], 'Out')
-        self.check_grad(['x3'], 'Out')
+        self.check_grad(['x0'], 'Out', check_pir=True)
+        self.check_grad(['x1'], 'Out', check_pir=True)
+        self.check_grad(['x2'], 'Out', check_pir=True)
+        self.check_grad(['x3'], 'Out', check_pir=True)
 
 
 class TestMultiDotOpFirst1D(TestMultiDotOp):
@@ -201,9 +202,9 @@ def get_inputs_and_outputs(self):
         self.outputs = {'Out': multi_dot([self.A, self.B, self.C])}
 
     def test_check_grad(self):
-        self.check_grad(['x0'], 'Out')
-        self.check_grad(['x1'], 'Out')
-        self.check_grad(['x2'], 'Out')
+        self.check_grad(['x0'], 'Out', check_pir=True)
+        self.check_grad(['x1'], 'Out', check_pir=True)
+        self.check_grad(['x2'], 'Out', check_pir=True)
 
 
 class TestMultiDotOp4MatLast1D(TestMultiDotOp4Mat):
@@ -299,6 +300,7 @@ def test_errors(self):
 
 
 class APITestMultiDot(unittest.TestCase):
+    @test_with_pir_api
     def test_out(self):
         paddle.enable_static()
         with paddle.static.program_guard(paddle.static.Program()):
diff --git a/test/legacy_test/test_mv_op.py b/test/legacy_test/test_mv_op.py
diff --git a/test/legacy_test/test_qr_op.py b/test/legacy_test/test_qr_op.py
diff --git a/test/legacy_test/test_zero_dim_tensor.py b/test/legacy_test/test_zero_dim_tensor.py

Original file line number	Diff line number	Diff line change
`@@ -1642,10 +1642,6 @@ struct MulGradOpTranscriber : public OpTranscriber {`
`1642`	`1642`	`gradReshape("X@GRAD");`
`1643`	`1643`	`}`
`1644`	`1644`
`1645`		`- if (y_grad_output.size() < 1) {`
`1646`		`- return;`
`1647`		`- }`
`1648`		`-`
`1649`	`1645`	`if (y_grad_output.size()) {`
`1650`	`1646`	`gradReshape("Y@GRAD");`
`1651`	`1647`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,7 @@ def _check_attr(attr, message):`
`1202`	`1202`	`else:`
`1203`	`1203`	`num_columns = num_rows`
`1204`	`1204`
`1205`		`- if in_dynamic_mode():`
	`1205`	`+ if in_dynamic_or_pir_mode():`
`1206`	`1206`	`out = _C_ops.eye(`
`1207`	`1207`	`num_rows, num_columns, dtype, _current_expected_place()`
`1208`	`1208`	`)`