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

[PHI]fix momentum dtype infer #51353

Merged
merged 8 commits into from
Mar 24, 2023
Merged

[PHI]fix momentum dtype infer #51353

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e73f0c1
fix momentum dtype infer
AndPuQing Mar 8, 2023
d2304ba
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndPuQing Mar 14, 2023
dcc593e
fix momentum datatype
AndPuQing Mar 15, 2023
389b08b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndPuQing Mar 19, 2023
acb7bf2
fix on cpu
AndPuQing Mar 19, 2023
51fd61b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndPuQing Mar 20, 2023
a1f5ff8
add momentum
AndPuQing Mar 20, 2023
7362e83
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndPuQing Mar 23, 2023
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
1 change: 0 additions & 1 deletion paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ static std::set<std::string> OpsNeedSetOutputDtypeWhenRegisterPhiKernel = {
"less_equal",
"less_than",
"merged_adam",
"momentum",
"multiclass_nms3",
"multinomial",
"nanmedian",
Expand Down
7 changes: 6 additions & 1 deletion paddle/phi/infermeta/multiary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2108,10 +2108,15 @@ void MomentumInferMeta(const MetaTensor& param,

auto param_dim = param.dims();
param_out->set_dims(param_dim);
auto MPType = (param.dtype() == phi::DataType::FLOAT16 ||
param.dtype() == phi::DataType::BFLOAT16)
? phi::DataType::FLOAT32
: param.dtype();
velocity_out->set_dims(param_dim);

velocity_out->set_dtype(MPType);
if (master_param_out) {
master_param_out->set_dims(param_dim);
master_param_out->set_dtype(MPType);
}
}

Expand Down
10 changes: 8 additions & 2 deletions paddle/phi/kernels/cpu/momentum_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@
#include "paddle/phi/kernels/impl/momentum_kernel_impl.h"

PD_REGISTER_KERNEL(
momentum, CPU, ALL_LAYOUT, phi::MomentumDenseKernel, float, double) {}
momentum, CPU, ALL_LAYOUT, phi::MomentumDenseKernel, float, double) {
kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
AndPuQing marked this conversation as resolved.
Show resolved Hide resolved
kernel->OutputAt(2).SetDataType(phi::DataType::UNDEFINED);
}

PD_REGISTER_KERNEL(momentum_dense_param_sparse_grad,
CPU,
ALL_LAYOUT,
phi::MomentumSparseKernel,
float,
double) {}
double) {
kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
kernel->OutputAt(2).SetDataType(phi::DataType::UNDEFINED);
}
10 changes: 8 additions & 2 deletions paddle/phi/kernels/gpu/momentum_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ PD_REGISTER_KERNEL(momentum,
phi::MomentumDenseKernel,
float,
double,
phi::dtype::float16) {}
phi::dtype::float16) {
kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
kernel->OutputAt(2).SetDataType(phi::DataType::UNDEFINED);
}

PD_REGISTER_KERNEL(momentum_dense_param_sparse_grad,
GPU,
ALL_LAYOUT,
phi::MomentumSparseKernel,
float,
double,
phi::dtype::float16) {}
phi::dtype::float16) {
kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
kernel->OutputAt(2).SetDataType(phi::DataType::UNDEFINED);
}
5 changes: 4 additions & 1 deletion paddle/phi/kernels/xpu/momentum_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,7 @@ PD_REGISTER_KERNEL(momentum,
ALL_LAYOUT,
phi::MomentumDenseKernel,
float,
phi::dtype::float16) {}
phi::dtype::float16) {
kernel->OutputAt(1).SetDataType(phi::DataType::UNDEFINED);
kernel->OutputAt(2).SetDataType(phi::DataType::UNDEFINED);
}