[Dy2St] Cleanup legacy ir test cases (part4) (#68254)

SigureMo · web-flow · commit d53da1a669a1 · 2024-09-17T12:43:14.000+08:00
diff --git a/test/dygraph_to_static/test_mnist_amp.py b/test/dygraph_to_static/test_mnist_amp.py
@@ -16,9 +16,6 @@
 from time import time
 
 import numpy as np
-from dygraph_to_static_utils import (
-    test_legacy_and_pt_and_pir,
-)
 from test_mnist import MNIST, SEED, TestMNIST
 
 import paddle
@@ -35,7 +32,6 @@ def train_static(self):
     def train_dygraph(self):
         return self.train(to_static=False)
 
-    @test_legacy_and_pt_and_pir
     def test_mnist_to_static(self):
         dygraph_loss = self.train_dygraph()
         static_loss = self.train_static()
diff --git a/test/dygraph_to_static/test_rollback.py b/test/dygraph_to_static/test_rollback.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -72,7 +71,6 @@ def foo(x, flag=False):
 
 
 class TestRollBackPlainFunction(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_plain_func(self):
         paddle.set_device("cpu")
         st_foo = paddle.jit.to_static(foo)
@@ -90,7 +88,6 @@ def test_plain_func(self):
 
 class TestRollBackNet(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_net(self):
         paddle.set_device("cpu")
         net = paddle.jit.to_static(Net())
@@ -139,7 +136,6 @@ def func(self, x):
 
 class TestRollBackNotForward(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_rollback(self):
         x = paddle.zeros([2, 2])
         net = FuncRollback()
diff --git a/test/dygraph_to_static/test_save_inference_model.py b/test/dygraph_to_static/test_save_inference_model.py
@@ -21,7 +21,6 @@
     Dy2StTestBase,
     test_ast_only,
     test_legacy_and_pir,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -235,7 +234,6 @@ def load_and_run_inference(
 
 class TestPartialProgramRaiseError(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_param_type(self):
         x_data = np.random.random((20, 20)).astype('float32')
 
diff --git a/test/dygraph_to_static/test_set_dynamic_shape.py b/test/dygraph_to_static/test_set_dynamic_shape.py
@@ -17,15 +17,13 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
 
 
 class TestSetDynamicShape(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_start(self):
         def dygraph_func(loop_number):
             mask = paddle.randn([2, 2])
@@ -43,7 +41,6 @@ def dygraph_func(loop_number):
         self.assertEqual(expected_shape, actual_shape)
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_pir_ast(self):
         def dygraph_func():
             mask = paddle.randn([2, 2])
diff --git a/test/dygraph_to_static/test_simnet.py b/test/dygraph_to_static/test_simnet.py
@@ -20,7 +20,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 from simnet_dygraph_model import BOW, HingeLoss
 
@@ -179,7 +178,6 @@ def train(conf_dict):
 
 
 class TestSimnet(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_dygraph_static_same_loss(self):
         if paddle.is_compiled_with_cuda():
             paddle.set_flags({"FLAGS_cudnn_deterministic": True})
diff --git a/test/dygraph_to_static/test_slice.py b/test/dygraph_to_static/test_slice.py
@@ -22,7 +22,6 @@
     enable_to_static_guard,
     static_guard,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -142,7 +141,6 @@ class TestSliceWithoutControlFlow(TestSliceBase):
     def init_dygraph_func(self):
         self.dygraph_func = test_slice_without_control_flow
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         self.init_dygraph_func()
         static_res = self.run_static_mode()
@@ -154,7 +152,6 @@ class TestSliceInIf(TestSliceBase):
     def init_dygraph_func(self):
         self.dygraph_func = test_slice_in_if
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         self.init_dygraph_func()
         static_res = self.run_static_mode()
@@ -191,7 +188,6 @@ def tearDown(self):
         self.temp_dir.cleanup()
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_set_value_with_save(self):
         with enable_to_static_guard(True):
             model = paddle.jit.to_static(
@@ -208,7 +204,6 @@ def test_set_value_with_save(self):
 
 class TestSliceSupplementSpecialCase(Dy2StTestBase):
     # unittest for slice index which abs(step)>0. eg: x[::2]
-    @test_legacy_and_pt_and_pir
     def test_static_slice_step(self):
         with static_guard():
             array = np.arange(4**3).reshape((4, 4, 4)).astype('int64')
@@ -227,7 +222,6 @@ def test_static_slice_step(self):
         np.testing.assert_array_equal(out[0], array[::2])
         np.testing.assert_array_equal(out[1], array[::-2])
 
-    @test_legacy_and_pt_and_pir
     def test_static_slice_step_dygraph2static(self):
         array = np.arange(4**2 * 5).reshape((5, 4, 4)).astype('int64')
         inps = paddle.to_tensor(array)
@@ -250,7 +244,6 @@ def func(inps):
 
 
 class TestPaddleStridedSlice(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_compare_paddle_strided_slice_with_numpy(self):
         array = np.arange(5)
         pt = paddle.to_tensor(array)
@@ -311,7 +304,6 @@ def slice_zero_shape_tensor(x):
 
 
 class TestSliceZeroShapeTensor(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_slice(self):
         x = paddle.ones([0, 0, 0, 0])
         y = slice_zero_shape_tensor(x)
diff --git a/test/dygraph_to_static/test_spec_names.py b/test/dygraph_to_static/test_spec_names.py
@@ -17,7 +17,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -49,7 +48,6 @@ def read_from_dataset(self):
         self.n = paddle.randn([4, 2, 8])
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_spec_name_hash(self):
         net = Net()
         net = paddle.jit.to_static(net)
diff --git a/test/dygraph_to_static/test_tensor_detach.py b/test/dygraph_to_static/test_tensor_detach.py
@@ -17,7 +17,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -32,7 +31,6 @@ def detach_fn(x, y):
 
 
 class TestDetach(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_detach(self):
         static_fn = paddle.jit.to_static(detach_fn)
         x = paddle.ones([], 'float32')
diff --git a/test/dygraph_to_static/test_tensor_methods.py b/test/dygraph_to_static/test_tensor_methods.py
@@ -19,7 +19,7 @@
     Dy2StTestBase,
     enable_to_static_guard,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
+    test_pir_only,
 )
 
 import paddle
@@ -36,9 +36,7 @@ def _run(self):
         x = paddle.ones([1, 2, 3])
         return paddle.jit.to_static(tensor_clone)(x).numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_tensor_clone(self):
-        paddle.disable_static()
         with enable_to_static_guard(False):
             dygraph_res = self._run()
 
@@ -59,9 +57,7 @@ def _run(self):
         return y.numpy()
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_to_static_numpy_report_error(self):
-        paddle.disable_static()
         with enable_to_static_guard(False):
             dygraph_res = self._run()
 
@@ -80,9 +76,7 @@ def _run(self):
         x = paddle.ones([1])
         return paddle.jit.to_static(tensor_item)(x)
 
-    @test_legacy_and_pt_and_pir
     def test_tensor_clone(self):
-        paddle.disable_static()
         with enable_to_static_guard(False):
             dygraph_res = self._run()
 
@@ -107,12 +101,9 @@ def _run(self, to_static):
             ret = ret.numpy()
         return ret
 
-    @test_legacy_and_pt_and_pir
-    def test_tensor_clone(self):
-        paddle.disable_static()
-        with enable_to_static_guard(False):
-            dygraph_res = self._run(to_static=False)
-
+    @test_pir_only
+    def test_tensor_size(self):
+        dygraph_res = self._run(to_static=False)
         static_res = self._run(to_static=True)
         np.testing.assert_allclose(dygraph_res, static_res, rtol=1e-5)
 
@@ -128,9 +119,7 @@ def _run(self):
         y = paddle.to_tensor([4], dtype='int64')
         return paddle.jit.to_static(true_div)(x, y).numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_true_div(self):
-        paddle.disable_static()
         with enable_to_static_guard(False):
             dygraph_res = self._run()
         static_res = self._run()
diff --git a/test/dygraph_to_static/test_tensor_shape.py b/test/dygraph_to_static/test_tensor_shape.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
     test_pir_only,
     test_pt_only,
 )
@@ -290,7 +289,6 @@ def get_dygraph_output(self):
     def get_static_output(self):
         return self._run(to_static=True)
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         static_res = self.get_static_output()
         dygraph_res = self.get_dygraph_output()
@@ -795,7 +793,6 @@ def dyfunc_with_static_convert_var_shape(x):
 
 class TestFindStatiConvertVarShapeSuffixVar(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test(self):
         x_spec = paddle.static.InputSpec(shape=[None, 10])
         func = paddle.jit.to_static(
diff --git a/test/dygraph_to_static/test_to_tensor.py b/test/dygraph_to_static/test_to_tensor.py
@@ -18,7 +18,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -156,15 +155,13 @@ def test_to_tensor_badreturn(self):
         self.assertTrue(a.stop_gradient == b.stop_gradient)
         self.assertTrue(a.place._equals(b.place))
 
-    @test_legacy_and_pt_and_pir
     def test_to_tensor_default_dtype(self):
         a = paddle.jit.to_static(case_to_tensor_default_dtype)()
         b = case_to_tensor_default_dtype()
         self.assertTrue(a.dtype == b.dtype)
         self.assertTrue(a.stop_gradient == b.stop_gradient)
         self.assertTrue(a.place._equals(b.place))
 
-    @test_legacy_and_pt_and_pir
     def test_to_tensor_err_log(self):
         paddle.disable_static()
         x = paddle.to_tensor([3])
@@ -178,7 +175,6 @@ def test_to_tensor_err_log(self):
 
 
 class TestStatic(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_static(self):
         paddle.enable_static()
         main_prog = paddle.static.Program()
@@ -209,7 +205,6 @@ def test_static(self):
 
 
 class TestInt16(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_static(self):
         paddle.enable_static()
         data = np.array([1, 2], dtype="int16")
@@ -221,7 +216,6 @@ def test_static(self):
 
 
 class TestNestedListWithTensor(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_nested_list_with_tensor(self):
         paddle.enable_static()
         x = paddle.to_tensor(1)
diff --git a/test/dygraph_to_static/test_typehint.py b/test/dygraph_to_static/test_typehint.py
@@ -18,7 +18,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -76,7 +75,6 @@ def _run(self, to_static):
         else:
             return ret
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         static_numpy = self._run_static()
         dygraph_numpy = self._run_dygraph()
@@ -91,13 +89,11 @@ def assert_fn_dygraph_and_static_unified(self, dygraph_fn, x):
         dygraph_res = dygraph_fn(x)
         np.testing.assert_allclose(dygraph_res, static_res, rtol=1e-05)
 
-    @test_legacy_and_pt_and_pir
     def test_ann_assign_with_value(self):
         self.assert_fn_dygraph_and_static_unified(
             fn_annotation_assign_with_value, paddle.to_tensor(1)
         )
 
-    @test_legacy_and_pt_and_pir
     def test_ann_assign_without_value(self):
         self.assert_fn_dygraph_and_static_unified(
             fn_annotation_assign_without_value, paddle.to_tensor(1)
diff --git a/test/dygraph_to_static/test_unuseful_inputs.py b/test/dygraph_to_static/test_unuseful_inputs.py
@@ -17,7 +17,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -65,7 +64,6 @@ def forward(self, x):
 
 
 class TestDuplicateOutput(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_case(self):
         # create network
         layer = Layer0(0)
diff --git a/test/dygraph_to_static/test_word2vec.py b/test/dygraph_to_static/test_word2vec.py
diff --git a/test/dygraph_to_static/test_write_python_container.py b/test/dygraph_to_static/test_write_python_container.py
