[Dy2St] Reopen AST+legacy IR uts (#72207)

Author: SigureMo

test/dygraph_to_static/dygraph_to_static_utils.py

@@ -118,7 +118,8 @@ def lower_case_name(self):
 DEFAULT_IR_MODE = IrMode.PT | IrMode.PIR
 DEFAULT_BACKEND_MODE = BackendMode.PHI | BackendMode.CINN
 VALID_MODES = [
-    # For `.pd_model` export, we still need test AST+PT
+    # For `.pd_model` export, we still need test AST+PT / AST+LEGACY_IR
+    (ToStaticMode.AST, IrMode.LEGACY_IR, BackendMode.PHI),
     (ToStaticMode.AST, IrMode.PT, BackendMode.PHI),
     (ToStaticMode.AST, IrMode.PIR, BackendMode.PHI),
     (ToStaticMode.SOT, IrMode.PIR, BackendMode.PHI),

test/dygraph_to_static/test_ast_util.py

@@ -21,7 +21,7 @@
     Dy2StTestBase,
     static_guard,
     test_ast_only,
-    test_legacy_and_pir,
+    test_pir_only,
 )
 from ifelse_simple_func import (
     dyfunc_with_if_else,
@@ -49,7 +49,7 @@ def _ast2func(self, func):
         return transformed_func
 
     @test_ast_only
-    @test_legacy_and_pir
+    @test_pir_only
     def test_ast2func(self):
         def func(x, y):
             return x + y
@@ -58,7 +58,7 @@ def func(x, y):
         self.assertEqual(func(x, y), self._ast2func(func)(x, y))
 
     @test_ast_only
-    @test_legacy_and_pir
+    @test_pir_only
     def test_ast2func_dygraph(self):
         funcs = [dyfunc_with_if_else, dyfunc_with_if_else2, nested_if_else]
         x_data = np.random.random([10, 16]).astype('float32')
@@ -69,7 +69,7 @@ def test_ast2func_dygraph(self):
             self.assertTrue((true_ret == test_ret).all())
 
     @test_ast_only
-    @test_legacy_and_pir
+    @test_pir_only
     def test_ast2func_static(self):
         def func(x):
             y = F.relu(x)
@@ -88,7 +88,7 @@ def func(x):
                 self.assertTrue((ret[0] == ret[1]).all())
 
     @test_ast_only
-    @test_legacy_and_pir
+    @test_pir_only
     def test_ast2func_error(self):
         with self.assertRaises(Exception) as e:
             self.assertRaises(TypeError, ast_to_func("x = a + b", 'foo'))

test/dygraph_to_static/test_dygraph_to_static_utils.py

@@ -13,8 +13,12 @@
 # limitations under the License.
 
 import unittest
+from itertools import product
 
 from dygraph_to_static_utils import (
+    DEFAULT_BACKEND_MODE,
+    DEFAULT_IR_MODE,
+    DEFAULT_TO_STATIC_MODE,
     VALID_MODES,
     BackendMode,
     Dy2StTestBase,
@@ -28,6 +32,18 @@
     set_to_static_mode,
 )
 
+ALL_MODES = list(product(ToStaticMode, IrMode, BackendMode))
+DEFAULT_MODES = [
+    (to_static_mode, ir_mode, backend_mode)
+    for (to_static_mode, ir_mode, backend_mode) in ALL_MODES
+    if (
+        (to_static_mode, ir_mode, backend_mode) in VALID_MODES
+        and to_static_mode & DEFAULT_TO_STATIC_MODE
+        and ir_mode & DEFAULT_IR_MODE
+        and backend_mode & DEFAULT_BACKEND_MODE
+    )
+]
+
 
 class CheckTestCaseExistsMixin:
     def assert_hasattr(self, obj: object, attr: str):
@@ -89,14 +105,14 @@ def test_check_test_case_basic(self):
         test_case = TestCaseBasic()
         case_name = "test_basic"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             self.check_test_case_exists(test_case, case_name, mode_tuple)
 
     def test_check_test_case_disable_test_case(self):
         test_case = TestCaseDisableTestCase()
         case_name = "test_disable_one"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             if mode_tuple == (ToStaticMode.SOT, IrMode.PIR, BackendMode.CINN):
                 self.check_test_case_not_exists(
                     test_case, case_name, mode_tuple
@@ -106,7 +122,7 @@ def test_check_test_case_disable_test_case(self):
 
         case_name = "test_disable_multiple"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             if mode_tuple in [
                 (ToStaticMode.SOT, IrMode.PIR, BackendMode.CINN),
                 (ToStaticMode.SOT, IrMode.PIR, BackendMode.PHI),
@@ -120,7 +136,7 @@ def test_check_test_case_disable_test_case(self):
 
         case_name = "test_disable_multiple_with_or"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             if mode_tuple in [
                 (ToStaticMode.SOT, IrMode.PIR, BackendMode.CINN),
                 (ToStaticMode.SOT, IrMode.PIR, BackendMode.PHI),
@@ -135,7 +151,7 @@ def test_check_test_case_set_mode(self):
         test_case = TestCaseSetMode()
         case_name = "test_set_to_static_mode"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             to_static_mode, _, _ = mode_tuple
             if to_static_mode == ToStaticMode.SOT:
                 self.check_test_case_exists(test_case, case_name, mode_tuple)
@@ -146,7 +162,7 @@ def test_check_test_case_set_mode(self):
 
         case_name = "test_set_ir_mode"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             _, ir_mode, _ = mode_tuple
             if ir_mode == IrMode.PIR:
                 self.check_test_case_exists(test_case, case_name, mode_tuple)
@@ -157,7 +173,7 @@ def test_check_test_case_set_mode(self):
 
         case_name = "test_set_backend_mode"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             _, _, backend_mode = mode_tuple
             if backend_mode == BackendMode.CINN:
                 self.check_test_case_exists(test_case, case_name, mode_tuple)
@@ -168,7 +184,7 @@ def test_check_test_case_set_mode(self):
 
         case_name = "test_set_all"
         self.assert_not_hasattr(test_case, case_name)
-        for mode_tuple in VALID_MODES:
+        for mode_tuple in DEFAULT_MODES:
             if mode_tuple == (ToStaticMode.SOT, IrMode.PIR, BackendMode.CINN):
                 self.check_test_case_exists(test_case, case_name, mode_tuple)
             else:

test/dygraph_to_static/test_ifelse.py

@@ -23,7 +23,6 @@
     disable_test_case,
     enable_to_static_guard,
     test_ast_only,
-    test_legacy_and_pir,
     test_phi_only,
     test_pir_only,
 )
@@ -553,7 +552,7 @@ def forward(self, a, b, c):
 
 
 class TestDy2StIfElseBackward(Dy2StTestBase):
-    @test_legacy_and_pir
+    @test_pir_only
     def test_run_backward(self):
         a = paddle.randn((4, 3), dtype='float32')
         a.stop_gradient = False

test/dygraph_to_static/test_incubate_jit_inference.py

@@ -18,8 +18,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt,
-    test_legacy_and_pt_and_pir,
 )
 
 import paddle
@@ -63,7 +61,6 @@ def forward(self, x_list, bool_value):
 
 class TestToStaticInfenrenceModel(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_dygraph_static_same_result(self):
         hidd = 1024
         batch = 4096
@@ -78,7 +75,6 @@ def test_dygraph_static_same_result(self):
 
 class TestToStaticInfenrenceTensorRTModel(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt
     def test_dygraph_static_same_result(self):
         if paddle_infer.get_trt_compile_version()[0] == 0:
             return
@@ -95,7 +91,6 @@ def test_dygraph_static_same_result(self):
 
 class TestToStaticInfenrenceFunc(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt_and_pir
     def test_dygraph_static_same_result(self):
         hidd = 1024
         batch = 4096
@@ -118,7 +113,6 @@ def test_dygraph_static_same_result(self):
 
 class TestToStaticInputListModel(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt
     def test_dygraph_static_same_result(self):
         hidd = 1024
         batch = 4096

test/dygraph_to_static/test_len.py

@@ -19,8 +19,8 @@
     Dy2StTestBase,
     static_guard,
     test_ast_only,
-    test_legacy_and_pt,
     test_pir_only,
+    test_pt_only,
 )
 
 import paddle
@@ -165,7 +165,7 @@ def setUp(self):
         )
 
     @test_ast_only
-    @test_legacy_and_pt
+    @test_pt_only
     def test_len_legacy(self):
         with static_guard():
             (

test/dygraph_to_static/test_partial_program.py

@@ -18,8 +18,8 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     test_ast_only,
-    test_legacy_and_pt,
     test_pir_only,
+    test_pt_only,
 )
 from test_fetch_feed import Linear
 
@@ -132,7 +132,7 @@ def test_nest(self):
 
 class TestWithTrainAndEval(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt
+    @test_pt_only
     def test_legacy_ir_switch_eval_and_train(self):
         # TODO(cleanup-legacy-ir): Remove this test case
         linear_net = Linear()
@@ -196,7 +196,7 @@ def test_switch_eval_and_train(self):
 
 class TestWithNoGrad(Dy2StTestBase):
     @test_ast_only
-    @test_legacy_and_pt
+    @test_pt_only
     def test_legacy_ir_with_no_grad(self):
         # TODO(cleanup-legacy-ir): Remove this test case
         linear_net = Linear()

test/dygraph_to_static/test_place.py

@@ -17,15 +17,15 @@
 
 from dygraph_to_static_utils import (
     Dy2StTestBase,
-    test_legacy_and_pt,
     test_pir_only,
+    test_pt_only,
 )
 
 import paddle
 
 
 class TestPlace(Dy2StTestBase):
-    @test_legacy_and_pt
+    @test_pt_only
     def test_place_legacy(self):
         # TODO(cleanup-legacy-ir): remove this test case
         paddle.enable_static()

test/dygraph_to_static/test_typing.py

@@ -18,7 +18,7 @@
 import unittest
 
 import numpy as np
-from dygraph_to_static_utils import Dy2StTestBase, test_legacy_and_pir
+from dygraph_to_static_utils import Dy2StTestBase, test_pir_only
 
 import paddle
 
@@ -94,7 +94,7 @@ def run_dy(self):
         out, _ = self.net(self.x)
         return out
 
-    @test_legacy_and_pir
+    @test_pir_only
     def test_type(self):
         self.net = self.build_net()
         out = self.run_dy()

test/dygraph_to_static/test_utils.py

@@ -15,14 +15,14 @@
 import types
 import unittest
 
-from dygraph_to_static_utils import Dy2StTestBase, test_legacy_and_pir
+from dygraph_to_static_utils import Dy2StTestBase, test_pir_only
 
 from paddle.jit.dy2static.transformers.utils import index_in_list
 from paddle.jit.dy2static.utils import is_paddle_func
 
 
 class TestIndexInList(Dy2StTestBase):
-    @test_legacy_and_pir
+    @test_pir_only
     def test_index_in_list(self):
         list_to_test = [1, 2, 3, 4, 5]
         self.assertEqual(index_in_list(list_to_test, 4), 3)
@@ -57,7 +57,7 @@ class TestIsPaddle(Dy2StTestBase):
     def fake_module(self):
         return types.ModuleType('paddlenlp')
 
-    @test_legacy_and_pir
+    @test_pir_only
     def test_func(self):
         m = self.fake_module()
         self.assertFalse(is_paddle_func(m))