From 3985db802a22ae849f12d19ae76befaa46b4679a Mon Sep 17 00:00:00 2001 From: enkilee Date: Tue, 7 Mar 2023 12:43:31 +0000 Subject: [PATCH 1/7] fix atan2 --- paddle/phi/kernels/cpu/atan2_kernel.cc | 4 +++- paddle/phi/kernels/gpu/atan2_kernel.cu | 4 +++- paddle/phi/kernels/xpu/atan_kernel.cc | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/paddle/phi/kernels/cpu/atan2_kernel.cc b/paddle/phi/kernels/cpu/atan2_kernel.cc index 4cb96ad8b6c6c..abc134fefee27 100644 --- a/paddle/phi/kernels/cpu/atan2_kernel.cc +++ b/paddle/phi/kernels/cpu/atan2_kernel.cc @@ -24,4 +24,6 @@ PD_REGISTER_KERNEL(atan2, double, phi::dtype::float16, int, - int64_t) {} + int64_t) { + kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); +} diff --git a/paddle/phi/kernels/gpu/atan2_kernel.cu b/paddle/phi/kernels/gpu/atan2_kernel.cu index 887c11c7e7ff1..dbaa265db9bbc 100644 --- a/paddle/phi/kernels/gpu/atan2_kernel.cu +++ b/paddle/phi/kernels/gpu/atan2_kernel.cu @@ -24,4 +24,6 @@ PD_REGISTER_KERNEL(atan2, double, phi::dtype::float16, int, - int64_t) {} + int64_t) { + kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); +} diff --git a/paddle/phi/kernels/xpu/atan_kernel.cc b/paddle/phi/kernels/xpu/atan_kernel.cc index 3252a03bc158d..5be2c0144dce6 100644 --- a/paddle/phi/kernels/xpu/atan_kernel.cc +++ b/paddle/phi/kernels/xpu/atan_kernel.cc @@ -36,4 +36,6 @@ void AtanKernel(const Context& dev_ctx, } // namespace phi PD_REGISTER_KERNEL( - atan, XPU, ALL_LAYOUT, phi::AtanKernel, float, phi::dtype::float16) {} + atan, XPU, ALL_LAYOUT, phi::AtanKernel, float, phi::dtype::float16) { + kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); +} From 00ac6c80de25ac93f0566252718b8d5049292738 Mon Sep 17 00:00:00 2001 From: enkilee Date: Tue, 7 Mar 2023 13:15:40 +0000 Subject: [PATCH 2/7] fix --- .../fluid/framework/new_executor/interpreter/interpreter_util.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc index 2fb277e9032b2..b7b6af469c0f8 100644 --- a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc +++ b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc @@ -61,7 +61,6 @@ static std::set OpsNeedSetOutputDtypeWhenRegisterPhiKernel = { "argmax", "argmin", "as_real", - "atan2", "auc", "bincount", "clip_by_norm", From 6f3a6da0598e36cc9c876d779c9a3ef6b15bd497 Mon Sep 17 00:00:00 2001 From: enkilee Date: Wed, 8 Mar 2023 14:29:04 +0000 Subject: [PATCH 3/7] fix --- paddle/phi/kernels/cpu/atan2_kernel.cc | 2 +- paddle/phi/kernels/gpu/atan2_kernel.cu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paddle/phi/kernels/cpu/atan2_kernel.cc b/paddle/phi/kernels/cpu/atan2_kernel.cc index abc134fefee27..20bd8d2af385a 100644 --- a/paddle/phi/kernels/cpu/atan2_kernel.cc +++ b/paddle/phi/kernels/cpu/atan2_kernel.cc @@ -25,5 +25,5 @@ PD_REGISTER_KERNEL(atan2, phi::dtype::float16, int, int64_t) { - kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); + kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::UNDEFINED); } diff --git a/paddle/phi/kernels/gpu/atan2_kernel.cu b/paddle/phi/kernels/gpu/atan2_kernel.cu index dbaa265db9bbc..e1f1727d3a20b 100644 --- a/paddle/phi/kernels/gpu/atan2_kernel.cu +++ b/paddle/phi/kernels/gpu/atan2_kernel.cu @@ -25,5 +25,5 @@ PD_REGISTER_KERNEL(atan2, phi::dtype::float16, int, int64_t) { - kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); + kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::UNDEFINED); } From 4801b759a3b5c20b8bdaf3e98df001ea3a5ed831 Mon Sep 17 00:00:00 2001 From: enkilee Date: Fri, 10 Mar 2023 12:48:00 +0000 Subject: [PATCH 4/7] fix --- paddle/phi/kernels/xpu/atan_kernel.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/paddle/phi/kernels/xpu/atan_kernel.cc b/paddle/phi/kernels/xpu/atan_kernel.cc index 5be2c0144dce6..3252a03bc158d 100644 --- a/paddle/phi/kernels/xpu/atan_kernel.cc +++ b/paddle/phi/kernels/xpu/atan_kernel.cc @@ -36,6 +36,4 @@ void AtanKernel(const Context& dev_ctx, } // namespace phi PD_REGISTER_KERNEL( - atan, XPU, ALL_LAYOUT, phi::AtanKernel, float, phi::dtype::float16) { - kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::FLOAT64); -} + atan, XPU, ALL_LAYOUT, phi::AtanKernel, float, phi::dtype::float16) {} From 1610b24504d5241cf096e2b789d010b6f6bdec56 Mon Sep 17 00:00:00 2001 From: enkilee Date: Tue, 14 Mar 2023 12:04:47 +0000 Subject: [PATCH 5/7] fix error --- .../framework/new_executor/interpreter/interpreter_util.cc | 2 -- paddle/phi/infermeta/binary.cc | 5 +++++ paddle/phi/kernels/cpu/atan2_kernel.cc | 2 +- paddle/phi/kernels/gpu/atan2_kernel.cu | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc index 6bc9753ff1c45..d9e82d6fea6bf 100644 --- a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc +++ b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc @@ -58,8 +58,6 @@ static std::set OpsNeedSetOutputDtypeWhenRegisterPhiKernel = { "angle", "any_raw", "arg_sort", - "auc", - "bincount", "clip_by_norm", "complex", "conv3d_coo", diff --git a/paddle/phi/infermeta/binary.cc b/paddle/phi/infermeta/binary.cc index 6544ec983fa75..95053967203f0 100644 --- a/paddle/phi/infermeta/binary.cc +++ b/paddle/phi/infermeta/binary.cc @@ -166,6 +166,11 @@ void Atan2InferMeta(const MetaTensor& x, const MetaTensor& y, MetaTensor* out) { if (x.dtype() == DataType::INT32 || x.dtype() == DataType::INT64 || y.dtype() == DataType::INT32 || y.dtype() == DataType::INT64) { out->set_dtype(DataType::FLOAT64); + } else if (x.dtype() == DataType::FLOAT16 || x.dtype() == DataType::FLOAT16 || + y.dtype() == DataType::FLOAT16 || y.dtype() == DataType::FLOAT16) { + out->set_dtype(DataType::FLOAT16); + } else { + out->set_dtype(DataType::FLOAT32); } } diff --git a/paddle/phi/kernels/cpu/atan2_kernel.cc b/paddle/phi/kernels/cpu/atan2_kernel.cc index 20bd8d2af385a..640e4f479e0fa 100644 --- a/paddle/phi/kernels/cpu/atan2_kernel.cc +++ b/paddle/phi/kernels/cpu/atan2_kernel.cc @@ -25,5 +25,5 @@ PD_REGISTER_KERNEL(atan2, phi::dtype::float16, int, int64_t) { - kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::UNDEFINED); + kernel->OutputAt(0).SetDataType(phi::DataType::UNDEFINED); } diff --git a/paddle/phi/kernels/gpu/atan2_kernel.cu b/paddle/phi/kernels/gpu/atan2_kernel.cu index e1f1727d3a20b..d77c21473b4c4 100644 --- a/paddle/phi/kernels/gpu/atan2_kernel.cu +++ b/paddle/phi/kernels/gpu/atan2_kernel.cu @@ -25,5 +25,5 @@ PD_REGISTER_KERNEL(atan2, phi::dtype::float16, int, int64_t) { - kernel->OutputAt(0).SetDataType(paddle::experimental::DataType::UNDEFINED); + kernel->OutputAt(0).SetDataType(phi::DataType::UNDEFINED); } From 349e64f4da52512d2605e4cdad5313fc2fbb3ae2 Mon Sep 17 00:00:00 2001 From: enkilee Date: Tue, 14 Mar 2023 12:06:34 +0000 Subject: [PATCH 6/7] fix error --- paddle/phi/infermeta/binary.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/paddle/phi/infermeta/binary.cc b/paddle/phi/infermeta/binary.cc index faeea9b85150e..da3723a4085bd 100644 --- a/paddle/phi/infermeta/binary.cc +++ b/paddle/phi/infermeta/binary.cc @@ -169,6 +169,9 @@ void Atan2InferMeta(const MetaTensor& x, const MetaTensor& y, MetaTensor* out) { } else if (x.dtype() == DataType::FLOAT16 || x.dtype() == DataType::FLOAT16 || y.dtype() == DataType::FLOAT16 || y.dtype() == DataType::FLOAT16) { out->set_dtype(DataType::FLOAT16); + } else if (x.dtype() == DataType::FLOAT64 || x.dtype() == DataType::FLOAT64 || + y.dtype() == DataType::FLOAT64 || y.dtype() == DataType::FLOAT64) { + out->set_dtype(DataType::FLOAT64); } else { out->set_dtype(DataType::FLOAT32); } From 3d26a158c68ea806d2b674f5880d46a816af8422 Mon Sep 17 00:00:00 2001 From: enkilee Date: Wed, 15 Mar 2023 11:23:42 +0000 Subject: [PATCH 7/7] fix --- paddle/phi/infermeta/binary.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/paddle/phi/infermeta/binary.cc b/paddle/phi/infermeta/binary.cc index da3723a4085bd..64ba5d7cbb3ac 100644 --- a/paddle/phi/infermeta/binary.cc +++ b/paddle/phi/infermeta/binary.cc @@ -166,14 +166,8 @@ void Atan2InferMeta(const MetaTensor& x, const MetaTensor& y, MetaTensor* out) { if (x.dtype() == DataType::INT32 || x.dtype() == DataType::INT64 || y.dtype() == DataType::INT32 || y.dtype() == DataType::INT64) { out->set_dtype(DataType::FLOAT64); - } else if (x.dtype() == DataType::FLOAT16 || x.dtype() == DataType::FLOAT16 || - y.dtype() == DataType::FLOAT16 || y.dtype() == DataType::FLOAT16) { - out->set_dtype(DataType::FLOAT16); - } else if (x.dtype() == DataType::FLOAT64 || x.dtype() == DataType::FLOAT64 || - y.dtype() == DataType::FLOAT64 || y.dtype() == DataType::FLOAT64) { - out->set_dtype(DataType::FLOAT64); } else { - out->set_dtype(DataType::FLOAT32); + out->set_dtype(x.dtype()); } }