未验证 提交 631d7837 编写于 作者: Z zhangchunle 提交者: GitHub

fix bug in windows ci (#29963)

上级 6206b9bc
...@@ -98,12 +98,13 @@ git diff --name-only %BRANCH% | findstr /V "\.py" || set CI_SKIP_CPP_TEST=ON ...@@ -98,12 +98,13 @@ git diff --name-only %BRANCH% | findstr /V "\.py" || set CI_SKIP_CPP_TEST=ON
:mkbuild :mkbuild
if not exist build ( if not exist build (
echo Windows build cache FALSE echo Windows build cache FALSE
echo "ipipe_log_param_Windows_Build_Cache: FALSE" set Windows_Build_Cache=FALSE
mkdir build mkdir build
) else ( ) else (
echo Windows build cache TRUE echo Windows build cache TRUE
echo "ipipe_log_param_Windows_Build_Cache: TRUE" set Windows_Build_Cache=TRUE
) )
echo ipipe_log_param_Windows_Build_Cache: %Windows_Build_Cache%
cd /d build cd /d build
dir . dir .
dir %cache_dir% dir %cache_dir%
...@@ -331,12 +332,12 @@ set /p libsize=< lib_size.txt ...@@ -331,12 +332,12 @@ set /p libsize=< lib_size.txt
for /F %%i in ("%libsize%") do ( for /F %%i in ("%libsize%") do (
set /a libsize_m=%%i/1024 set /a libsize_m=%%i/1024
echo "Windows Paddle_Inference Size: !libsize_m!M" echo "Windows Paddle_Inference Size: !libsize_m!M"
echo "ipipe_log_param_Windows_Paddle_Inference_Size: !libsize_m!M" echo ipipe_log_param_Windows_Paddle_Inference_Size: !libsize_m!M
) )
%cache_dir%\tools\busybox64.exe du -h -d 0 %cd%\python\dist > whl_size.txt %cache_dir%\tools\busybox64.exe du -h -d 0 %cd%\python\dist > whl_size.txt
set /p whlsize=< whl_size.txt set /p whlsize=< whl_size.txt
for /F %%i in ("%whlsize%") do echo "Windows PR whl Size: %%i" for /F %%i in ("%whlsize%") do echo "Windows PR whl Size: %%i"
for /F %%i in ("%whlsize%") do echo "ipipe_log_param_Windows_PR_whl_Size: %%i" for /F %%i in ("%whlsize%") do echo ipipe_log_param_Windows_PR_whl_Size: %%i
dir /s /b python\dist\*.whl > whl_file.txt dir /s /b python\dist\*.whl > whl_file.txt
set /p PADDLE_WHL_FILE_WIN=< whl_file.txt set /p PADDLE_WHL_FILE_WIN=< whl_file.txt
...@@ -489,7 +490,7 @@ echo spec_path=$(pwd)/UNITTEST_PR.spec>> check_change_of_unittest.sh ...@@ -489,7 +490,7 @@ echo spec_path=$(pwd)/UNITTEST_PR.spec>> check_change_of_unittest.sh
echo ctest -N ^| awk -F ':' '{print $2}' ^| sed '/^^$/d' ^| sed '$d' ^> ${spec_path}>> check_change_of_unittest.sh echo ctest -N ^| awk -F ':' '{print $2}' ^| sed '/^^$/d' ^| sed '$d' ^> ${spec_path}>> check_change_of_unittest.sh
echo num=$(awk 'END{print NR}' ${spec_path})>> check_change_of_unittest.sh echo num=$(awk 'END{print NR}' ${spec_path})>> check_change_of_unittest.sh
echo echo "Windows 1 card TestCases count is $num">> check_change_of_unittest.sh echo echo "Windows 1 card TestCases count is $num">> check_change_of_unittest.sh
echo echo "ipipe_log_param_Windows_1_Card_TestCases_Count: $num">> check_change_of_unittest.sh echo echo ipipe_log_param_Windows_1_Card_TestCases_Count: $num>> check_change_of_unittest.sh
echo UPSTREAM_URL='https://github.com/PaddlePaddle/Paddle'>> check_change_of_unittest.sh echo UPSTREAM_URL='https://github.com/PaddlePaddle/Paddle'>> check_change_of_unittest.sh
echo origin_upstream_url=`git remote -v ^| awk '{print $1, $2}' ^| uniq ^| grep upstream ^| awk '{print $2}'`>> check_change_of_unittest.sh echo origin_upstream_url=`git remote -v ^| awk '{print $1, $2}' ^| uniq ^| grep upstream ^| awk '{print $2}'`>> check_change_of_unittest.sh
echo if [ "$origin_upstream_url" == "" ]; then>> check_change_of_unittest.sh echo if [ "$origin_upstream_url" == "" ]; then>> check_change_of_unittest.sh
...@@ -581,7 +582,7 @@ set /a end_secs=dd*86400+hh*3600+nn*60+ss ...@@ -581,7 +582,7 @@ set /a end_secs=dd*86400+hh*3600+nn*60+ss
set /a cost_secs=end_secs-start_sec set /a cost_secs=end_secs-start_sec
echo "Windows %~3 Time: %cost_secs%s" echo "Windows %~3 Time: %cost_secs%s"
set tempTaskName=%~3 set tempTaskName=%~3
echo "ipipe_log_param_Windows_%tempTaskName: =_%_Time: %cost_secs%s" echo ipipe_log_param_Windows_%tempTaskName: =_%_Time: %cost_secs%s
goto:eof goto:eof
...@@ -589,11 +590,11 @@ goto:eof ...@@ -589,11 +590,11 @@ goto:eof
for /f "tokens=2,4" %%i in ('clcache.exe -s ^| findstr "entries hits"') do set %%i=%%j for /f "tokens=2,4" %%i in ('clcache.exe -s ^| findstr "entries hits"') do set %%i=%%j
if %hits% EQU 0 ( if %hits% EQU 0 (
echo "clcache hit rate: 0%%" echo "clcache hit rate: 0%%"
echo "ipipe_log_param_Clcache_Hit_Rate: 0%%" echo ipipe_log_param_Clcache_Hit_Rate: 0%%
) else ( ) else (
set /a rate=%hits%*10000/%entries% set /a rate=%hits%*10000/%entries%
echo "clcache hit rate: %rate:~0,-2%.%rate:~-2%%%" echo "clcache hit rate: %rate:~0,-2%.%rate:~-2%%%"
echo "ipipe_log_param_Clcache_Hit_Hate: %rate:~0,-2%.%rate:~-2%%%" echo ipipe_log_param_Clcache_Hit_Hate: %rate:~0,-2%.%rate:~-2%%%
) )
goto:eof goto:eof
......
...@@ -941,7 +941,7 @@ EOF ...@@ -941,7 +941,7 @@ EOF
echo "ipipe_log_param_Exclusive_TestCases_Count: $num" echo "ipipe_log_param_Exclusive_TestCases_Count: $num"
else else
echo "$2 card TestCases count is $num" echo "$2 card TestCases count is $num"
echo "ipipe_log_param_${2}_Cards_TestCases_Count $num" echo "ipipe_log_param_${2}_Cards_TestCases_Count: $num"
fi fi
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册