Skip to content

Commit 9a6bcab

Browse files
zhwesky2010zhwesky2010
committed
Polish Windows CI, fix CI random fail
1 parent 97f86d8 commit 9a6bcab

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

‎paddle/fluid/framework/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ add_subdirectory(io)
2929
proto_library(framework_proto SRCS framework.proto)
3030

3131
proto_library(op_def_proto SRCS op_def.proto)
32-
cc_library(op_def_api SRCS op_def_api.cc DEPS op_def_proto)
32+
cc_library(op_def_api SRCS op_def_api.cc DEPS op_def_proto boost)
3333

3434
FILE(GLOB OP_DEF_FILES ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/compat/*.pbtxt)
3535
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/op_def.pbtxt

‎paddle/scripts/paddle_build.bat‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ if not defined cache_dir set cache_dir=%work_dir:Paddle=cache%
2626
if not exist %cache_dir%\tools (
2727
git clone https://github.com/zhouwei25/tools.git %cache_dir%\tools
2828
)
29-
taskkill /f /im cmake.exe 2>NUL
30-
taskkill /f /im ninja.exe 2>NUL
31-
taskkill /f /im MSBuild.exe 2>NUL
32-
taskkill /f /im cl.exe 2>NUL
33-
taskkill /f /im lib.exe 2>NUL
34-
taskkill /f /im link.exe 2>NUL
35-
taskkill /f /im vctip.exe 2>NUL
36-
taskkill /f /im cvtres.exe 2>NUL
37-
taskkill /f /im rc.exe 2>NUL
38-
taskkill /f /im mspdbsrv.exe 2>NUL
39-
taskkill /f /im csc.exe 2>NUL
40-
taskkill /f /im python.exe 2>NUL
41-
taskkill /f /im nvcc.exe 2>NUL
42-
taskkill /f /im cicc.exe 2>NUL
43-
taskkill /f /im ptxas.exe 2>NUL
44-
taskkill /f /im op_function_generator.exe 2>NUL
29+
taskkill /f /im cmake.exe /t 2>NUL
30+
taskkill /f /im ninja.exe /t 2>NUL
31+
taskkill /f /im MSBuild.exe /t 2>NUL
32+
taskkill /f /im cl.exe /t 2>NUL
33+
taskkill /f /im lib.exe /t 2>NUL
34+
taskkill /f /im link.exe /t 2>NUL
35+
taskkill /f /im vctip.exe /t 2>NUL
36+
taskkill /f /im cvtres.exe /t 2>NUL
37+
taskkill /f /im rc.exe /t 2>NUL
38+
taskkill /f /im mspdbsrv.exe /t 2>NUL
39+
taskkill /f /im csc.exe /t 2>NUL
40+
taskkill /f /im python.exe /t 2>NUL
41+
taskkill /f /im nvcc.exe /t 2>NUL
42+
taskkill /f /im cicc.exe /t 2>NUL
43+
taskkill /f /im ptxas.exe /t 2>NUL
44+
taskkill /f /im op_function_generator.exe /t 2>NUL
4545
wmic process where name="op_function_generator.exe" call terminate 2>NUL
4646
wmic process where name="cvtres.exe" call terminate 2>NUL
4747
wmic process where name="rc.exe" call terminate 2>NUL
@@ -400,20 +400,20 @@ set build_times=1
400400
rem clcache.exe -z
401401

402402
rem -------clean up environment again-----------
403-
taskkill /f /im cmake.exe 2>NUL
404-
taskkill /f /im MSBuild.exe 2>NUL
405-
taskkill /f /im cl.exe 2>NUL
406-
taskkill /f /im lib.exe 2>NUL
407-
taskkill /f /im link.exe 2>NUL
408-
taskkill /f /im vctip.exe 2>NUL
409-
taskkill /f /im cvtres.exe 2>NUL
410-
taskkill /f /im rc.exe 2>NUL
411-
taskkill /f /im mspdbsrv.exe 2>NUL
412-
taskkill /f /im csc.exe 2>NUL
413-
taskkill /f /im nvcc.exe 2>NUL
414-
taskkill /f /im cicc.exe 2>NUL
415-
taskkill /f /im ptxas.exe 2>NUL
416-
taskkill /f /im op_function_generator.exe 2>NUL
403+
taskkill /f /im cmake.exe /t 2>NUL
404+
taskkill /f /im MSBuild.exe /t 2>NUL
405+
taskkill /f /im cl.exe /t 2>NUL
406+
taskkill /f /im lib.exe /t 2>NUL
407+
taskkill /f /im link.exe /t 2>NUL
408+
taskkill /f /im vctip.exe /t 2>NUL
409+
taskkill /f /im cvtres.exe /t 2>NUL
410+
taskkill /f /im rc.exe /t 2>NUL
411+
taskkill /f /im mspdbsrv.exe /t 2>NUL
412+
taskkill /f /im csc.exe /t 2>NUL
413+
taskkill /f /im nvcc.exe /t 2>NUL
414+
taskkill /f /im cicc.exe /t 2>NUL
415+
taskkill /f /im ptxas.exe /t 2>NUL
416+
taskkill /f /im op_function_generator.exe /t 2>NUL
417417
wmic process where name="cmake.exe" call terminate 2>NUL
418418
wmic process where name="op_function_generator.exe" call terminate 2>NUL
419419
wmic process where name="cvtres.exe" call terminate 2>NUL
@@ -422,7 +422,7 @@ wmic process where name="cl.exe" call terminate 2>NUL
422422
wmic process where name="lib.exe" call terminate 2>NUL
423423

424424
if "%WITH_TESTING%"=="ON" (
425-
for /F "tokens=1 delims= " %%# in ('tasklist ^| findstr /i test') do taskkill /f /im %%#
425+
for /F "tokens=1 delims= " %%# in ('tasklist ^| findstr /i test') do taskkill /f /im %%# /t
426426
)
427427

428428
echo Build Paddle the %build_times% time:
@@ -791,32 +791,32 @@ rem ----------------------------------------------------------------------------
791791
echo ========================================
792792
echo Clean up environment at the end ...
793793
echo ========================================
794-
taskkill /f /im cmake.exe 2>NUL
795-
taskkill /f /im ninja.exe 2>NUL
796-
taskkill /f /im MSBuild.exe 2>NUL
797-
taskkill /f /im git.exe 2>NUL
798-
taskkill /f /im cl.exe 2>NUL
799-
taskkill /f /im lib.exe 2>NUL
800-
taskkill /f /im link.exe 2>NUL
801-
taskkill /f /im git-remote-https.exe 2>NUL
802-
taskkill /f /im vctip.exe 2>NUL
803-
taskkill /f /im cvtres.exe 2>NUL
804-
taskkill /f /im rc.exe 2>NUL
805-
taskkill /f /im mspdbsrv.exe 2>NUL
806-
taskkill /f /im csc.exe 2>NUL
807-
taskkill /f /im python.exe 2>NUL
808-
taskkill /f /im nvcc.exe 2>NUL
809-
taskkill /f /im cicc.exe 2>NUL
810-
taskkill /f /im ptxas.exe 2>NUL
811-
taskkill /f /im op_function_generator.exe 2>NUL
794+
taskkill /f /im cmake.exe /t 2>NUL
795+
taskkill /f /im ninja.exe /t 2>NUL
796+
taskkill /f /im MSBuild.exe /t 2>NUL
797+
taskkill /f /im git.exe /t 2>NUL
798+
taskkill /f /im cl.exe /t 2>NUL
799+
taskkill /f /im lib.exe /t 2>NUL
800+
taskkill /f /im link.exe /t 2>NUL
801+
taskkill /f /im git-remote-https.exe /t 2>NUL
802+
taskkill /f /im vctip.exe /t 2>NUL
803+
taskkill /f /im cvtres.exe /t 2>NUL
804+
taskkill /f /im rc.exe /t 2>NUL
805+
taskkill /f /im mspdbsrv.exe /t 2>NUL
806+
taskkill /f /im csc.exe /t 2>NUL
807+
taskkill /f /im python.exe /t 2>NUL
808+
taskkill /f /im nvcc.exe /t 2>NUL
809+
taskkill /f /im cicc.exe /t 2>NUL
810+
taskkill /f /im ptxas.exe /t 2>NUL
811+
taskkill /f /im op_function_generator.exe /t 2>NUL
812812
wmic process where name="op_function_generator.exe" call terminate 2>NUL
813813
wmic process where name="cvtres.exe" call terminate 2>NUL
814814
wmic process where name="rc.exe" call terminate 2>NUL
815815
wmic process where name="cl.exe" call terminate 2>NUL
816816
wmic process where name="lib.exe" call terminate 2>NUL
817817
wmic process where name="python.exe" call terminate 2>NUL
818818
if "%WITH_TESTING%"=="ON" (
819-
for /F "tokens=1 delims= " %%# in ('tasklist ^| findstr /i test') do taskkill /f /im %%#
819+
for /F "tokens=1 delims= " %%# in ('tasklist ^| findstr /i test') do taskkill /f /im %%# /t
820820
)
821821
echo Windows CI run successfully!
822822
exit /b 0

0 commit comments

Comments
 (0)