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

improve the performence of divide_double_grad #62533

Merged
merged 17 commits into from
Apr 1, 2024
Merged

improve the performence of divide_double_grad #62533

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
467d580
improve the performence of divide double grad
YibinLiu666 Mar 7, 2024
5563d5e
fix infermeta
YibinLiu666 Mar 7, 2024
2683315
update
YibinLiu666 Mar 9, 2024
f28f02b
fix some bug
YibinLiu666 Mar 11, 2024
4cd0aa2
fix bug and update test
YibinLiu666 Mar 12, 2024
fd22057
update
YibinLiu666 Mar 13, 2024
ef8f29d
fix bug
YibinLiu666 Mar 16, 2024
96c6cc6
update
YibinLiu666 Mar 16, 2024
a74a2fa
update
YibinLiu666 Mar 16, 2024
d22d848
update test
YibinLiu666 Mar 18, 2024
6c40ba6
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
YibinLiu666 Mar 24, 2024
87350dc
update ddout
YibinLiu666 Mar 24, 2024
0f8b0f4
update device
YibinLiu666 Mar 27, 2024
99e5281
add constant
YibinLiu666 Mar 27, 2024
8016cf5
update
YibinLiu666 Mar 27, 2024
a718d8e
fix bug
YibinLiu666 Mar 27, 2024
156198a
remove vlog
YibinLiu666 Mar 30, 2024
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: 1 addition & 0 deletions paddle/fluid/operators/elementwise/elementwise_div_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class ElementwiseDivDoubleGradMaker : public framework::SingleGradOpMaker<T> {
op->SetType("elementwise_div_grad_grad");
op->SetInput("Y", this->Input("Y"));
op->SetInput("Out", this->Input("Out"));
op->SetInput("Out@GRAD", this->Input(framework::GradVarName("Out")));
op->SetInput("DDX", this->OutputGrad(framework::GradVarName("X")));
op->SetInput("DDY", this->OutputGrad(framework::GradVarName("Y")));
op->SetInput("DX", this->Output(framework::GradVarName("X")));
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/ops_signature/elementwise_sig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ KernelSignature ElementwiseDivGradOpArgumentMapping(
KernelSignature ElementwiseDivDoubleGradOpArgumentMapping(
const ArgumentMappingContext& ctx UNUSED) {
return KernelSignature("divide_double_grad",
{"Y", "Out", "DX", "DDX", "DDY"},
{"Y", "Out", "Out@GRAD", "DX", "DDX", "DDY"},
{"axis"},
{"Y@GRAD", "DOut", "DDOut"});
}
Expand Down
6 changes: 3 additions & 3 deletions paddle/fluid/pir/dialect/operator/ir/ops_backward.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@

- backward_op : divide_double_grad
forward : divide_grad (Tensor x, Tensor y, Tensor out, Tensor grad_out, int axis = -1) -> Tensor(grad_x), Tensor(grad_y)
args : (Tensor y, Tensor out, Tensor grad_x, Tensor grad_x_grad, Tensor grad_y_grad, int axis = -1)
args : (Tensor y, Tensor out, Tensor grad_out, Tensor grad_x, Tensor grad_x_grad, Tensor grad_y_grad, int axis = -1)
output : Tensor(y_grad), Tensor(out_grad), Tensor(grad_out_grad)
infer_meta :
func : GeneralTernaryGradInferMeta
param : [y, grad_x, grad_x]
param : [y, out, out]
kernel :
func : divide_double_grad
data_type : out
optional : grad_x_grad, grad_y_grad
optional : grad_x, grad_x_grad, grad_y_grad
inplace : (grad_x_grad -> grad_out_grad)

- backward_op : divide_grad
Expand Down
6 changes: 3 additions & 3 deletions paddle/phi/api/yaml/legacy_backward.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@

- backward_op : divide_double_grad
forward : divide_grad (Tensor x, Tensor y, Tensor out, Tensor grad_out, int axis = -1) -> Tensor(grad_x), Tensor(grad_y)
args : (Tensor y, Tensor out, Tensor grad_x, Tensor grad_x_grad, Tensor grad_y_grad, int axis = -1)
args : (Tensor y, Tensor out, Tensor grad_out, Tensor grad_x, Tensor grad_x_grad, Tensor grad_y_grad, int axis = -1)
output : Tensor(y_grad), Tensor(out_grad), Tensor(grad_out_grad)
infer_meta :
func : GeneralTernaryGradInferMeta
param : [y, grad_x, grad_x]
param : [y, out, out]
kernel :
func : divide_double_grad
data_type : out
optional : grad_x_grad, grad_y_grad
optional : grad_x, grad_x_grad, grad_y_grad
inplace : (grad_x_grad -> grad_out_grad)

- backward_op : divide_grad
Expand Down
3 changes: 2 additions & 1 deletion paddle/phi/kernels/elementwise_divide_grad_kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ template <typename T, typename Context>
void DivideDoubleGradKernel(const Context& dev_ctx,
const DenseTensor& y,
const DenseTensor& out,
const DenseTensor& dx,
const DenseTensor& grad_out,
const paddle::optional<DenseTensor>& dx,
const paddle::optional<DenseTensor>& ddx,
const paddle::optional<DenseTensor>& ddy,
int axis,
Expand Down
6 changes: 4 additions & 2 deletions paddle/phi/kernels/funcs/common_shape.h
View file
Open in desktop
HydrogenSulfate marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ limitations under the License. */

#pragma once

#include "glog/logging.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
Expand Down Expand Up @@ -52,7 +53,7 @@ inline void GetBroadcastDimsArrays(const DDim &x_dims,
"Axis should be less than or equal to %d, but received axis is %d.",
max_dim,
axis));

VLOG(4) << "start get shape\n";
if (x_dims.size() > y_dims.size()) {
std::fill(y_dims_array, y_dims_array + axis, 1);
if (axis + y_dims.size() < max_dim) {
Expand All @@ -68,7 +69,7 @@ inline void GetBroadcastDimsArrays(const DDim &x_dims,
std::copy(x_dims.Get(), x_dims.Get() + x_dims.size(), x_dims_array + axis);
std::copy(y_dims.Get(), y_dims.Get() + y_dims.size(), y_dims_array);
}

VLOG(4) << "start for\n";
for (int i = 0; i < max_dim; ++i) {
PADDLE_ENFORCE_EQ(
x_dims_array[i] == y_dims_array[i] || x_dims_array[i] <= 1 ||
Expand All @@ -91,6 +92,7 @@ inline void GetBroadcastDimsArrays(const DDim &x_dims,
out_dims_array[i] = -1;
}
}
VLOG(4) << "end\n";
}

inline void GetPrePostNumel(
Expand Down
Loading