PaddlePaddle
diff --git a/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎test/deprecated/legacy_test/CMakeLists.txt
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎test/deprecated/legacy_test/test_decoupled_py_reader_data_check.py renamed to ‎test/deprecated/legacy_test/test_decoupled_py_reader_data_check_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_decoupled_py_reader_data_check.py renamed to ‎test/deprecated/legacy_test/test_decoupled_py_reader_data_check_deprecated.py
Copy file name to clipboard
diff --git a/‎test/deprecated/legacy_test/test_deprecated_memory_optimize_interfaces.py renamed to ‎test/deprecated/legacy_test/test_deprecated_memory_optimize_interfaces_deprecated.py
Copy file name to clipboard b/‎test/deprecated/legacy_test/test_deprecated_memory_optimize_interfaces.py renamed to ‎test/deprecated/legacy_test/test_deprecated_memory_optimize_interfaces_deprecated.py
Copy file name to clipboard
diff --git a/‎test/legacy_test/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎test/legacy_test/CMakeLists.txt
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎test/deprecated/legacy_test/test_diag_v2.py renamed to ‎test/legacy_test/test_diag_v2.py
Copy file name to clipboard
+44-38Lines changed: 44 additions & 38 deletions b/‎test/deprecated/legacy_test/test_diag_v2.py renamed to ‎test/legacy_test/test_diag_v2.py
Copy file name to clipboard
+44-38Lines changed: 44 additions & 38 deletions
diff --git a/‎test/deprecated/legacy_test/test_digamma_op.py renamed to ‎test/legacy_test/test_digamma_op.py
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions b/‎test/deprecated/legacy_test/test_digamma_op.py renamed to ‎test/legacy_test/test_digamma_op.py
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎test/deprecated/legacy_test/test_elementwise_floordiv_op.py renamed to ‎test/legacy_test/test_elementwise_floordiv_op.py
Copy file name to clipboard
+43-11Lines changed: 43 additions & 11 deletions b/‎test/deprecated/legacy_test/test_elementwise_floordiv_op.py renamed to ‎test/legacy_test/test_elementwise_floordiv_op.py
Copy file name to clipboard
+43-11Lines changed: 43 additions & 11 deletions
diff --git a/‎test/deprecated/legacy_test/test_elementwise_mod_op.py renamed to ‎test/legacy_test/test_elementwise_mod_op.py
Copy file name to clipboard
+58-27Lines changed: 58 additions & 27 deletions b/‎test/deprecated/legacy_test/test_elementwise_mod_op.py renamed to ‎test/legacy_test/test_elementwise_mod_op.py
Copy file name to clipboard
+58-27Lines changed: 58 additions & 27 deletions
@@ -690,8 +690,7 @@ set(TEST_CINN_OPS
     test_arg_min_max_op
     test_instance_norm_op
     test_instance_norm_op_deprecated
-    test_cumsum_op
-    test_erf_op)
+    test_cumsum_op)
 
 foreach(TEST_CINN_OP ${TEST_CINN_OPS})
   if(WITH_CINN)
 
@@ -1022,7 +1022,8 @@ set(TEST_CINN_OPS
     test_transpose_op
     test_strided_slice_op
     test_pad_op
-    test_pool2d_op)
+    test_pool2d_op
+    test_erf_op)
 
 foreach(TEST_CINN_OP ${TEST_CINN_OPS})
   if(WITH_CINN)
 
@@ -18,8 +18,9 @@
 from op_test import OpTest, convert_float_to_uint16
 
 import paddle
-from paddle import base
-from paddle.base import Program, core, program_guard
+from paddle import base, static
+from paddle.base import core
+from paddle.pir_utils import test_with_pir_api
 
 
 class TestDiagV2Op(OpTest):
@@ -89,9 +90,12 @@ def init_config(self):
 
 
 class TestDiagV2Error(unittest.TestCase):
+    @test_with_pir_api
     def test_errors(self):
         paddle.enable_static()
-        with program_guard(Program(), Program()):
+        main = static.Program()
+        startup = static.Program()
+        with static.program_guard(main, startup):
 
             def test_diag_v2_type():
                 x = [1, 2, 3]
@@ -200,36 +204,42 @@ def run_imperative(self):
         y = paddle.diag(x, offset=-1)
         np.testing.assert_allclose(y.numpy(), self.expected12, rtol=1e-05)
 
