[Dy2St] Cleanup legacy ir test cases (part3) (#68253)

SigureMo · web-flow · commit 118bfaa2baf9 · 2024-09-17T12:42:59.000+08:00
diff --git a/test/dygraph_to_static/test_len.py b/test/dygraph_to_static/test_len.py
@@ -20,7 +20,6 @@
     static_guard,
     test_ast_only,
     test_legacy_and_pt,
-    test_legacy_and_pt_and_pir,
     test_pir_only,
 )
 
@@ -68,7 +67,6 @@ def _run(self, to_static):
         return out
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_len(self):
         dygraph_res = self._run(to_static=False)
         static_res = self._run(to_static=True)
diff --git a/test/dygraph_to_static/test_list.py b/test/dygraph_to_static/test_list.py
@@ -22,7 +22,6 @@
     ToStaticMode,
     disable_test_case,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -266,7 +265,6 @@ def compare_transformed_static_result(self):
 
 
 class TestListWithoutControlFlow(TestListWithoutControlFlowConfig):
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         self.compare_transformed_static_result()
 
@@ -299,7 +297,6 @@ def train(self, to_static=False):
             return self.result_to_numpy(res)
 
     @disable_test_case((ToStaticMode.AST, IrMode.PT))
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         self.compare_transformed_static_result()
 
