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

[Eager]Fix segment_pool/allclose/isclose/scale API bug #41506

Merged
merged 4 commits into from
Apr 8, 2022
Merged

[Eager]Fix segment_pool/allclose/isclose/scale API bug #41506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fa2862
[Eager]Fix segment_pool/allclose/isclose/scale API bug
Aurelius84 Apr 7, 2022
735c2e5
Merge branch 'develop' into fix_inter_unittest
Aurelius84 Apr 8, 2022
f30ec4d
fix kernel register problem
Aurelius84 Apr 8, 2022
5d82aec
Merge branch 'fix_inter_unittest' of github.com:Aurelius84/Paddle int…
Aurelius84 Apr 8, 2022
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
22 changes: 11 additions & 11 deletions paddle/fluid/operators/cast_op.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ namespace ops = paddle::operators;
namespace plat = paddle::platform;

using CUDA = paddle::platform::CUDADeviceContext;
#define REGISTER_CAST_CUDA_BASE(op_name, ...) \
REGISTER_OP_CUDA_KERNEL( \
op_name, ops::CastOpKernel<CUDA, float>, \
ops::CastOpKernel<CUDA, double>, ops::CastOpKernel<CUDA, int>, \
ops::CastOpKernel<CUDA, int64_t>, ops::CastOpKernel<CUDA, int16_t>, \
ops::CastOpKernel<CUDA, bool>, ops::CastOpKernel<CUDA, uint8_t>, \
ops::CastOpKernel<CUDA, plat::float16>, \
ops::CastOpKernel<CUDA, plat::complex<float>>, \
ops::CastOpKernel<CUDA, plat::complex<double>>, ##__VA_ARGS__);

// See [ why register transfer_dtype_op alias with cast_op? ] in cast_op.cc
REGISTER_CAST_CUDA_BASE(transfer_dtype, ops::CastOpKernel<CUDA, plat::bfloat16>)
REGISTER_OP_CUDA_KERNEL(transfer_dtype, ops::CastOpKernel<CUDA, float>,
ops::CastOpKernel<CUDA, double>,
ops::CastOpKernel<CUDA, int>,
ops::CastOpKernel<CUDA, int64_t>,
ops::CastOpKernel<CUDA, int16_t>,
ops::CastOpKernel<CUDA, bool>,
ops::CastOpKernel<CUDA, uint8_t>,
ops::CastOpKernel<CUDA, plat::float16>,
ops::CastOpKernel<CUDA, plat::complex<float>>,
ops::CastOpKernel<CUDA, plat::complex<double>>,
ops::CastOpKernel<CUDA, plat::bfloat16>);
2 changes: 1 addition & 1 deletion python/paddle/incubate/tensor/math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def segment_max(data, segment_ids, name=None):
"""

if in_dygraph_mode():
out = _C_ops.final_state_segment_pool(data, segment_ids, "MAX")[0]
out, tmp = _C_ops.final_state_segment_pool(data, segment_ids, "MAX")
Aurelius84 marked this conversation as resolved.
Show resolved Hide resolved
return out

if _non_static_mode():
Expand Down
14 changes: 12 additions & 2 deletions python/paddle/tensor/logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@ def allclose(x, y, rtol=1e-05, atol=1e-08, equal_nan=False, name=None):
"""

if in_dygraph_mode():
return _C_ops.final_state_allclose(x, y, rtol, atol, equal_nan)
# NOTE(dev): Pass tol as Tensor to fix precision loss problem, because
# C++ backend will cast it into float32 if passing float from python.
as_tensor = lambda x: paddle.to_tensor([x], dtype='float64', place='cpu')
return _C_ops.final_state_allclose(x, y,
as_tensor(rtol),
as_tensor(atol), equal_nan)
if _in_legacy_dygraph():
return _C_ops.allclose(x, y, 'rtol',
str(rtol), 'atol',
Expand Down Expand Up @@ -689,7 +694,12 @@ def isclose(x, y, rtol=1e-05, atol=1e-08, equal_nan=False, name=None):
"""

if in_dygraph_mode():
return _C_ops.final_state_isclose(x, y, rtol, atol, equal_nan)
# NOTE(dev): Pass tol as Tensor to fix precision loss problem, because
# C++ backend will cast it into float32 if passing float from python.
as_tensor = lambda x: paddle.to_tensor([x], dtype='float64', place='cpu')
return _C_ops.final_state_isclose(x, y,
as_tensor(rtol),
as_tensor(atol), equal_nan)
if _in_legacy_dygraph():
return _C_ops.isclose(x, y, 'rtol',
str(rtol), 'atol',
Expand Down
3 changes: 2 additions & 1 deletion python/paddle/utils/code_gen/backward.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@
forward : scale (Tensor x, Scalar scale, float bias, bool bias_after_scale) -> Tensor(out)
args : (Tensor out_grad, Scalar scale=1.0, float bias=0.0, bool bias_after_scale=true)
output : Tensor(x_grad)
invoke : scale(out_grad, scale, bias, bias_after_scale)
invoke : scale(out_grad, scale, 0.0, bias_after_scale)

- backward_api : scatter_grad
forward : scatter (Tensor x, Tensor index, Tensor updates, bool overwrite) -> Tensor(out)
Expand Down Expand Up @@ -1250,6 +1250,7 @@
param : [x]
kernel :
func : segment_pool_grad
data_type : x
optional : summed_ids

- backward_api : selu_grad
Expand Down