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

Optimize performance of avgpool2d with NHWC layout #49231

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Optimize performance of avgpool2d with NHWC layout #49231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions paddle/phi/kernels/impl/pool_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,22 @@ namespace phi {

inline int GetReduceNum(const DenseTensor& input,
const DenseTensor* output,
const std::string data_format,
const bool channel_last,
std::vector<int>* reduce_dim) {
// data_format only can be NCHW
bool channel_last = (data_format == "NHWC");
if (channel_last) {
return 0;
}
int reduce_num = 0;
const int output_height = output->dims()[2];
const int output_width = output->dims()[3];
const int output_height =
channel_last ? output->dims()[1] : output->dims()[2];
const int output_width = channel_last ? output->dims()[2] : output->dims()[3];
if ((output_height == 1) && (output_width == 1)) {
reduce_dim->push_back(2);
reduce_dim->push_back(3);
reduce_num = input.dims()[2] * input.dims()[3];
if (channel_last) {
reduce_dim->push_back(1);
reduce_dim->push_back(2);
reduce_num = input.dims()[1] * input.dims()[2];
} else {
reduce_dim->push_back(2);
reduce_dim->push_back(3);
reduce_num = input.dims()[2] * input.dims()[3];
}
}
return reduce_num;
}
Expand Down Expand Up @@ -109,7 +111,7 @@ void PoolRawKernel(const Context& ctx,

} else if (pooling_type == "avg") {
std::vector<int> reduce_dim;
int reduce_num = GetReduceNum(x, out, data_format, &reduce_dim);
int reduce_num = GetReduceNum(x, out, channel_last, &reduce_dim);
if (reduce_num > 0 &&
adaptive) { // for adaptive_avg_pool2d && output_size == 1
#if defined(__HIPCC__) || defined(__NVCC__)
Expand Down