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

Optimization of pool2d grad #35389

Merged
merged 19 commits into from
Sep 19, 2021
Merged

Optimization of pool2d grad #35389

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
97cb4d6
Optimization of pool2d grad, first commit.
JamesLim-sy Sep 2, 2021
b6788a1
remove useless print codes
JamesLim-sy Sep 2, 2021
3b8bbe4
refine codes
JamesLim-sy Sep 2, 2021
2402277
refine codes
JamesLim-sy Sep 2, 2021
2294254
seal more operation into template specialization
JamesLim-sy Sep 6, 2021
acd08d9
fix template struct error in MaxPool2dGrad.
JamesLim-sy Sep 6, 2021
4bd707d
Merge branch 'develop' into Optimize_pool2d_grad
JamesLim-sy Sep 8, 2021
5957ef2
Merge branch 'develop' into Optimize_pool2d_grad
JamesLim-sy Sep 9, 2021
8190737
Merge branch 'Optimize_pool2d_grad' of https://github.com/JamesLim-sy…
JamesLim-sy Sep 9, 2021
20a3151
Fix header including error
JamesLim-sy Sep 9, 2021
ff5e0d9
refine code with comment
JamesLim-sy Sep 10, 2021
e63bf5f
Seal the param-preparation codes into function for common use.
JamesLim-sy Sep 12, 2021
c13dee9
Seal the param-preparation codes into function for common use.
JamesLim-sy Sep 12, 2021
91fa296
Merge branch 'Optimize_pool2d_grad' of https://github.com/JamesLim-sy…
JamesLim-sy Sep 12, 2021
ffc7c01
Seal the param-preparation into funciton and make it common for other…
JamesLim-sy Sep 12, 2021
195b923
polish code and erase useless template speicalization
JamesLim-sy Sep 16, 2021
7136050
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
JamesLim-sy Sep 17, 2021
8004f32
Rerun triger
JamesLim-sy Sep 18, 2021
d8e4f42
rerun trigger
JamesLim-sy Sep 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions paddle/fluid/operators/math/pooling.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,8 @@ class Pool2dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
for (int h = hstart; h < hend; ++h) {
for (int w = wstart; w < wend; ++w) {
pool_grad_process.compute(
input_data[h * input_width + w],
output_data[ph * output_width + pw],
output_grad_data[ph * output_width + pw],
input_data[h * input_width + w], output_data,
output_grad_data, ph * output_width + pw,
static_cast<T>(scale),
input_grad_data + h * input_width + w);
}
Expand Down Expand Up @@ -397,9 +396,8 @@ class Pool2dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
for (int h = hstart; h < hend; ++h) {
for (int w = wstart; w < wend; ++w) {
pool_grad_process.compute(
input_data[h * input_width + w],
output_data[ph * output_width + pw],
output_grad_data[ph * output_width + pw],
input_data[h * input_width + w], output_data,
output_grad_data, ph * output_width + pw,
static_cast<T>(scale),
input_grad_data + h * input_width + w);
}
Expand Down Expand Up @@ -451,10 +449,10 @@ class Pool2dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
h * input_width * input_channels + w * input_channels + c;
auto output_idx = ph * output_width * output_channels +
pw * output_channels + c;
pool_grad_process.compute(
input_data[input_idx], output_data[output_idx],
output_grad_data[output_idx], static_cast<T>(scale),
input_grad_data + input_idx);
pool_grad_process.compute(input_data[input_idx], output_data,
output_grad_data, output_idx,
static_cast<T>(scale),
input_grad_data + input_idx);
}
}
}
Expand Down Expand Up @@ -1051,10 +1049,10 @@ class Pool3dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
int input_idx = (d * input_height + h) * input_width + w;
int output_idx =
(pd * output_height + ph) * output_width + pw;
pool_grad_process.compute(
input_data[input_idx], output_data[output_idx],
output_grad_data[output_idx], static_cast<T>(scale),
input_grad_data + input_idx);
pool_grad_process.compute(input_data[input_idx],
output_data, output_grad_data,
output_idx, static_cast<T>(scale),
input_grad_data + input_idx);
}
}
}
Expand Down Expand Up @@ -1165,8 +1163,8 @@ class Pool3dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
int output_idx =
(pd * output_height + ph) * output_width + pw;
pool_grad_process.compute(
input_data[input_idx], output_data[output_idx],
output_grad_data[output_idx], static_cast<T>(scale),
input_data[input_idx], output_data, output_grad_data,
output_idx, static_cast<T>(scale),
input_grad_data + input_idx);
}
}
Expand Down Expand Up @@ -1242,8 +1240,8 @@ class Pool3dGradFunctor<platform::CPUDeviceContext, PoolProcess, T> {
output_channels +
c;
pool_grad_process.compute(
input_data[input_idx], output_data[output_idx],
output_grad_data[output_idx], static_cast<T>(scale),
input_data[input_idx], output_data, output_grad_data,
output_idx, static_cast<T>(scale),
input_grad_data + input_idx);
}
}
Expand Down
Loading