From 34069c464b7cd6be501d2885647f35b45c5238bc Mon Sep 17 00:00:00 2001 From: zhangyuqin1998 <75946871+zhangyuqin1998@users.noreply.github.com> Date: Tue, 4 Apr 2023 10:02:46 +0800 Subject: [PATCH] rename_bilinear_tensor_product (#52375) * rename_bilinear_tensor_product * fix --- .../operators/bilinear_tensor_product_op.cc | 2 +- paddle/phi/api/yaml/legacy_backward.yaml | 2 +- paddle/phi/api/yaml/legacy_ops.yaml | 4 ++-- paddle/phi/infermeta/multiary.cc | 12 ++++++------ paddle/phi/infermeta/multiary.h | 12 ++++++------ ...ct_grad_kernel.h => bilinear_grad_kernel.h} | 18 +++++++++--------- ...nsor_product_kernel.h => bilinear_kernel.h} | 12 ++++++------ .../bilinear_grad_kernel.cc} | 12 ++++-------- ...or_product_kernel.cc => bilinear_kernel.cc} | 12 ++++-------- ..._grad_kernel.cu => bilinear_grad_kernel.cu} | 12 ++++-------- .../bilinear_kernel.cu} | 12 ++++-------- ...rnel_impl.h => bilinear_grad_kernel_impl.h} | 18 +++++++++--------- ...ct_kernel_impl.h => bilinear_kernel_impl.h} | 12 ++++++------ .../ops/compat/bilinear_tensor_product_sig.cc | 5 ++--- 14 files changed, 64 insertions(+), 81 deletions(-) rename paddle/phi/kernels/{bilinear_tensor_product_grad_kernel.h => bilinear_grad_kernel.h} (58%) rename paddle/phi/kernels/{bilinear_tensor_product_kernel.h => bilinear_kernel.h} (69%) rename paddle/phi/kernels/{gpu/bilinear_tensor_product_kernel.cu => cpu/bilinear_grad_kernel.cc} (66%) rename paddle/phi/kernels/cpu/{bilinear_tensor_product_kernel.cc => bilinear_kernel.cc} (66%) rename paddle/phi/kernels/gpu/{bilinear_tensor_product_grad_kernel.cu => bilinear_grad_kernel.cu} (64%) rename paddle/phi/kernels/{cpu/bilinear_tensor_product_grad_kernel.cc => gpu/bilinear_kernel.cu} (64%) rename paddle/phi/kernels/impl/{bilinear_tensor_product_grad_kernel_impl.h => bilinear_grad_kernel_impl.h} (88%) rename paddle/phi/kernels/impl/{bilinear_tensor_product_kernel_impl.h => bilinear_kernel_impl.h} (88%) diff --git a/paddle/fluid/operators/bilinear_tensor_product_op.cc b/paddle/fluid/operators/bilinear_tensor_product_op.cc index bda3a9daa28..00586c4e1e4 100644 --- a/paddle/fluid/operators/bilinear_tensor_product_op.cc +++ b/paddle/fluid/operators/bilinear_tensor_product_op.cc @@ -92,7 +92,7 @@ namespace ops = paddle::operators; DECLARE_INFER_SHAPE_FUNCTOR(bilinear_tensor_product, BilinearTensorProductInferShapeFunctor, - PD_INFER_META(phi::BilinearTensorProductInferMeta)); + PD_INFER_META(phi::BilinearInferMeta)); DECLARE_INFER_SHAPE_FUNCTOR( bilinear_tensor_product_grad, BilinearTensorProductGradInferShapeFunctor, diff --git a/paddle/phi/api/yaml/legacy_backward.yaml b/paddle/phi/api/yaml/legacy_backward.yaml index ddb2863cf48..abaed30687e 100755 --- a/paddle/phi/api/yaml/legacy_backward.yaml +++ b/paddle/phi/api/yaml/legacy_backward.yaml @@ -152,7 +152,7 @@ infer_meta : func : BilinearTensorProductGradInferMeta kernel : - func : bilinear_tensor_product_grad + func : bilinear_grad - backward_op : cast_grad forward : cast (Tensor x, DataType dtype) -> Tensor(out) diff --git a/paddle/phi/api/yaml/legacy_ops.yaml b/paddle/phi/api/yaml/legacy_ops.yaml index 92cc67bc9da..9b317a27f72 100755 --- a/paddle/phi/api/yaml/legacy_ops.yaml +++ b/paddle/phi/api/yaml/legacy_ops.yaml @@ -227,9 +227,9 @@ args : (Tensor x, Tensor y, Tensor weight, Tensor bias) output : Tensor infer_meta : - func : BilinearTensorProductInferMeta + func : BilinearInferMeta kernel : - func : bilinear_tensor_product + func : bilinear optional : bias backward : bilinear_tensor_product_grad diff --git a/paddle/phi/infermeta/multiary.cc b/paddle/phi/infermeta/multiary.cc index a9ed20466b1..ea93a587493 100644 --- a/paddle/phi/infermeta/multiary.cc +++ b/paddle/phi/infermeta/multiary.cc @@ -695,12 +695,12 @@ void BatchNormInferInferMeta(const MetaTensor& x, config); } -void BilinearTensorProductInferMeta(const MetaTensor& x, - const MetaTensor& y, - const MetaTensor& weight, - const MetaTensor& bias, - MetaTensor* out, - MetaConfig config) { +void BilinearInferMeta(const MetaTensor& x, + const MetaTensor& y, + const MetaTensor& weight, + const MetaTensor& bias, + MetaTensor* out, + MetaConfig config) { auto x_dims = x.dims(); auto y_dims = y.dims(); auto weight_dims = weight.dims(); diff --git a/paddle/phi/infermeta/multiary.h b/paddle/phi/infermeta/multiary.h index a8a74fdb5d3..cf6ca3c2a9f 100644 --- a/paddle/phi/infermeta/multiary.h +++ b/paddle/phi/infermeta/multiary.h @@ -198,12 +198,12 @@ void BatchNormInferInferMeta(const MetaTensor& x, MetaTensor* variance_out, MetaConfig config = MetaConfig()); -void BilinearTensorProductInferMeta(const MetaTensor& x, - const MetaTensor& y, - const MetaTensor& weight, - const MetaTensor& bias, - MetaTensor* out, - MetaConfig config = MetaConfig()); +void BilinearInferMeta(const MetaTensor& x, + const MetaTensor& y, + const MetaTensor& weight, + const MetaTensor& bias, + MetaTensor* out, + MetaConfig config = MetaConfig()); void BroadcastTensorsInferMeta(const std::vector& x, std::vector out); diff --git a/paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h b/paddle/phi/kernels/bilinear_grad_kernel.h similarity index 58% rename from paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h rename to paddle/phi/kernels/bilinear_grad_kernel.h index 499aa1e0b2e..a4d55d8f2d2 100644 --- a/paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h +++ b/paddle/phi/kernels/bilinear_grad_kernel.h @@ -19,14 +19,14 @@ namespace phi { template -void BilinearTensorProductGradKernel(const Context& dev_ctx, - const DenseTensor& x, - const DenseTensor& y, - const DenseTensor& weight, - const DenseTensor& dout, - DenseTensor* dx, - DenseTensor* dy, - DenseTensor* dweight, - DenseTensor* dbias); +void BilinearGradKernel(const Context& dev_ctx, + const DenseTensor& x, + const DenseTensor& y, + const DenseTensor& weight, + const DenseTensor& dout, + DenseTensor* dx, + DenseTensor* dy, + DenseTensor* dweight, + DenseTensor* dbias); } // namespace phi diff --git a/paddle/phi/kernels/bilinear_tensor_product_kernel.h b/paddle/phi/kernels/bilinear_kernel.h similarity index 69% rename from paddle/phi/kernels/bilinear_tensor_product_kernel.h rename to paddle/phi/kernels/bilinear_kernel.h index bd01ed94868..dd1fd877ff4 100644 --- a/paddle/phi/kernels/bilinear_tensor_product_kernel.h +++ b/paddle/phi/kernels/bilinear_kernel.h @@ -20,11 +20,11 @@ namespace phi { template -void BilinearTensorProductKernel(const Context& dev_ctx, - const DenseTensor& x, - const DenseTensor& y, - const DenseTensor& weight, - const paddle::optional& bias, - DenseTensor* out); +void BilinearKernel(const Context& dev_ctx, + const DenseTensor& x, + const DenseTensor& y, + const DenseTensor& weight, + const paddle::optional& bias, + DenseTensor* out); } // namespace phi diff --git a/paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu b/paddle/phi/kernels/cpu/bilinear_grad_kernel.cc similarity index 66% rename from paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu rename to paddle/phi/kernels/cpu/bilinear_grad_kernel.cc index 201650f9649..ecc12eabedc 100644 --- a/paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu +++ b/paddle/phi/kernels/cpu/bilinear_grad_kernel.cc @@ -12,14 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/phi/kernels/bilinear_tensor_product_kernel.h" +#include "paddle/phi/kernels/bilinear_grad_kernel.h" #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h" +#include "paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h" -PD_REGISTER_KERNEL(bilinear_tensor_product, - GPU, - ALL_LAYOUT, - phi::BilinearTensorProductKernel, - float, - double) {} +PD_REGISTER_KERNEL( + bilinear_grad, CPU, ALL_LAYOUT, phi::BilinearGradKernel, float, double) {} diff --git a/paddle/phi/kernels/cpu/bilinear_tensor_product_kernel.cc b/paddle/phi/kernels/cpu/bilinear_kernel.cc similarity index 66% rename from paddle/phi/kernels/cpu/bilinear_tensor_product_kernel.cc rename to paddle/phi/kernels/cpu/bilinear_kernel.cc index d8226564182..71737d6a538 100644 --- a/paddle/phi/kernels/cpu/bilinear_tensor_product_kernel.cc +++ b/paddle/phi/kernels/cpu/bilinear_kernel.cc @@ -12,14 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/phi/kernels/bilinear_tensor_product_kernel.h" +#include "paddle/phi/kernels/bilinear_kernel.h" #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h" +#include "paddle/phi/kernels/impl/bilinear_kernel_impl.h" -PD_REGISTER_KERNEL(bilinear_tensor_product, - CPU, - ALL_LAYOUT, - phi::BilinearTensorProductKernel, - float, - double) {} +PD_REGISTER_KERNEL( + bilinear, CPU, ALL_LAYOUT, phi::BilinearKernel, float, double) {} diff --git a/paddle/phi/kernels/gpu/bilinear_tensor_product_grad_kernel.cu b/paddle/phi/kernels/gpu/bilinear_grad_kernel.cu similarity index 64% rename from paddle/phi/kernels/gpu/bilinear_tensor_product_grad_kernel.cu rename to paddle/phi/kernels/gpu/bilinear_grad_kernel.cu index 907b84b0a35..92308931a32 100644 --- a/paddle/phi/kernels/gpu/bilinear_tensor_product_grad_kernel.cu +++ b/paddle/phi/kernels/gpu/bilinear_grad_kernel.cu @@ -12,14 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h" +#include "paddle/phi/kernels/bilinear_grad_kernel.h" #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h" +#include "paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h" -PD_REGISTER_KERNEL(bilinear_tensor_product_grad, - GPU, - ALL_LAYOUT, - phi::BilinearTensorProductGradKernel, - float, - double) {} +PD_REGISTER_KERNEL( + bilinear_grad, GPU, ALL_LAYOUT, phi::BilinearGradKernel, float, double) {} diff --git a/paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc b/paddle/phi/kernels/gpu/bilinear_kernel.cu similarity index 64% rename from paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc rename to paddle/phi/kernels/gpu/bilinear_kernel.cu index ef7e8a981c5..0d654361c41 100644 --- a/paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc +++ b/paddle/phi/kernels/gpu/bilinear_kernel.cu @@ -12,14 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h" +#include "paddle/phi/kernels/bilinear_kernel.h" #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h" +#include "paddle/phi/kernels/impl/bilinear_kernel_impl.h" -PD_REGISTER_KERNEL(bilinear_tensor_product_grad, - CPU, - ALL_LAYOUT, - phi::BilinearTensorProductGradKernel, - float, - double) {} +PD_REGISTER_KERNEL( + bilinear, GPU, ALL_LAYOUT, phi::BilinearKernel, float, double) {} diff --git a/paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h b/paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h similarity index 88% rename from paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h rename to paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h index c199833b42a..dac527e2442 100644 --- a/paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h +++ b/paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h @@ -21,15 +21,15 @@ namespace phi { template -void BilinearTensorProductGradKernel(const Context& ctx, - const DenseTensor& x, - const DenseTensor& y, - const DenseTensor& weight, - const DenseTensor& dout, - DenseTensor* dx, - DenseTensor* dy, - DenseTensor* dweight, - DenseTensor* dbias) { +void BilinearGradKernel(const Context& ctx, + const DenseTensor& x, + const DenseTensor& y, + const DenseTensor& weight, + const DenseTensor& dout, + DenseTensor* dx, + DenseTensor* dy, + DenseTensor* dweight, + DenseTensor* dbias) { auto batch_size = x.dims()[0]; auto weight_dims = weight.dims(); int out_dim = weight_dims[0]; diff --git a/paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h b/paddle/phi/kernels/impl/bilinear_kernel_impl.h similarity index 88% rename from paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h rename to paddle/phi/kernels/impl/bilinear_kernel_impl.h index 4a2e41532e9..12ad7eda263 100644 --- a/paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h +++ b/paddle/phi/kernels/impl/bilinear_kernel_impl.h @@ -22,12 +22,12 @@ namespace phi { template -void BilinearTensorProductKernel(const Context& ctx, - const DenseTensor& x, - const DenseTensor& y, - const DenseTensor& weight, - const paddle::optional& bias, - DenseTensor* out) { +void BilinearKernel(const Context& ctx, + const DenseTensor& x, + const DenseTensor& y, + const DenseTensor& weight, + const paddle::optional& bias, + DenseTensor* out) { ctx.template Alloc(out); auto y_mat = EigenMatrix::From(y); diff --git a/paddle/phi/ops/compat/bilinear_tensor_product_sig.cc b/paddle/phi/ops/compat/bilinear_tensor_product_sig.cc index 95a867fd3f7..54509e4b2de 100644 --- a/paddle/phi/ops/compat/bilinear_tensor_product_sig.cc +++ b/paddle/phi/ops/compat/bilinear_tensor_product_sig.cc @@ -18,13 +18,12 @@ namespace phi { KernelSignature BilinearTensorProductOpArgumentMapping( const ArgumentMappingContext& ctx) { - return KernelSignature( - "bilinear_tensor_product", {"X", "Y", "Weight", "Bias"}, {}, {"Out"}); + return KernelSignature("bilinear", {"X", "Y", "Weight", "Bias"}, {}, {"Out"}); } KernelSignature BilinearTensorProductGradOpArgumentMapping( const ArgumentMappingContext& ctx) { - return KernelSignature("bilinear_tensor_product_grad", + return KernelSignature("bilinear_grad", {"X", "Y", "Weight", "Out@GRAD"}, {}, {"X@GRAD", "Y@GRAD", "Weight@GRAD", "Bias@GRAD"}); -- GitLab