diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 8c323490cc964c5e3b69d6b512fdee22041d9803..9aebb728aa895388d6dc679304d2e9bc54c72f52 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -22,11 +22,12 @@ setlocal enabledelayedexpansion rem -------clean up environment----------- set work_dir=%cd% -set cache_dir=%work_dir:Paddle=cache% +if not defined cache_dir set cache_dir=%work_dir:Paddle=cache% if not exist %cache_dir%\tools ( git clone https://github.com/zhouwei25/tools.git %cache_dir%\tools ) taskkill /f /im cmake.exe 2>NUL +taskkill /f /im ninja.exe 2>NUL taskkill /f /im MSBuild.exe 2>NUL taskkill /f /im cl.exe 2>NUL taskkill /f /im lib.exe 2>NUL @@ -763,6 +764,7 @@ echo ======================================== echo Clean up environment at the end ... echo ======================================== taskkill /f /im cmake.exe 2>NUL +taskkill /f /im ninja.exe 2>NUL taskkill /f /im MSBuild.exe 2>NUL taskkill /f /im git.exe 2>NUL taskkill /f /im cl.exe 2>NUL diff --git a/tools/parallel_UT_rule.py b/tools/parallel_UT_rule.py index 70d7fb98cb5387d228805119e2c6a07347e5d45d..fbc0b767eff44fcfebf5cf248eee50ba8c0374ad 100644 --- a/tools/parallel_UT_rule.py +++ b/tools/parallel_UT_rule.py @@ -634,9 +634,6 @@ TETRAD_PARALLEL_JOB = [ 'test_analyzer_bert', 'test_analyzer_googlenet', 'test_fleet_base', - 'test_imperative_container_layerdict', - 'test_set_value_op', - 'test_view_op_reuse_allocation', 'test_sequential', 'test_sequential', 'test_imperative_layers',