Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Mac Timeout Test #56259

Merged
merged 6 commits into from
Aug 16, 2023
Merged

Fix Mac Timeout Test #56259

merged 6 commits into from
Aug 16, 2023

Conversation

tianshuo78520a
Copy link
Contributor

@tianshuo78520a tianshuo78520a commented Aug 14, 2023

PR types

Others

PR changes

Others

Description

一些单测修改为串行跑,并发跑会出现timeout情况。
Pcard-67012

@paddle-bot
Copy link

paddle-bot bot commented Aug 14, 2023

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

risemeup1
risemeup1 previously approved these changes Aug 15, 2023
Copy link
Contributor

@risemeup1 risemeup1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

zhangbo9674
zhangbo9674 previously approved these changes Aug 15, 2023
@@ -930,7 +939,6 @@ set -ex

function get_precision_ut_mac() {
on_precision=0
serial_list="test_resnet|test_resnet_v2|test_concat_op|test_paddle_save_load"
UT_list=$(ctest -N | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UT_list中过滤掉single_list中的单测

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

多写一遍956行中的循环,把UT_list换成single_list,然后符合条件的单测写入新建的UT_list_prec_2变量,当触发精准测试时,加一个ctest -R "${UT_list_prec_2}" -j 1

if [[ "$on_precision" == "0" ]];then
ctest -E "($disable_ut_quickly)" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
ctest -R "${single_list}" --output-on-failure -j 1 | tee $tmpfile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没有命中精准单测时的执行逻辑,改成:

ctest -E "($disable_ut_quickly|${single_list})" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
ctest -R "${single_list}" -E "($disable_ut_quickly)" --output-on-failure -j 1 | tee $tmpfile

Copy link
Contributor

@XieYunshen XieYunshen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@risemeup1 risemeup1 merged commit 87bc6f2 into PaddlePaddle:develop Aug 16, 2023
25 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants