[auto parallel] make some auto_parallel uts deprecated (#67995)

ooooo-create · web-flow · commit 706fb46da041 · 2024-09-05T14:09:46.000+08:00
* deprecate some auto_parallel uts

* empty commit
diff --git a/test/collective/fleet/CMakeLists.txt b/test/collective/fleet/CMakeLists.txt
@@ -561,20 +561,6 @@ if(LOCAL_ALL_ARCH AND (LINUX OR APPLE))
     test_distributed_strategy MODULES test_distributed_strategy ENVS
     "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
 endif()
-if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT)
-  bash_test_modules(
-    test_auto_parallel_parallelizer
-    START_BASH
-    ../../legacy_test/dist_test.sh
-    TIMEOUT
-    "120"
-    LABELS
-    "RUN_TYPE=DIST"
-    ENVS
-    "PADDLE_DIST_UT_PORT=21264;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python"
-  )
-  set_tests_properties(test_auto_parallel_parallelizer PROPERTIES TIMEOUT "120")
-endif()
 if((WITH_GPU OR WITH_XPU) AND LOCAL_ALL_PLAT)
   bash_test_modules(
     test_new_group
diff --git a/test/collective/fleet/testslist.csv b/test/collective/fleet/testslist.csv
@@ -46,7 +46,6 @@ test_parallel_dygraph_sparse_embedding,,ROCM,200,DIST,../../legacy_test/dist_tes
 test_parallel_dygraph_sparse_embedding_over_height,,GPU,150,DIST,../../legacy_test/dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212
 test_parallel_dygraph_sparse_embedding_over_height,,ROCM,350,DIST,../../legacy_test/dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_distributed_strategy,LINUX;APPLE,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
-test_auto_parallel_parallelizer,,,120,DIST,../../legacy_test/dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_new_group,,GPU;XPU,,DIST,test_new_group.sh,2,,http_proxy=;https_proxy=,
 test_c_comm_init_op,LINUX,GPU;XPU,120,DIST,test_c_comm_init_op.sh,2,,http_proxy=;https_proxy=;FLAGS_enable_pir_api=0,
 test_ir_pass_pipeline,,,240,DIST,../../legacy_test/dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
diff --git a/test/deprecated/collective/fleet/CMakeLists.txt b/test/deprecated/collective/fleet/CMakeLists.txt
@@ -54,3 +54,19 @@ if((WITH_GPU) AND (LINUX))
   set_tests_properties(test_dygraph_save_for_auto_infer_deprecated
                        PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST")
 endif()
+
+if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT)
+  bash_test_modules(
+    test_auto_parallel_parallelizer_deprecated
+    START_BASH
+    ../../legacy_test/dist_test.sh
+    TIMEOUT
+    "120"
+    LABELS
+    "RUN_TYPE=DIST"
+    ENVS
+    "PADDLE_DIST_UT_PORT=21264;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python"
+  )
+  set_tests_properties(test_auto_parallel_parallelizer_deprecated
+                       PROPERTIES TIMEOUT "120")
+endif()
diff --git a/test/deprecated/collective/fleet/auto_parallel_parallelizer_deprecated.py b/test/deprecated/collective/fleet/auto_parallel_parallelizer_deprecated.py
diff --git a/test/deprecated/collective/fleet/test_auto_parallel_parallelizer_deprecated.py b/test/deprecated/collective/fleet/test_auto_parallel_parallelizer_deprecated.py
@@ -12,17 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 import unittest
 
-from legacy_test.test_parallel_dygraph_dataparallel import (
+sys.path.append("../../../legacy_test")
+from test_parallel_dygraph_dataparallel import (
     TestMultipleAccelerators,
 )
 
 
 class TestParallelizer(TestMultipleAccelerators):
     # check sharding logic as well as the accuracy with single mode
     def test_parallelizer_logic(self):
-        self.run_mnist_2accelerators('auto_parallel_parallelizer.py')
+        self.run_mnist_2accelerators('auto_parallel_parallelizer_deprecated.py')
 
 
 if __name__ == "__main__":
diff --git a/test/deprecated/standalone_executor/CMakeLists.txt b/test/deprecated/standalone_executor/CMakeLists.txt
@@ -9,5 +9,14 @@ foreach(target ${TEST_INTERP_CASES})
   py_test_modules(${target} MODULES ${target})
 endforeach()
 
+# These UTs are to temporarily test static build for standalone_executor, will be removed after static build is enabled by default.
+set(STATIC_BUILD_TESTS test_standalone_cuda_graph_multi_stream_deprecated)
+
+foreach(STATIC_BUILD_TEST ${STATIC_BUILD_TESTS})
+  py_test_modules(
+    ${STATIC_BUILD_TEST}_static_build MODULES ${STATIC_BUILD_TEST} ENVS
+    FLAGS_new_executor_static_build=true)
+endforeach()
+
 set_tests_properties(test_standalone_executor_aot_choose_kernel_deprecated
                      PROPERTIES TIMEOUT 60)
diff --git a/test/deprecated/standalone_executor/test_standalone_cuda_graph_multi_stream_deprecated.py b/test/deprecated/standalone_executor/test_standalone_cuda_graph_multi_stream_deprecated.py
@@ -13,9 +13,12 @@
 # limitations under the License.
 
 
+import sys
 import unittest
 
 import numpy as np
+
+sys.path.append("../../legacy_test")
 from test_cuda_graph_static_mode import build_program
 
 import paddle
diff --git a/test/deprecated/standalone_executor/test_standalone_measure_real_op_cost_deprecated.py b/test/deprecated/standalone_executor/test_standalone_measure_real_op_cost_deprecated.py
diff --git a/test/standalone_executor/CMakeLists.txt b/test/standalone_executor/CMakeLists.txt
@@ -31,9 +31,9 @@ py_test_modules(
 
 # These UTs are to temporarily test static build for standalone_executor, will be removed after static build is enabled by default.
 set(STATIC_BUILD_TESTS
-    test_standalone_controlflow test_standalone_cuda_graph_multi_stream
-    test_standalone_custom_stream test_standalone_custom_event
-    test_standalone_multiply_write test_standalone_executor)
+    test_standalone_controlflow test_standalone_custom_stream
+    test_standalone_custom_event test_standalone_multiply_write
+    test_standalone_executor)
 
 foreach(STATIC_BUILD_TEST ${STATIC_BUILD_TESTS})
   py_test_modules(
diff --git a/tools/parallel_UT_rule.py b/tools/parallel_UT_rule.py
@@ -562,7 +562,7 @@
     'test_pow2_warmup_op',
     'test_dlpack',
     'test_ops_roi_align',
-    'test_auto_parallel_parallelizer',
+    'test_auto_parallel_parallelizer_deprecated',
     'test_ops_roi_pool',
     'test_backward_infer_var_data_type_shape_deprecated',
     'test_auto_parallel_completion_deprecated',
diff --git a/tools/windows/run_unittests.sh b/tools/windows/run_unittests.sh
@@ -71,8 +71,8 @@ disable_wingpu_cuda12_test="^test_cholesky_op$|\
 ^test_multi_precision_fp16_train$|\
 ^test_imperative_skip_op$|\
 ^test_qat$|\
-^test_standalone_cuda_graph_multi_stream$|\
-^test_standalone_cuda_graph_multi_stream_static_build$|\
+^test_standalone_cuda_graph_multi_stream_deprecated$|\
+^test_standalone_cuda_graph_multi_stream_deprecated_static_build$|\
 ^test_save_load$|\
 ^test_conv_transpose_nn_grad$|\
 ^test_dygraph_spectral_norm$|\