@@ -365,7 +362,6 @@ def forward(self, x, index, *args):
 
 
 class TestListWithCondGradInferVarType(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_to_static(self):
         net = ListWithCondNet()
         x = paddle.to_tensor([2, 3, 4], dtype='float32')
@@ -383,7 +379,6 @@ def tensor_array_dtype():
 
 class TestTensorArrayDtype(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_tensor_array_dtype(self):
         fn = tensor_array_dtype
         static_fn = paddle.jit.to_static(fn)
diff --git a/test/dygraph_to_static/test_load_transformer.py b/test/dygraph_to_static/test_load_transformer.py
@@ -18,7 +18,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -48,7 +47,6 @@ class TestFallback(Dy2StTestBase):
     def setUp(self):
         self.x = paddle.to_tensor(1.0).astype('int')
 
-    @test_legacy_and_pt_and_pir
     def test_name_load(self):
         net_dy = Net()
         net_st = Net()
@@ -58,7 +56,6 @@ def test_name_load(self):
 
 
 class TestLoad2(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_name_load_nograd(self):
         @paddle.no_grad()
         def func(x):
@@ -83,7 +80,6 @@ def forward(self, x):
 
 
 class TestLoadInCallKwargs(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_name_load_nograd(self):
         net = LoadInCallKwargsNet()
         x = paddle.rand([10, 10])
diff --git a/test/dygraph_to_static/test_logical.py b/test/dygraph_to_static/test_logical.py
@@ -21,7 +21,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -190,7 +189,6 @@ class TestLogicalNot(TestLogicalBase):
     def _set_test_func(self):
         self.dygraph_func = test_logical_not
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result(self):
         dygraph_res = self._run_dygraph()
         static_res = self._run_static()
@@ -206,7 +204,6 @@ class TestLogicalNot2(TestLogicalBase):
     def _set_test_func(self):
         self.dygraph_func = test_logical_not_2
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result(self):
         dygraph_res = self._run_dygraph()
         static_res = self._run_static()
@@ -256,12 +253,10 @@ def _set_test_func(self):
 
 
 class TestCmpopNodeToStr(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_exception(self):
         with self.assertRaises(KeyError):
             cmpop_node_to_str(gast.Or())
 
-    @test_legacy_and_pt_and_pir
     def test_expected_result(self):
         self.assertEqual(cmpop_node_to_str(gast.Eq()), "==")
         self.assertEqual(cmpop_node_to_str(gast.NotEq()), "!=")
diff --git a/test/dygraph_to_static/test_loop.py b/test/dygraph_to_static/test_loop.py
@@ -19,7 +19,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -241,7 +240,6 @@ def setUp(self):
 
         self.nested_for_loop_func = nested_for_loop_dyfunc
 
-    @test_legacy_and_pt_and_pir
     def test_loop_vars(self):
         for i in range(len(self.loop_funcs)):
             func = self.loop_funcs[i]
@@ -257,7 +255,6 @@ def test_loop_vars(self):
                     self.assertEqual(loop_var_names, self.loop_var_names[i])
                     self.assertEqual(create_var_names, self.create_var_names[i])
 
-    @test_legacy_and_pt_and_pir
     def test_nested_loop_vars(self):
         func = self.nested_for_loop_func
         test_func = inspect.getsource(func)
@@ -322,7 +319,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()
@@ -396,7 +392,6 @@ def _run(self, to_static):
             ret = self.dyfunc(self.len)
         return ret.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         np.testing.assert_allclose(
             self._run_dygraph(), self._run_static(), rtol=1e-05
@@ -453,7 +448,6 @@ def forward(self, x):
 
 
 class TestForLoopMeetDict(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_start(self):
         net = Net()
         model = paddle.jit.to_static(
diff --git a/test/dygraph_to_static/test_lstm.py b/test/dygraph_to_static/test_lstm.py
@@ -21,7 +21,6 @@
     Dy2StTestBase,
     enable_to_static_guard,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -70,7 +69,6 @@ def run_lstm(self, to_static):
             y = net(x)
             return y.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_lstm_to_static(self):
         dygraph_out = self.run_lstm(to_static=False)
         static_out = self.run_lstm(to_static=True)
@@ -120,12 +118,10 @@ def save_in_eval(self, with_training: bool):
         )
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_save_without_training(self):
         self.save_in_eval(with_training=False)
 
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_save_with_training(self):
         self.save_in_eval(with_training=True)
 
@@ -165,7 +161,6 @@ def setUp(self):
     def tearDown(self):
         self.temp_dir.cleanup()
 
-    @test_legacy_and_pt_and_pir
     def test_save_in_eval(self):
         net = paddle.jit.to_static(LinearNet())
         x = paddle.randn((2, 10))
@@ -208,7 +203,6 @@ def setUp(self):
     def tearDown(self):
         self.temp_dir.cleanup()
 
-    @test_legacy_and_pt_and_pir
     def test_eval_after_save(self):
         x = paddle.randn((2, 10, 12)).astype('float32')
         net = Net(12, 2)
diff --git a/test/dygraph_to_static/test_mnist_pure_fp16.py b/test/dygraph_to_static/test_mnist_pure_fp16.py
@@ -16,7 +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
@@ -32,7 +31,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):
         if paddle.base.is_compiled_with_cuda():
             dygraph_loss = self.train_dygraph()
diff --git a/test/dygraph_to_static/test_multi_forward.py b/test/dygraph_to_static/test_multi_forward.py
@@ -16,7 +16,6 @@
 
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -32,7 +31,6 @@ def forward(self, x):
 
 
 class TestBackward(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_order_0(self):
         """
         loss = 1 * w * 1 + 2 * w * 2
@@ -54,7 +52,6 @@ def test_order_0(self):
         loss.backward()
         self.assertEqual(model.linear.weight.grad, 5)
 
-    @test_legacy_and_pt_and_pir
     def test_order_1(self):
         """
         loss = 2 * w * 2  + 1 * w * 1
diff --git a/test/dygraph_to_static/test_name_load_jst_transformer.py b/test/dygraph_to_static/test_name_load_jst_transformer.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -36,7 +35,6 @@ def f(x):
 
 class TestAssertVariable(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_load_name_in_args(self):
         x = paddle.to_tensor([1, 2, 3], dtype='float32')
         dy_out = f(x)
diff --git a/test/dygraph_to_static/test_no_gradient.py b/test/dygraph_to_static/test_no_gradient.py
@@ -15,7 +15,7 @@
 import unittest
 
 import numpy
-from dygraph_to_static_utils import Dy2StTestBase, test_legacy_and_pt_and_pir
+from dygraph_to_static_utils import Dy2StTestBase
 
 import paddle
 
@@ -33,7 +33,6 @@ def main_func(x, index):
 
 
 class TestNoGradientCase(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_no_gradient(self):
         paddle.disable_static()
         x = paddle.randn([10, 3])
diff --git a/test/dygraph_to_static/test_param_guard.py b/test/dygraph_to_static/test_param_guard.py
@@ -19,7 +19,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -81,7 +80,6 @@ def train(self, is_iter, to_static: bool):
 
             return loss
 
-    @test_legacy_and_pt_and_pir
     def test_parameter_list(self):
         static_loss = self.train(False, to_static=True)
         dygraph_loss = self.train(False, to_static=False)
@@ -133,7 +131,6 @@ def train(self, to_static: bool):
 
             return loss
 
-    @test_legacy_and_pt_and_pir
     def test_parameter_list(self):
         static_loss = self.train(to_static=True)
         dygraph_loss = self.train(to_static=False)
diff --git a/test/dygraph_to_static/test_params_no_grad.py b/test/dygraph_to_static/test_params_no_grad.py
@@ -14,7 +14,7 @@
 
 import unittest
 
-from dygraph_to_static_utils import Dy2StTestBase, test_legacy_and_pt_and_pir
+from dygraph_to_static_utils import Dy2StTestBase
 
 import paddle
 import paddle.distributed as dist
@@ -54,7 +54,6 @@ def train():
 
 
 class TestParamsNoGrad(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_two_card(self):
         if (
             paddle.is_compiled_with_cuda()
diff --git a/test/dygraph_to_static/test_partial_program.py b/test/dygraph_to_static/test_partial_program.py
@@ -19,7 +19,6 @@
     Dy2StTestBase,
     test_ast_only,
     test_legacy_and_pt,
-    test_legacy_and_pt_and_pir,
     test_pir_only,
 )
 from test_fetch_feed import Linear
@@ -88,7 +87,6 @@ def _run(self, to_static):
 
         return out.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_nest(self):
         dygraph_res = self._run(to_static=False)
         static_res = self._run(to_static=True)
@@ -114,7 +112,6 @@ def _run(self, to_static):
 
         return out
 
-    @test_legacy_and_pt_and_pir
     def test_nest(self):
         dygraph_res = self._run(to_static=False)
         dygraph_res = paddle.utils.flatten(dygraph_res)
@@ -248,7 +245,6 @@ def forward(self, x):
 
 
 class TestPruneUnusedParamInProgram(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_prune(self):
         input_ids = np.array([[15, 11, 6, 3, 18, 13]]).astype("float32")
 
diff --git a/test/dygraph_to_static/test_pir_selectedrows.py b/test/dygraph_to_static/test_pir_selectedrows.py
@@ -17,7 +17,6 @@
 
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -74,7 +73,6 @@ def forward_static():
 
 
 class TestSimnet(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_dygraph_static_same_loss(self):
         dygraph_value = forward_dygraph()
         static_value = forward_static()
diff --git a/test/dygraph_to_static/test_print.py b/test/dygraph_to_static/test_print.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -101,7 +100,6 @@ class TestPrintVariable(TestPrintBase):
     def set_test_func(self):
         self.dygraph_func = dyfunc_print_variable
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_static_result(self):
         self.get_dygraph_output()
         self.get_static_output()
diff --git a/test/dygraph_to_static/test_program_translator.py b/test/dygraph_to_static/test_program_translator.py
diff --git a/test/dygraph_to_static/test_ptb_lm.py b/test/dygraph_to_static/test_ptb_lm.py
diff --git a/test/dygraph_to_static/test_reinforcement_learning.py b/test/dygraph_to_static/test_reinforcement_learning.py
diff --git a/test/dygraph_to_static/test_return.py b/test/dygraph_to_static/test_return.py