+    @test_with_pir_api
     def run_static(self, use_gpu=False):
-        x = paddle.static.data(name='input', shape=[10, 10], dtype='float32')
-        x2 = paddle.static.data(name='input2', shape=[100], dtype='float64')
-        x3 = paddle.static.data(name='input3', shape=[100], dtype='int64')
-        x4 = paddle.static.data(
-            name='input4', shape=[2000, 2000], dtype='float32'
-        )
-        x5 = paddle.static.data(name='input5', shape=[2000], dtype='float32')
-        x6 = paddle.static.data(
-            name='input6', shape=[2000, 1500], dtype='float32'
-        )
-        result0 = paddle.diag(x)
-        result1 = paddle.diag(x, offset=1)
-        result2 = paddle.diag(x, offset=-1)
-        result3 = paddle.diag(x, name='aaa')
-        result4 = paddle.diag(x2, padding_value=8)
-        result5 = paddle.diag(x3, padding_value=8.0)
-        result6 = paddle.diag(x3, padding_value=-8)
-        result7 = paddle.diag(x4)
-        result8 = paddle.diag(x4, offset=1)
-        result9 = paddle.diag(x4, offset=-1)
-        result10 = paddle.diag(x5)
-        result11 = paddle.diag(x5, offset=1)
-        result12 = paddle.diag(x5, offset=-1)
-        result13 = paddle.diag(x6, offset=-1)
+        mp, sp = static.Program(), static.Program()
+        with static.program_guard(mp, sp):
+            x = paddle.static.data(
+                name='input', shape=[10, 10], dtype='float32'
+            )
+            x2 = paddle.static.data(name='input2', shape=[100], dtype='float64')
+            x3 = paddle.static.data(name='input3', shape=[100], dtype='int64')
+            x4 = paddle.static.data(
+                name='input4', shape=[2000, 2000], dtype='float32'
+            )
+            x5 = paddle.static.data(
+                name='input5', shape=[2000], dtype='float32'
+            )
+            x6 = paddle.static.data(
+                name='input6', shape=[2000, 1500], dtype='float32'
+            )
+            result0 = paddle.diag(x)
+            result1 = paddle.diag(x, offset=1)
+            result2 = paddle.diag(x, offset=-1)
+            result4 = paddle.diag(x2, padding_value=8)
+            result5 = paddle.diag(x3, padding_value=8.0)
+            result6 = paddle.diag(x3, padding_value=-8)
+            result7 = paddle.diag(x4)
+            result8 = paddle.diag(x4, offset=1)
+            result9 = paddle.diag(x4, offset=-1)
+            result10 = paddle.diag(x5)
+            result11 = paddle.diag(x5, offset=1)
+            result12 = paddle.diag(x5, offset=-1)
+            result13 = paddle.diag(x6, offset=-1)
 
         place = base.CUDAPlace(0) if use_gpu else base.CPUPlace()
