From 693b1aa15d95b281ca61c2ad46fb60ab6f0695d3 Mon Sep 17 00:00:00 2001 From: Sing_chan <51314274+betterpig@users.noreply.github.com> Date: Thu, 14 Oct 2021 10:49:56 +0800 Subject: [PATCH] reduce some unittest's parallel number to avoding timeout failure (#36397) --- paddle/scripts/paddle_build.bat | 16 ++++++++-------- tools/parallel_UT_rule.py | 14 +++++--------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index e6320d5bd1..e44c877d6a 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -381,7 +381,7 @@ if not exist %THIRD_PARTY_PATH% ( echo There is no usable third_party cache in %THIRD_PARTY_PATH%, will download from bos. pip install wget if not exist %THIRD_PARTY_HOME% mkdir "%THIRD_PARTY_HOME%" - cd %THIRD_PARTY_HOME% + cd /d %THIRD_PARTY_HOME% echo Getting third party: downloading ... %PYTHON_ROOT%\python.exe -c "import wget;wget.download('https://paddle-windows.bj.bcebos.com/third_party/%sub_dir%/%md5%.tar.gz')" 2>nul if !ERRORLEVEL! EQU 0 ( @@ -397,7 +397,7 @@ if not exist %THIRD_PARTY_PATH% ( echo Get third party failed, reason: download failed, will build locally. ) if not exist %THIRD_PARTY_PATH% set UPLOAD_TP_FILE=ON - cd %work_dir%\%BUILD_DIR% + cd /d %work_dir%\%BUILD_DIR% ) else ( echo Found reusable third_party cache in %THIRD_PARTY_PATH%, will reuse it. ) @@ -519,16 +519,16 @@ if "%UPLOAD_TP_FILE%"=="ON" ( echo Uploading third_party: checking bce ... if not exist %cache_dir%\bce-python-sdk-0.8.33 ( echo There is no bce in this PC, will install bce. - cd %cache_dir% + cd /d %cache_dir% echo Download package from https://paddle-windows.bj.bcebos.com/bce-python-sdk-0.8.33.tar.gz %PYTHON_ROOT%\python.exe -c "import wget;wget.download('https://paddle-windows.bj.bcebos.com/bce-python-sdk-0.8.33.tar.gz')" %PYTHON_ROOT%\python.exe -c "import shutil;shutil.unpack_archive('bce-python-sdk-0.8.33.tar.gz', extract_dir='./',format='gztar')" - cd %cache_dir%\bce-python-sdk-0.8.33 + cd /d %cache_dir%\bce-python-sdk-0.8.33 %PYTHON_ROOT%\python.exe setup.py install 1>nul del %cache_dir%\bce-python-sdk-0.8.33.tar.gz ) if !errorlevel! EQU 0 ( - cd %THIRD_PARTY_HOME% + cd /d %THIRD_PARTY_HOME% echo Uploading third_party: compressing ... tar -zcf %md5%.tar.gz %md5% if !errorlevel! EQU 0 ( @@ -546,7 +546,7 @@ if "%UPLOAD_TP_FILE%"=="ON" ( ) else ( echo Failed upload third party to bos, reason: install bce failed. ) - cd %work_dir%\%BUILD_DIR% + cd /d %work_dir%\%BUILD_DIR% ) echo Build Paddle successfully! @@ -711,7 +711,7 @@ for /F %%i in ("%libsize%") do ( echo ipipe_log_param_Windows_Paddle_Inference_Size: !libsize_m!M ) -cd %work_dir%\paddle\fluid\inference\api\demo_ci +cd /d %work_dir%\paddle\fluid\inference\api\demo_ci %cache_dir%\tools\busybox64.exe bash run.sh %work_dir:\=/% %WITH_MKL% %WITH_GPU% %cache_dir:\=/%/inference_demo %TENSORRT_ROOT%/include %TENSORRT_ROOT%/lib %MSVC_STATIC_CRT% goto:eof @@ -811,7 +811,7 @@ echo ======================================== echo Step 7. Testing fluid library with infer_ut for inference ... echo ======================================== -cd %work_dir%\paddle\fluid\inference\tests\infer_ut +cd /d %work_dir%\paddle\fluid\inference\tests\infer_ut %cache_dir%\tools\busybox64.exe bash run.sh %work_dir:\=/% %WITH_MKL% %WITH_GPU% %cache_dir:\=/%/inference_demo %TENSORRT_ROOT% %MSVC_STATIC_CRT% goto:eof diff --git a/tools/parallel_UT_rule.py b/tools/parallel_UT_rule.py index 54e8d608ac..803e173e07 100644 --- a/tools/parallel_UT_rule.py +++ b/tools/parallel_UT_rule.py @@ -676,12 +676,10 @@ CPU_PARALLEL_JOB = [ 'test_static_save_load_large', 'version_test', 'var_type_traits_test', - 'var_type_inference_test', 'variable_test', 'unroll_array_ops_test', 'tuple_test', 'to_string_test', - 'timer_test', 'threadpool_test', 'test_zeros_op', 'test_while_op', @@ -1015,7 +1013,6 @@ CPU_PARALLEL_JOB = [ 'program_desc_test', 'profiler_test', 'place_test', - 'pass_test', 'op_version_registry_test', 'op_tester', 'op_proto_maker_test', @@ -1179,7 +1176,6 @@ CPU_PARALLEL_JOB = [ 'test_fleet_sharding_meta_optimizer', 'test_listen_and_serv_op', 'test_analyzer_zerocopytensor_tensor', - 'test_conv_bn_fuse_pass_cc', 'test_collective_optimizer', 'test_bf16_utils', 'test_analyzer_seq_pool1_compare_determine', @@ -1236,6 +1232,9 @@ CPU_PARALLEL_JOB = [ # It run 4 job each time, If it failed due to Insufficient GPU memory or CUBLAS_STATUS_ALLOC_FAILED, # just remove it from this list. TETRAD_PARALLEL_JOB = [ + 'timer_test', + 'var_type_inference_test', + 'pass_test', 'graph_node_test', 'test_assert', 'test_nce', @@ -1254,7 +1253,6 @@ TETRAD_PARALLEL_JOB = [ 'test_imperative_using_non_zero_gpu', 'retry_allocator_test', 'system_allocator_test', - 'test_fc_fuse_pass_cc', 'test_fc_lstm_fuse_pass_cc', 'test_fc_gru_fuse_pass_cc', 'test_conv_bn_fuse_pass_cc', @@ -1281,14 +1279,11 @@ TETRAD_PARALLEL_JOB = [ 'test_analyzer_bert', 'test_analyzer_googlenet', 'test_fleet_base', - 'test_sequential', - 'test_sequential', 'test_imperative_layers', 'test_dgc_momentum_op', 'test_memcpy_op', 'test_dgc_op', 'test_lookahead', - 'test_callback_visualdl', 'test_new_group_api', 'test_collective_split_embedding_none_divisible', 'test_collective_wait', @@ -1304,6 +1299,8 @@ TETRAD_PARALLEL_JOB = [ # It run 2 job each time, If it failed due to Insufficient GPU memory or CUBLAS_STATUS_ALLOC_FAILED, # just remove it from this list. TWO_PARALLEL_JOB = [ + 'test_callback_visualdl', + 'test_sequential', 'test_lambv2_op', 'test_math_op_patch', 'test_tensor_to_numpy', @@ -1398,7 +1395,6 @@ TWO_PARALLEL_JOB = [ 'test_kron_op', 'test_isfinite_v2_op', 'test_ctc_align', - 'test_imperative_save_load_v2', 'test_decayed_adagrad_op', 'test_dropout_op', 'test_functional_conv3d', -- GitLab