make some auto_parallel uts deprecated (#68012)

ooooo-create · web-flow · commit c2ace687151c · 2024-09-05T20:19:34.000+08:00
* deprecate some auto_parallel uts

* empty commit
diff --git a/test/auto_parallel/CMakeLists.txt b/test/auto_parallel/CMakeLists.txt
@@ -214,26 +214,15 @@ if(WITH_DISTRIBUTE AND WITH_GPU)
   # End of unittests WITH multi cards and WITHOUT timeout
 
   # NOTE(zyl): unittests WITH single card and timeout
-  py_test_modules(test_parallel_tuner MODULES test_parallel_tuner)
-  set_tests_properties(test_parallel_tuner PROPERTIES TIMEOUT 120)
-  py_test_modules(test_parallel_tuner_full MODULES test_parallel_tuner_full)
-  set_tests_properties(test_parallel_tuner_full PROPERTIES TIMEOUT 120)
-  py_test_modules(test_parallel_tuner_predict MODULES
-                  test_parallel_tuner_predict)
-  set_tests_properties(test_parallel_tuner_predict PROPERTIES TIMEOUT 120)
   py_test_modules(test_tuning_recompute MODULES test_tuning_recompute)
   set_tests_properties(test_tuning_recompute PROPERTIES TIMEOUT 300)
   py_test_modules(test_tuning_recompute_with_amp MODULES
                   test_tuning_recompute_with_amp)
   set_tests_properties(test_tuning_recompute_with_amp PROPERTIES TIMEOUT 60)
-  py_test_modules(test_fused_linear_pass MODULES test_fused_linear_pass)
-  set_tests_properties(test_fused_linear_pass PROPERTIES TIMEOUT 40)
   py_test_modules(test_align_tool MODULES test_align_tool)
   set_tests_properties(test_align_tool PROPERTIES TIMEOUT 20)
   py_test_modules(test_pass_base_list MODULES test_pass_base_list)
   set_tests_properties(test_pass_base_list PROPERTIES TIMEOUT 40)
-  py_test_modules(test_fuse_adamw_pass MODULES test_fuse_adamw_pass)
-  set_tests_properties(test_fuse_adamw_pass PROPERTIES TIMEOUT 20)
   py_test_modules(test_rule_based_tuner_o2 MODULES test_rule_based_tuner_o2)
   set_tests_properties(test_rule_based_tuner_o2 PROPERTIES TIMEOUT 50)
   py_test_modules(test_semi_auto_parallel_functional_in_single_card MODULES
@@ -246,7 +235,6 @@ if(WITH_DISTRIBUTE AND WITH_GPU)
   py_test_modules(test_tunable_space MODULES test_tunable_space)
   py_test_modules(test_recorder MODULES test_recorder)
   py_test_modules(test_trial MODULES test_trial)
-  py_test_modules(test_new_cost_model MODULES test_new_cost_model)
   py_test_modules(test_dist_reshape MODULES test_dist_reshape)
   py_test_modules(test_dist_pnorm MODULES test_dist_pnorm)
   py_test_modules(test_dist_embedding MODULES test_dist_embedding)
@@ -262,19 +250,13 @@ if(WITH_DISTRIBUTE AND WITH_GPU)
   py_test_modules(test_cluster_v2 MODULES test_cluster_v2)
   py_test_modules(test_process_mesh_v2 MODULES test_process_mesh_v2)
   py_test_modules(test_dist_attr_v2 MODULES test_dist_attr_v2)
-  py_test_modules(test_serialization MODULES test_serialization)
-  py_test_modules(test_lr_grad_clip MODULES test_lr_grad_clip)
   py_test_modules(test_dist_matmul MODULES test_dist_matmul)
-  py_test_modules(test_process_mesh MODULES test_process_mesh)
-  py_test_modules(test_interface MODULES test_interface)
   py_test_modules(test_strategy MODULES test_strategy)
   py_test_modules(test_dist_shape MODULES test_dist_shape)
   py_test_modules(test_dist_assign MODULES test_dist_assign)
   py_test_modules(test_conditional_block_reshard MODULES
                   test_conditional_block_reshard)
   py_test_modules(test_engine_api_error MODULES test_engine_api_error)
-  py_test_modules(test_fp16_assign MODULES test_fp16_assign)
-  py_test_modules(test_group_operators MODULES test_group_operators)
   py_test_modules(test_cluster_partition MODULES test_cluster_partition)
   py_test_modules(test_convert_to_process_meshes MODULES
                   test_convert_to_process_meshes)
diff --git a/test/deprecated/auto_parallel/CMakeLists.txt b/test/deprecated/auto_parallel/CMakeLists.txt
@@ -28,6 +28,23 @@ if(WITH_DISTRIBUTE AND WITH_GPU)
                   test_selective_recompute_deprecated)
   set_tests_properties(test_selective_recompute_deprecated PROPERTIES TIMEOUT
                                                                       50)
+  py_test_modules(test_parallel_tuner_deprecated MODULES
+                  test_parallel_tuner_deprecated)
+  set_tests_properties(test_parallel_tuner_deprecated PROPERTIES TIMEOUT 120)
+  py_test_modules(test_parallel_tuner_full_deprecated MODULES
+                  test_parallel_tuner_full_deprecated)
+  set_tests_properties(test_parallel_tuner_full_deprecated PROPERTIES TIMEOUT
+                                                                      120)
+  py_test_modules(test_parallel_tuner_predict_deprecated MODULES
+                  test_parallel_tuner_predict_deprecated)
+  set_tests_properties(test_parallel_tuner_predict_deprecated PROPERTIES TIMEOUT
+                                                                         120)
+  py_test_modules(test_fused_linear_pass_deprecated MODULES
+                  test_fused_linear_pass_deprecated)
+  set_tests_properties(test_fused_linear_pass_deprecated PROPERTIES TIMEOUT 40)
+  py_test_modules(test_fuse_adamw_pass_deprecated MODULES
+                  test_fuse_adamw_pass_deprecated)
+  set_tests_properties(test_fuse_adamw_pass_deprecated PROPERTIES TIMEOUT 20)
   py_test_modules(test_while_op_completion_deprecated MODULES
                   test_while_op_completion_deprecated)
   py_test_modules(test_while_op_partition_deprecated MODULES
@@ -41,6 +58,21 @@ if(WITH_DISTRIBUTE AND WITH_GPU)
                   test_shard_layer_api_deprecated)
   # End of unittests WITH single card WITHOUT timeout
 
+  # NOTE(zyl): unittests WITH single card and WITHOUT timeout
+  py_test_modules(test_serialization_deprecated MODULES
+                  test_serialization_deprecated)
+  py_test_modules(test_process_mesh_deprecated MODULES
+                  test_process_mesh_deprecated)
+  py_test_modules(test_new_cost_model_deprecated MODULES
+                  test_new_cost_model_deprecated)
+  py_test_modules(test_lr_grad_clip_deprecated MODULES
+                  test_lr_grad_clip_deprecated)
+  py_test_modules(test_interface_deprecated MODULES test_interface_deprecated)
+  py_test_modules(test_group_operators_deprecated MODULES
+                  test_group_operators_deprecated)
+  py_test_modules(test_fp16_assign_deprecated MODULES
+                  test_fp16_assign_deprecated)
+
 endif()
 
 set_pir_tests_properties()
diff --git a/test/deprecated/auto_parallel/test_fp16_assign_deprecated.py b/test/deprecated/auto_parallel/test_fp16_assign_deprecated.py
diff --git a/test/deprecated/auto_parallel/test_fuse_adamw_pass_deprecated.py b/test/deprecated/auto_parallel/test_fuse_adamw_pass_deprecated.py
diff --git a/test/deprecated/auto_parallel/test_fused_linear_pass_deprecated.py b/test/deprecated/auto_parallel/test_fused_linear_pass_deprecated.py
@@ -13,9 +13,13 @@
 # limitations under the License.
 
 import random
+import sys
 import unittest
 
 import numpy as np
+
+sys.path.append("../../auto_parallel")
+sys.path.append("../../legacy_test")
 from get_gpt_model import FakeDataset, generate_model
 from test_sparse_addmm_op import get_cuda_version
 
diff --git a/test/deprecated/auto_parallel/test_group_operators_deprecated.py b/test/deprecated/auto_parallel/test_group_operators_deprecated.py
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 
+import sys
 import unittest
 
+sys.path.append("../../legacy_test")
 import auto_parallel_gpt_model as modeling
 import numpy as np
 from auto_parallel_gpt_model import (
diff --git a/test/deprecated/auto_parallel/test_interface_deprecated.py b/test/deprecated/auto_parallel/test_interface_deprecated.py
diff --git a/test/deprecated/auto_parallel/test_lr_grad_clip_deprecated.py b/test/deprecated/auto_parallel/test_lr_grad_clip_deprecated.py
@@ -12,8 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 import unittest
 
+sys.path.append("../../auto_parallel")
+
 from test_to_static import MLPLayer, MyDataset
 
 import paddle
diff --git a/test/deprecated/auto_parallel/test_new_cost_model_deprecated.py b/test/deprecated/auto_parallel/test_new_cost_model_deprecated.py
@@ -14,9 +14,11 @@
 
 import json
 import os
+import sys
 import tempfile
 import unittest
 
+sys.path.append("../../auto_parallel")
 from test_cluster import cluster_json
 
 import paddle
diff --git a/test/deprecated/auto_parallel/test_parallel_tuner_deprecated.py b/test/deprecated/auto_parallel/test_parallel_tuner_deprecated.py
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 
+import sys
 import unittest
 
+sys.path.append("../../legacy_test")
 import auto_parallel_gpt_model as modeling
 from auto_parallel_gpt_model import (
     GPTForPretraining,
diff --git a/test/deprecated/auto_parallel/test_parallel_tuner_full_deprecated.py b/test/deprecated/auto_parallel/test_parallel_tuner_full_deprecated.py
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 
+import sys
 import unittest
 
+sys.path.append("../../legacy_test")
 import auto_parallel_gpt_model as modeling
 from auto_parallel_gpt_model import (
     GPTForPretraining,
diff --git a/test/deprecated/auto_parallel/test_parallel_tuner_predict_deprecated.py b/test/deprecated/auto_parallel/test_parallel_tuner_predict_deprecated.py
@@ -13,8 +13,11 @@
 # limitations under the License.
 
 
+import sys
 import unittest
 
+sys.path.append("../../legacy_test")
+
 import auto_parallel_gpt_model as modeling
 from auto_parallel_gpt_model import (
     GPTForPretraining,
diff --git a/test/deprecated/auto_parallel/test_process_mesh_deprecated.py b/test/deprecated/auto_parallel/test_process_mesh_deprecated.py
diff --git a/test/deprecated/auto_parallel/test_serialization_deprecated.py b/test/deprecated/auto_parallel/test_serialization_deprecated.py
diff --git a/tools/gpups_test.sh b/tools/gpups_test.sh
@@ -103,7 +103,7 @@ parallel_list="^init_phi_test$|\
 ^test_fused_gemm_epilogue_op_with_es$|\
 ^test_fused_layernorm_residual_dropout_bias$|\
 ^test_fused_linear_param_grad_add$|\
-^test_fused_linear_pass$|\
+^test_fused_linear_pass_deprecated$|\
 ^test_fused_matmul_bias$|\
 ^test_fused_multi_transformer_decoder_pass$|\
 ^test_fused_multi_transformer_encoder_pass$|\