-        exe = base.Executor(place)
-        exe.run(base.default_startup_program())
-        (
+        exe = static.Executor(place)
+        exe.run(sp)
+        [
             res0,
             res1,
             res2,
@@ -243,7 +253,8 @@ def run_static(self, use_gpu=False):
             res11,
             res12,
             res13,
-        ) = exe.run(
+        ] = exe.run(
+            mp,
             feed={
                 "input": self.input_np,
                 "input2": self.input_np2,
@@ -272,7 +283,6 @@ def run_static(self, use_gpu=False):
         np.testing.assert_allclose(res0, self.expected0, rtol=1e-05)
         np.testing.assert_allclose(res1, self.expected1, rtol=1e-05)
         np.testing.assert_allclose(res2, self.expected2, rtol=1e-05)
-        self.assertTrue('aaa' in result3.name)
         np.testing.assert_allclose(res4, self.expected3, rtol=1e-05)
         np.testing.assert_allclose(res5, self.expected4, rtol=1e-05)
         np.testing.assert_allclose(res6, self.expected5, rtol=1e-05)
@@ -289,9 +299,7 @@ def test_cpu(self):
         self.run_imperative()
 
         paddle.enable_static()
-
-        with base.program_guard(base.Program()):
-            self.run_static()
+        self.run_static()
 
     def test_gpu(self):
         if not base.core.is_compiled_with_cuda():
@@ -300,9 +308,7 @@ def test_gpu(self):
         paddle.disable_static(place=paddle.base.CUDAPlace(0))
         self.run_imperative()
         paddle.enable_static()
-
-        with base.program_guard(base.Program()):
-            self.run_static(use_gpu=True)
+        self.run_static(use_gpu=True)
 
 
 class TestDiagV2FP16OP(TestDiagV2Op):
 
@@ -135,12 +135,6 @@ def test_in_dynamic_mode(self):
                     res = paddle.digamma(input_t).numpy()
                     np.testing.assert_allclose(res, sc_res, rtol=1e-05)
 
-    def test_name_argument(self):
-        with static.program_guard(static.Program()):
-            x = static.data(name="x", shape=self._shape, dtype=self.dtypes[0])
-            out = paddle.digamma(x, name="digamma_res")
-            self.assertTrue("digamma_res" in out.name)
-
     def test_dtype_error(self):
         # in static graph mode
         with self.assertRaises(TypeError):
 
@@ -17,10 +17,11 @@
 from contextlib import contextmanager
 
 import numpy as np
-from op_test import OpTest, paddle_static_guard
+from op_test import OpTest
 
 import paddle
-from paddle import base
+from paddle import base, static
+from paddle.pir_utils import test_with_pir_api
 
 
 class TestElementwiseModOp(OpTest):
@@ -106,16 +107,47 @@ def device_guard(device=None):
 
 
 class TestFloorDivideOp(unittest.TestCase):
-    def test_name(self):
+    @test_with_pir_api
+    def test_static(self):
         paddle.enable_static()
-        with paddle_static_guard():
-            with base.program_guard(base.Program()):
-                x = paddle.static.data(name="x", shape=[2, 3], dtype="int64")
-                y = paddle.static.data(name='y', shape=[2, 3], dtype='int64')
-
-                y_1 = paddle.floor_divide(x, y, name='div_res')
-                self.assertEqual(('div_res' in y_1.name), True)
-            paddle.disable_static()
+        places = [base.CPUPlace()]
+        if base.core.is_compiled_with_cuda():
+            places.append(base.CUDAPlace(0))
+        for p in places:
+            for dtype in (
+                'int32',
+                'int64',
+                'float16',
+                'float32',
+                'float64',
+            ):
+                np_x = np.array([2, 3, 8, 7]).astype(dtype)
+                np_y = np.array([1, 5, 3, 3]).astype(dtype)
+                mp, sp = static.Program(), static.Program()
+                with static.program_guard(mp, sp):
+                    x = static.data("x", shape=[4], dtype=dtype)
+                    y = static.data("y", shape=[4], dtype=dtype)
+                    z = paddle.floor_divide(x, y)
+                exe = static.Executor(p)
+                exe.run(sp)
+                [np_z] = exe.run(
+                    mp, feed={"x": np_x, "y": np_y}, fetch_list=[z]
+                )
+                z_expected = np.floor_divide(np_x, np_y)
+                self.assertEqual((np_z == z_expected).all(), True)
+
+            np_x = np.array([2, 3, 8, 7]).astype("uint16")
+            np_y = np.array([1, 5, 3, 3]).astype("uint16")
+            mp, sp = static.Program(), static.Program()
+            with static.program_guard(mp, sp):
+                x = static.data("x", shape=[4], dtype="uint16")
+                y = static.data("y", shape=[4], dtype="uint16")
+                z = paddle.floor_divide(x, y)
+            exe = static.Executor(p)
+            exe.run(sp)
+            [np_z] = exe.run(mp, feed={"x": np_x, "y": np_y}, fetch_list=[z])
+            z_expected = np.array([16384, 0, 16384, 16384], dtype='uint16')
+            self.assertEqual((np_z == z_expected).all(), True)
 
     def test_dygraph(self):
         paddle.disable_static()
 
@@ -19,8 +19,9 @@
 from op_test import OpTest, convert_float_to_uint16, convert_uint16_to_float
 
 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
 
 
 class TestElementwiseModOp(OpTest):
@@ -205,43 +206,73 @@ def init_dtype(self):
 
 
 class TestRemainderOp(unittest.TestCase):
-    def _executed_api(self, x, y, name=None):
-        return paddle.remainder(x, y, name)
+    def setUp(self):
+        self.np_x1 = np.array([2, 3, 8, 7]).astype('int64')
+        self.np_y1 = np.array([1, 5, 3, 3]).astype('int64')
+        self.z_expected1 = np.array([0, 3, 2, 1])
 
-    def test_name(self):
-        with base.program_guard(base.Program()):
-            x = paddle.static.data(name="x", shape=[2, 3], dtype="int64")
-            y = paddle.static.data(name='y', shape=[2, 3], dtype='int64')
+        self.np_x2 = np.array([-3.3, 11.5, -2, 3.5])
+        self.np_y2 = np.array([-1.2, 2.0, 3.3, -2.3])
+        self.z_expected2 = np.array([-0.9, 1.5, 1.3, -1.1])
 
-            y_1 = self._executed_api(x, y, name='div_res')
-            self.assertEqual(('div_res' in y_1.name), True)
+        self.np_x3 = np.array([-3, 11, -2, 3])
+        self.np_y3 = np.array([-1, 2, 3, -2])
+        self.z_expected3 = np.array([0, 1, 1, -1])
+
+    def _executed_api(self, x, y, name=None):
+        return paddle.remainder(x, y, name)
 
     def test_dygraph(self):
         with base.dygraph.guard():
-            np_x = np.array([2, 3, 8, 7]).astype('int64')
-            np_y = np.array([1, 5, 3, 3]).astype('int64')
-            x = paddle.to_tensor(np_x)
-            y = paddle.to_tensor(np_y)
+            x = paddle.to_tensor(self.np_x1)
+            y = paddle.to_tensor(self.np_y1)
             z = self._executed_api(x, y)
             np_z = z.numpy()
-            z_expected = np.array([0, 3, 2, 1])
-            self.assertEqual((np_z == z_expected).all(), True)
+            self.assertEqual((np_z == self.z_expected1).all(), True)
 
-            np_x = np.array([-3.3, 11.5, -2, 3.5])
-            np_y = np.array([-1.2, 2.0, 3.3, -2.3])
-            x = paddle.to_tensor(np_x)
-            y = paddle.to_tensor(np_y)
+            x = paddle.to_tensor(self.np_x2)
+            y = paddle.to_tensor(self.np_y2)
             z = x % y
-            z_expected = np.array([-0.9, 1.5, 1.3, -1.1])
-            np.testing.assert_allclose(z_expected, z.numpy(), rtol=1e-05)
+            np.testing.assert_allclose(self.z_expected2, z.numpy(), rtol=1e-05)
 
-            np_x = np.array([-3, 11, -2, 3])
-            np_y = np.array([-1, 2, 3, -2])
-            x = paddle.to_tensor(np_x, dtype="int64")
-            y = paddle.to_tensor(np_y, dtype="int64")
+            x = paddle.to_tensor(self.np_x3, dtype="int64")
+            y = paddle.to_tensor(self.np_y3, dtype="int64")
             z = x % y
-            z_expected = np.array([0, 1, 1, -1])
-            np.testing.assert_allclose(z_expected, z.numpy(), rtol=1e-05)
+            np.testing.assert_allclose(self.z_expected3, z.numpy(), rtol=1e-05)
+
+    @test_with_pir_api
+    def test_static(self):
+        mp, sp = static.Program(), static.Program()
+        with static.program_guard(mp, sp):
+            x1 = static.data("x1", shape=[4], dtype="int64")
+            y1 = static.data("y1", shape=[4], dtype="int64")
+            z1 = self._executed_api(x1, y1)
+
+            x2 = static.data("x2", shape=[4], dtype="float64")
+            y2 = static.data("y2", shape=[4], dtype="float64")
+            z2 = self._executed_api(x2, y2)
+
+            x3 = static.data("x3", shape=[4], dtype="int64")
+            y3 = static.data("y3", shape=[4], dtype="int64")
+            z3 = self._executed_api(x3, y3)
+
+        exe = static.Executor()
+        exe.run(sp)
+        [z_np1, z_np2, z_np3] = exe.run(
+            mp,
+            feed={
+                "x1": self.np_x1,
+                "y1": self.np_y1,
+                "x2": self.np_x2,
+                "y2": self.np_y2,
+                "x3": self.np_x3,
+                "y3": self.np_y3,
+            },
+            fetch_list=[z1, z2, z3],
+        )
+        np.testing.assert_allclose(self.z_expected1, z_np1, rtol=1e-05)
+        np.testing.assert_allclose(self.z_expected2, z_np2, rtol=1e-05)
+        np.testing.assert_allclose(self.z_expected3, z_np3, rtol=1e-05)
 
 
 class TestRemainderInplaceOp(TestRemainderOp):