【PIR API adaptor No.219 、220】 Migrate pinv/svd into pir (#58446)

DrRyanHuang · web-flow · commit f2f48a5635ac · 2023-11-23T14:19:28.000+08:00
diff --git a/paddle/phi/infermeta/unary.cc b/paddle/phi/infermeta/unary.cc
@@ -978,7 +978,7 @@ void EighInferMeta(const MetaTensor& x,
   out_w->set_dims(phi::make_ddim(values_dim));
   out_w->set_dtype(dtype::ToReal(x.dtype()));
   out_v->set_dims(input_dim);
-  out_v->set_dtype(dtype::ToReal(x.dtype()));
+  out_v->set_dtype(x.dtype());
 }
 
 void EigvalsInferMeta(const MetaTensor& x, MetaTensor* out, MetaConfig config) {
diff --git a/python/paddle/tensor/linalg.py b/python/paddle/tensor/linalg.py
@@ -2056,7 +2056,7 @@ def svd(x, full_matrices=False, name=None):
             >>> #                  V * VH == I
     """
 
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.svd(x, full_matrices)
     else:
         check_variable_and_dtype(x, 'dtype', ['float32', 'float64'], 'svd')
@@ -2925,7 +2925,7 @@ def pinv(x, rcond=1e-15, hermitian=False, name=None):
             # one can verify : x * out * x = x ;
             # or              out * x * out = x ;
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         if not hermitian:
             # combine svd and matmul op
             u, s, vt = _C_ops.svd(x, False)
diff --git a/test/legacy_test/test_diff_op.py b/test/legacy_test/test_diff_op.py
@@ -85,7 +85,7 @@ def test_static(self):
         if core.is_compiled_with_cuda():
             places.append(base.CUDAPlace(0))
         for place in places:
-            with static.program_guard(
+            with paddle.static.program_guard(
                 paddle.static.Program(), paddle.static.Program()
             ):
                 x = paddle.static.data(
diff --git a/test/legacy_test/test_linalg_pinv_op.py b/test/legacy_test/test_linalg_pinv_op.py
@@ -19,6 +19,7 @@
 import paddle
 from paddle import base
 from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 
 class LinalgPinvTestCase(unittest.TestCase):
@@ -61,13 +62,16 @@ def test_dygraph(self):
                 print("GOT     : \n", out)
                 raise RuntimeError("Check PINV dygraph Failed")
 
+    @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 paddle.static.program_guard(
+                paddle.static.Program(), paddle.static.Program()
+            ):
                 x = paddle.static.data(
                     name="input",
                     shape=self._input_shape,
@@ -76,9 +80,8 @@ def test_static(self):
                 out = paddle.linalg.pinv(
                     x, rcond=self.rcond, hermitian=self.hermitian
                 )
-                exe = base.Executor(place)
+                exe = paddle.static.Executor(place)
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"input": self._input_data},
                     fetch_list=[out],
                 )
diff --git a/test/legacy_test/test_svd_op.py b/test/legacy_test/test_svd_op.py
@@ -20,6 +20,7 @@
 import paddle
 from paddle import base
 from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 
 class TestSvdOp(OpTest):
@@ -51,7 +52,7 @@ def generate_output(self):
         self._output_data = np.linalg.svd(self._input_data)
 
     def test_check_output(self):
-        self.check_output(no_check_set=['U', 'VH'])
+        self.check_output(no_check_set=['U', 'VH'], check_pir=True)
 
     def test_svd_forward(self):
         """u matmul diag(s) matmul vt must become X"""
@@ -293,22 +294,24 @@ def test_dygraph(self):
         gt_u, gt_s, gt_vh = np.linalg.svd(a, full_matrices=False)
         np.testing.assert_allclose(s, gt_s, 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 paddle.static.program_guard(
+                paddle.static.Program(), paddle.static.Program()
+            ):
                 a = np.random.rand(5, 5)
                 x = paddle.static.data(
                     name="input", shape=[5, 5], dtype='float64'
                 )
                 u, s, vh = paddle.linalg.svd(x)
-                exe = base.Executor(place)
+                exe = paddle.static.Executor(place)
                 gt_u, gt_s, gt_vh = np.linalg.svd(a, full_matrices=False)
                 fetches = exe.run(
-                    base.default_main_program(),
                     feed={"input": a},
                     fetch_list=[s],
                 )

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ void EighInferMeta(const MetaTensor& x,`
`978`	`978`	`out_w->set_dims(phi::make_ddim(values_dim));`
`979`	`979`	`out_w->set_dtype(dtype::ToReal(x.dtype()));`
`980`	`980`	`out_v->set_dims(input_dim);`
`981`		`- out_v->set_dtype(dtype::ToReal(x.dtype()));`
	`981`	`+ out_v->set_dtype(x.dtype());`
`982`	`982`	`}`
`983`	`983`
`984`	`984`	`void EigvalsInferMeta(const MetaTensor& x, MetaTensor* out, MetaConfig config) {`