Skip to content

Commit b490118

Browse files
DanielSun11DanielSun11
authored
Revert "add avg/max poll for float16 (#74313)"
This reverts commit d7e7496.
1 parent d7e7496 commit b490118

File tree

5 files changed

+8
-66
lines changed

5 files changed

+8
-66
lines changed

‎paddle/phi/kernels/cpu/pool_grad_kernel.cc‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,8 @@
1717
#include "paddle/phi/core/kernel_registry.h"
1818
#include "paddle/phi/kernels/impl/pool_grad_kernel_impl.h"
1919

20-
PD_REGISTER_KERNEL(pool2d_grad,
21-
CPU,
22-
ALL_LAYOUT,
23-
phi::Pool2dGradKernel,
24-
float,
25-
double,
26-
phi::dtype::float16) {}
20+
PD_REGISTER_KERNEL(
21+
pool2d_grad, CPU, ALL_LAYOUT, phi::Pool2dGradKernel, float, double) {}
2722
PD_REGISTER_KERNEL(
2823
lp_pool2d_grad, CPU, ALL_LAYOUT, phi::LPPool2dGradKernel, float, double) {}
2924
PD_REGISTER_KERNEL(pool2d_double_grad,
@@ -41,13 +36,8 @@ PD_REGISTER_KERNEL(max_pool2d_with_index_grad,
4136
kernel->InputAt(1).SetDataType(phi::CppTypeToDataType<int>::Type());
4237
}
4338

44-
PD_REGISTER_KERNEL(pool3d_grad,
45-
CPU,
46-
ALL_LAYOUT,
47-
phi::Pool3dGradKernel,
48-
float,
49-
double,
50-
phi::dtype::float16) {}
39+
PD_REGISTER_KERNEL(
40+
pool3d_grad, CPU, ALL_LAYOUT, phi::Pool3dGradKernel, float, double) {}
5141
PD_REGISTER_KERNEL(max_pool3d_with_index_grad,
5242
CPU,
5343
ALL_LAYOUT,

‎paddle/phi/kernels/cpu/pool_kernel.cc‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717
#include "paddle/phi/core/kernel_registry.h"
1818
#include "paddle/phi/kernels/impl/pool_kernel_impl.h"
1919

20-
PD_REGISTER_KERNEL(pool2d,
21-
CPU,
22-
ALL_LAYOUT,
23-
phi::Pool2dKernel,
24-
float,
25-
double,
26-
phi::dtype::float16) {}
20+
PD_REGISTER_KERNEL(pool2d, CPU, ALL_LAYOUT, phi::Pool2dKernel, float, double) {}
2721
PD_REGISTER_KERNEL(
2822
lp_pool2d, CPU, ALL_LAYOUT, phi::LPPool2dKernel, float, double) {}
2923
PD_REGISTER_KERNEL(max_pool2d_with_index,
@@ -35,13 +29,7 @@ PD_REGISTER_KERNEL(max_pool2d_with_index,
3529
kernel->OutputAt(1).SetDataType(phi::CppTypeToDataType<int>::Type());
3630
}
3731

38-
PD_REGISTER_KERNEL(pool3d,
39-
CPU,
40-
ALL_LAYOUT,
41-
phi::Pool3dKernel,
42-
float,
43-
double,
44-
phi::dtype::float16) {}
32+
PD_REGISTER_KERNEL(pool3d, CPU, ALL_LAYOUT, phi::Pool3dKernel, float, double) {}
4533
PD_REGISTER_KERNEL(max_pool3d_with_index,
4634
CPU,
4735
ALL_LAYOUT,

‎paddle/phi/kernels/funcs/pooling.cc‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,6 @@ class MaxPool2dGradFunctor<CPUContext, T> {
464464
template class MaxPool2dGradFunctor<CPUContext, float>;
465465
template class MaxPool2dGradFunctor<CPUContext, double>;
466466

467-
template class MaxPool2dGradFunctor<CPUContext, dtype::float16>;
468-
469467
template class Pool2dFunctor<CPUContext, MaxPool<float>, float>;
470468
template class Pool2dFunctor<CPUContext, AvgPool<float>, float>;
471469
template class Pool2dFunctor<CPUContext, LPPool<float>, float>;
@@ -479,24 +477,6 @@ template class Pool2dGradFunctor<CPUContext, MaxPoolGrad<double>, double>;
479477
template class Pool2dGradFunctor<CPUContext, AvgPoolGrad<double>, double>;
480478
template class Pool2dGradFunctor<CPUContext, LPPoolGrad<double>, double>;
481479

482-
template class Pool2dFunctor<phi::CPUContext,
483-
MaxPool<dtype::float16>,
484-
dtype::float16>;
485-
template class Pool2dFunctor<phi::CPUContext,
486-
AvgPool<dtype::float16>,
487-
dtype::float16>;
488-
template class Pool2dFunctor<phi::CPUContext,
489-
LPPool<dtype::float16>,
490-
dtype::float16>;
491-
template class Pool2dGradFunctor<phi::CPUContext,
492-
MaxPoolGrad<dtype::float16>,
493-
dtype::float16>;
494-
template class Pool2dGradFunctor<phi::CPUContext,
495-
AvgPoolGrad<dtype::float16>,
496-
dtype::float16>;
497-
template class Pool2dGradFunctor<phi::CPUContext,
498-
LPPoolGrad<dtype::float16>,
499-
dtype::float16>;
500480
/*
501481
* Tensors are in NCDHW or NDHWC format.
502482
* Ksize, strides, paddings are three elements. These three elements represent
@@ -1077,7 +1057,6 @@ class MaxPool3dGradFunctor<CPUContext, T> {
10771057
};
10781058
template class MaxPool3dGradFunctor<CPUContext, float>;
10791059
template class MaxPool3dGradFunctor<CPUContext, double>;
1080-
template class MaxPool3dGradFunctor<CPUContext, dtype::float16>;
10811060

10821061
template class Pool3dFunctor<CPUContext, MaxPool<float>, float>;
10831062
template class Pool3dFunctor<CPUContext, AvgPool<float>, float>;
@@ -1088,21 +1067,6 @@ template class Pool3dFunctor<CPUContext, AvgPool<double>, double>;
10881067
template class Pool3dGradFunctor<CPUContext, MaxPoolGrad<double>, double>;
10891068
template class Pool3dGradFunctor<CPUContext, AvgPoolGrad<double>, double>;
10901069

1091-
template class Pool3dFunctor<phi::CPUContext,
1092-
MaxPool<dtype::float16>,
1093-
dtype::float16>;
1094-
template class Pool3dFunctor<phi::CPUContext,
1095-
AvgPool<dtype::float16>,
1096-
dtype::float16>;
1097-
template class Pool3dFunctor<phi::CPUContext,
1098-
LPPool<dtype::float16>,
1099-
dtype::float16>;
1100-
template class Pool3dGradFunctor<phi::CPUContext,
1101-
MaxPoolGrad<dtype::float16>,
1102-
dtype::float16>;
1103-
template class Pool3dGradFunctor<phi::CPUContext,
1104-
AvgPoolGrad<dtype::float16>,
1105-
dtype::float16>;
11061070
/*
11071071
* All tensors are in NCHW format.
11081072
* Ksize, strides, paddings are two elements. These two elements represent

‎paddle/phi/kernels/gpudnn/pool_kernel.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void Pool3dGPUDNNKernel(const Context& dev_ctx,
305305
const std::string& padding_algorithm,
306306
DenseTensor* out) {
307307
if (x.numel() == 0) {
308-
if (pooling_type == "max") {
308+
if (pooling_type == "max" || pooling_type == "avg") {
309309
phi::Full<T, Context>(
310310
dev_ctx, phi::IntArray(common::vectorize(out->dims())), 0, out);
311311
} else {

‎paddle/phi/kernels/impl/pool_kernel_impl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ void Pool3dKernel(const Context& dev_ctx,
389389
const std::string& padding_algorithm,
390390
DenseTensor* out) {
391391
if (x.numel() == 0) {
392-
if (pooling_type == "max") {
392+
if (pooling_type == "max" || pooling_type == "avg") {
393393
phi::Full<T, Context>(
394394
dev_ctx, phi::IntArray(common::vectorize(out->dims())), 0, out);
395395
} else {

0 commit comments

Comments
 (0)