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.

Sign up for GitHub

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

Jump to bottom

[xpu] add dropout & amp ops in xpu place #33891

Merged
merged 2 commits into from
Jul 7, 2021
Merged

[xpu] add dropout & amp ops in xpu place #33891

merged 2 commits into from
Jul 7, 2021

Conversation

taixiurong
Copy link
Contributor

PR types

Others

PR changes

OPs

Describe

  1. add new xpu api of dropout 2. add xpu amp ops 3. fix elewise_add crash when dy is null in xpu place
    test=kunlun

@paddle-bot-old
Copy link

paddle-bot-old bot commented Jul 1, 2021

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

QingshuChen
QingshuChen requested changes Jul 2, 2021
View reviewed changes
paddle/fluid/operators/amp/check_finite_and_unscale_op_xpu.cc Outdated
is_finite.data<bool>()),
is_finite.data<bool>(), x->numel());
PADDLE_ENFORCE_EQ(r, XPU_SUCCESS, platform::errors::External(
"XPU API(isfinite) return wrong "
Copy link
Contributor

Choose a reason for hiding this comment

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

logical_not

paddle/fluid/operators/amp/check_finite_and_unscale_op_xpu.cc Outdated
is_nan.data<bool>(), is_finite.data<bool>(),
x->numel());
PADDLE_ENFORCE_EQ(r, XPU_SUCCESS, platform::errors::External(
"XPU API(any) return wrong "
Copy link
Contributor

Choose a reason for hiding this comment

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

logical_or

paddle/fluid/operators/amp/check_finite_and_unscale_op_xpu.cc
PADDLE_ENFORCE_EQ(r, XPU_SUCCESS, platform::errors::External(
"XPU API(cast_v2) return wrong "
"value[%d %s]",
r, XPUAPIErrorMsg[r]));
Copy link
Contributor

Choose a reason for hiding this comment

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

加xpu_wait

paddle/fluid/operators/amp/update_loss_scaling_op_xpu.cc Outdated
reinterpret_cast<XPUTyp*>(out_data), num,
XPUTyp(0.0));
PADDLE_ENFORCE_EQ(r == xpu::Error_t::SUCCESS, true,
platform::errors::External(
Copy link
Contributor

Choose a reason for hiding this comment

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

这个错误提示改下，参考check_finite_and_unscale_op_xpu.cc

paddle/fluid/operators/dropout_op_xpu.cc Outdated
PADDLE_ENFORCE_EQ(
r, xpu::Error_t::SUCCESS,
platform::errors::External(
"XPU dropout return wrong value[%d], please check whether "
Copy link
Contributor

Choose a reason for hiding this comment

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

错误提示改一下

QingshuChen
QingshuChen approved these changes Jul 5, 2021
View reviewed changes
Copy link
Contributor

@QingshuChen QingshuChen left a comment

Choose a reason for hiding this comment

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

LGTM

jiweibo
jiweibo approved these changes Jul 7, 2021
View reviewed changes
Copy link
Contributor

@jiweibo jiweibo left a comment

Choose a reason for hiding this comment

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

LGTM for xpu.cmake

@jiweibo jiweibo merged commit 84e813e into PaddlePaddle:develop Jul 7, 2021
taixiurong added a commit to taixiurong/Paddle that referenced this pull request Jul 7, 2021
@taixiurong
[xpu] add dropout & amp ops in xpu place (PaddlePaddle#33891)
dbffac3
@taixiurong taixiurong mentioned this pull request Jul 7, 2021
Merged
fuyinno4 pushed a commit that referenced this pull request Jul 12, 2021
@taixiurong @tangzhiyi11
cherry pick xpu to 2.1 (#34000)
0f266ac 
* update xpu cmake for kunlun (#33328)

* xpu support amp (#33809)

* fix bug DLTP-31078 (#33877)

* update xpu cmake (#33906)

* [xpu] add dropout & amp ops in xpu place (#33891)

Co-authored-by: TTerror <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jiweibo jiweibo jiweibo approved these changes

@QingshuChen QingshuChen QingshuChen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@taixiurong @QingshuChen @jiweibo