[Dy2St] Cleanup legacy ir test cases (part2) (#68252)

SigureMo · web-flow · commit 37956639b925 · 2024-09-17T12:42:40.000+08:00
diff --git a/test/dygraph_to_static/test_decorator_transform.py b/test/dygraph_to_static/test_decorator_transform.py
@@ -22,7 +22,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
     test_pt_only,
 )
 
@@ -186,7 +185,6 @@ def deco_with_paddle_api():
 
 
 class TestDecoratorTransform(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_deco_transform(self):
         outs = paddle.jit.to_static(forward)()
         np.testing.assert_allclose(outs[0], np.array(3), rtol=1e-05)
@@ -216,7 +214,6 @@ def test_contextmanager_warning(self):
                     break
             self.assertTrue(flag)
 
-    @test_legacy_and_pt_and_pir
     def test_deco_with_paddle_api(self):
         self.assertTrue(paddle.jit.to_static(deco_with_paddle_api)())
 
diff --git a/test/dygraph_to_static/test_deepcopy.py b/test/dygraph_to_static/test_deepcopy.py
@@ -16,15 +16,14 @@
 from copy import deepcopy
 
 import numpy as np
-from dygraph_to_static_utils import Dy2StTestBase, test_legacy_and_pt_and_pir
+from dygraph_to_static_utils import Dy2StTestBase
 from test_rollback import Net, foo
 
 import paddle
 from paddle.jit.dy2static.program_translator import StaticFunction
 
 
 class TestDeepCopy(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_net(self):
         net = Net()
         net = paddle.jit.to_static(net)
@@ -40,7 +39,6 @@ def test_net(self):
         self.assertTrue(id(copy_net), id(copy_net.forward.__self__))
         np.testing.assert_array_equal(src_out.numpy(), copy_out.numpy())
 
-    @test_legacy_and_pt_and_pir
     def test_func(self):
         st_foo = paddle.jit.to_static(foo)
         x = paddle.randn([3, 4])
diff --git a/test/dygraph_to_static/test_dict.py b/test/dygraph_to_static/test_dict.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -139,7 +138,6 @@ def train(self):
             ret = net(self.x)
             return ret.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         self.assertTrue((self._run_dygraph() == self._run_static()).all())
 
@@ -191,7 +189,6 @@ def _run(self, to_static):
             result = self.dygraph_func(self.input)
             return result.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result(self):
         dygraph_res = self._run_dygraph()
         static_res = self._run_static()
@@ -233,7 +230,6 @@ def train(self):
             ret = net(z=0, x=self.x, y=True)
             return ret.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         dygraph_result = self._run_dygraph()
         static_result = self._run_static()
@@ -245,7 +241,6 @@ def test_ast_to_func(self):
 
 
 class TestDictCmpInFor(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_with_for(self):
         def func():
             pos = [1, 3]
@@ -262,7 +257,6 @@ def func():
 
         self.assertEqual(paddle.jit.to_static(func)()['minus'], 8)
 
-    @test_legacy_and_pt_and_pir
     def test_with_for_enumerate(self):
         def func():
             pos = [1, 3]
diff --git a/test/dygraph_to_static/test_drop_path.py b/test/dygraph_to_static/test_drop_path.py
@@ -17,7 +17,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -39,7 +38,6 @@ def forward(self, x):
 
 
 class TestTrainEval(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_train_and_eval(self):
         model = paddle.jit.to_static(DropPath())
         x = paddle.to_tensor([1, 2, 3]).astype("int64")
diff --git a/test/dygraph_to_static/test_duplicate_output.py b/test/dygraph_to_static/test_duplicate_output.py
@@ -17,7 +17,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -59,7 +58,6 @@ def _run_static(self):
 
         self.assertEqual(param[0].grad.numpy(), 1.0)
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         self._run_static()
 
@@ -71,7 +69,6 @@ def check_dygraph_and_static_result(self, net, x):
         st_out = static_net(x)
         np.testing.assert_allclose(dy_out, st_out)
 
-    @test_legacy_and_pt_and_pir
     def test_ast_to_func(self):
         net = DuplicateOutputInPaddleLayer()
         x = paddle.randn([10, 10])
diff --git a/test/dygraph_to_static/test_fetch_feed.py b/test/dygraph_to_static/test_fetch_feed.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -84,7 +83,6 @@ def train_dygraph(self):
         with enable_to_static_guard(False):
             return self.train()
 
-    @test_legacy_and_pt_and_pir
     def test_to_static(self):
         dygraph_res = self.train_dygraph()
         static_res = self.train_static()
diff --git a/test/dygraph_to_static/test_for_enumerate.py b/test/dygraph_to_static/test_for_enumerate.py
@@ -21,7 +21,6 @@
     Dy2StTestBase,
     enable_to_static_guard,
     test_legacy_and_pir,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -397,7 +396,6 @@ def set_test_func(self):
 
 
 class TestForInRange(TestForInRangeConfig):
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -407,7 +405,6 @@ class TestForIterList(TestTransform):
     def set_test_func(self):
         self.dygraph_func = for_iter_list
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -430,7 +427,6 @@ def set_input(self):
     def set_test_func(self):
         self.dygraph_func = for_iter_var_numpy
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -490,7 +486,6 @@ class TestForIterVarList(TestForInRangeConfig):
     def set_test_func(self):
         self.dygraph_func = for_iter_var_list
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -500,7 +495,6 @@ class TestForEnumerateVarList(TestForInRangeConfig):
     def set_test_func(self):
         self.dygraph_func = for_enumerate_var_list
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -530,7 +524,6 @@ class TestForOriginalList(TestTransformForOriginalList):
     def set_test_func(self):
         self.dygraph_func = for_original_list
 
-    @test_legacy_and_pt_and_pir
     def test_transformed_result_compare(self):
         self.set_test_func()
         self.transformed_result_compare()
@@ -553,7 +546,6 @@ def setUp(self):
     def tearDown(self):
         self.temp_dir.cleanup()
 
-    @test_legacy_and_pt_and_pir
     def test_for_zip_error(self):
         with self.assertRaises(RuntimeError):
             model_path = os.path.join(self.temp_dir.name, 'for_zip_error')
diff --git a/test/dygraph_to_static/test_full_name_usage.py b/test/dygraph_to_static/test_full_name_usage.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -62,7 +61,6 @@ def double_decorated_func2(self, x):
 
 class TestFullNameDecorator(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_run_success(self):
         x = np.ones([1, 2]).astype("float32")
         answer = np.zeros([1, 2]).astype("float32")
diff --git a/test/dygraph_to_static/test_grad.py b/test/dygraph_to_static/test_grad.py
@@ -19,7 +19,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
     test_pir_only,
 )
 
@@ -75,7 +74,6 @@ def setUp(self):
         self.x = paddle.ones(shape=[10, 2, 5], dtype='float32')
         self.x.stop_gradient = False
 
-    @test_legacy_and_pt_and_pir
     def test_forward(self):
         dygraph_res = self.func(self.x).numpy()
         static_res = paddle.jit.to_static(self.func)(self.x).numpy()
@@ -99,7 +97,6 @@ def setUp(self):
     def tearDown(self):
         self.temp_dir.cleanup()
 
-    @test_legacy_and_pt_and_pir
     def test_save_infer_program(self):
         static_fn = paddle.jit.to_static(self.func)
         input_spec = [
@@ -112,7 +109,6 @@ def test_save_infer_program(self):
         load_res = load_func(self.x).numpy()
         np.testing.assert_allclose(origin_res, load_res, rtol=1e-05)
 
-    @test_legacy_and_pt_and_pir
     def test_save_train_program(self):
         static_fn = paddle.jit.to_static(self.func)
         grad_clip = paddle.nn.ClipGradByGlobalNorm(2.0)
diff --git a/test/dygraph_to_static/test_gradient_aggregation.py b/test/dygraph_to_static/test_gradient_aggregation.py
@@ -17,7 +17,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -41,7 +40,6 @@ def forward(self, x):
 
 
 class TestGradientAggregationInDy2Static(Dy2StTestBase):
-    @test_legacy_and_pt_and_pir
     def test_to_static(self):
         def simplenet_grad(inp, to_static=False):
             net = SimpleNet()
diff --git a/test/dygraph_to_static/test_gradname_parse.py b/test/dygraph_to_static/test_gradname_parse.py
@@ -18,7 +18,6 @@
 import numpy as np
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -85,7 +84,6 @@ def setUp(self):
         self.dy2st_input = (x2,)
         self.dy2st_grad_input = (x2,)
 
-    @test_legacy_and_pt_and_pir
     def test_run(self):
         try:
             dy_out = self.func(*self.dy_input)
diff --git a/test/dygraph_to_static/test_grid_generator.py b/test/dygraph_to_static/test_grid_generator.py
@@ -18,7 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -147,7 +146,6 @@ def _run(self, to_static):
             ret = net(self.x, [32, 100])
         return ret.numpy()
 
-    @test_legacy_and_pt_and_pir
     def test_to_static(self):
         st_out = self._run(to_static=True)
         dy_out = self._run(to_static=False)
diff --git a/test/dygraph_to_static/test_ifelse.py b/test/dygraph_to_static/test_ifelse.py
diff --git a/test/dygraph_to_static/test_isinstance.py b/test/dygraph_to_static/test_isinstance.py
diff --git a/test/dygraph_to_static/test_jit_property_save.py b/test/dygraph_to_static/test_jit_property_save.py
diff --git a/test/dygraph_to_static/test_jit_setitem.py b/test/dygraph_to_static/test_jit_setitem.py
diff --git a/test/dygraph_to_static/test_lambda.py b/test/dygraph_to_static/test_lambda.py
diff --git a/test/dygraph_to_static/test_layer_hook.py b/test/dygraph_to_static/test_layer_hook.py
