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

[ARM] 5x5dw and sgemv support fuse activation, test=develop #2797

Merged
merged 9 commits into from
Feb 4, 2020

Conversation

yiicy
Copy link
Collaborator

@yiicy yiicy commented Jan 21, 2020

  1. 5x5s1 depthwise conv support fuse relu6 and leakey relu activation
  2. sgemv support fuse relu6 and leakey relu activation
  3. fix leakey relu asm code cmhs bug, the right instruction is fcmge
  4. fix 3x3s2 direct int8 conv pad set bug
  5. open high precision [fp32 conv] [int8 conv] [sgemmc4] [sgemv] [gemv] ut,
    this will cause more time elapse in CI system, but this is necessary

@@ -466,8 +467,8 @@ TEST(TestConv3x3DWInt8, test_conv3x3_depthwise) {
for (auto& c : {1, 3, 5, 8, 16, 32}) {
std::vector<DDim> dims;
DDim weights_dim({c, 1, 3, 3});
for (auto& batch : {1, 2}) {
for (auto& h : {1, 3, 15, 19, 75, 32, 28}) {
for (auto& batch : {2}) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

batch==1 为什么不加了。建议加上,这个case 是最常见的。后面类似

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

hao

((kw == 5 && stride == 1) || (kw == 5 && stride == 2));

bool flag_dw_3x3 = (kw == 3) && (kh == 3) && (stride == 1 || stride == 2);
bool flag_dw_5x5 = (kw == 5 && stride == 1) || (kw == 5 && stride == 2);
Copy link
Collaborator

Choose a reason for hiding this comment

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

这里不判断kh?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

soga

chenjiaoAngel
chenjiaoAngel previously approved these changes Feb 3, 2020
Copy link
Collaborator

@chenjiaoAngel chenjiaoAngel left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@MyPandaShaoxiang MyPandaShaoxiang left a comment

Choose a reason for hiding this comment

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

lgtm

@MyPandaShaoxiang MyPandaShaoxiang merged commit 928e2a2 into PaddlePaddle:develop Feb 4, 2020
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.

3 participants