From 851b828fc85539b7833c698645bef8aee28032c0 Mon Sep 17 00:00:00 2001 From: zhangyuqin1998 <2368719370@qq.com> Date: Mon, 3 Apr 2023 06:06:09 +0000 Subject: [PATCH] fix --- paddle/fluid/operators/bilinear_tensor_product_op.cc | 2 +- paddle/phi/api/yaml/legacy_ops.yaml | 2 +- paddle/phi/infermeta/multiary.cc | 12 ++++++------ paddle/phi/infermeta/multiary.h | 12 ++++++------ ..._product_grad_kernel.h => bilinear_grad_kernel.h} | 0 ...ear_tensor_product_kernel.h => bilinear_kernel.h} | 0 ...roduct_grad_kernel.cc => bilinear_grad_kernel.cc} | 4 ++-- ...r_tensor_product_kernel.cc => bilinear_kernel.cc} | 4 ++-- ...roduct_grad_kernel.cu => bilinear_grad_kernel.cu} | 4 ++-- ...r_tensor_product_kernel.cu => bilinear_kernel.cu} | 4 ++-- ...rad_kernel_impl.h => bilinear_grad_kernel_impl.h} | 0 ..._product_kernel_impl.h => bilinear_kernel_impl.h} | 0 12 files changed, 22 insertions(+), 22 deletions(-) rename paddle/phi/kernels/{bilinear_tensor_product_grad_kernel.h => bilinear_grad_kernel.h} (100%) rename paddle/phi/kernels/{bilinear_tensor_product_kernel.h => bilinear_kernel.h} (100%) rename paddle/phi/kernels/cpu/{bilinear_tensor_product_grad_kernel.cc => bilinear_grad_kernel.cc} (84%) rename paddle/phi/kernels/cpu/{bilinear_tensor_product_kernel.cc => bilinear_kernel.cc} (84%) rename paddle/phi/kernels/gpu/{bilinear_tensor_product_grad_kernel.cu => bilinear_grad_kernel.cu} (84%) rename paddle/phi/kernels/gpu/{bilinear_tensor_product_kernel.cu => bilinear_kernel.cu} (84%) rename paddle/phi/kernels/impl/{bilinear_tensor_product_grad_kernel_impl.h => bilinear_grad_kernel_impl.h} (100%) rename paddle/phi/kernels/impl/{bilinear_tensor_product_kernel_impl.h => bilinear_kernel_impl.h} (100%) diff --git a/paddle/fluid/operators/bilinear_tensor_product_op.cc b/paddle/fluid/operators/bilinear_tensor_product_op.cc index bda3a9daa28cb8..00586c4e1e4ab6 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_ops.yaml b/paddle/phi/api/yaml/legacy_ops.yaml index 2cbd507a5bdb64..6fb539a79d5d36 100755 --- a/paddle/phi/api/yaml/legacy_ops.yaml +++ b/paddle/phi/api/yaml/legacy_ops.yaml @@ -245,7 +245,7 @@ args : (Tensor x, Tensor y, Tensor weight, Tensor bias) output : Tensor infer_meta : - func : BilinearTensorProductInferMeta + func : BilinearInferMeta kernel : func : bilinear optional : bias diff --git a/paddle/phi/infermeta/multiary.cc b/paddle/phi/infermeta/multiary.cc index 009eca92b365f9..7d57c772a9265d 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 a8a74fdb5d32ef..cf6ca3c2a9fb6f 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 100% rename from paddle/phi/kernels/bilinear_tensor_product_grad_kernel.h rename to paddle/phi/kernels/bilinear_grad_kernel.h diff --git a/paddle/phi/kernels/bilinear_tensor_product_kernel.h b/paddle/phi/kernels/bilinear_kernel.h similarity index 100% rename from paddle/phi/kernels/bilinear_tensor_product_kernel.h rename to paddle/phi/kernels/bilinear_kernel.h diff --git a/paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc b/paddle/phi/kernels/cpu/bilinear_grad_kernel.cc similarity index 84% rename from paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc rename to paddle/phi/kernels/cpu/bilinear_grad_kernel.cc index 32a7bd7e5292f6..ecc12eabedc6b7 100644 --- a/paddle/phi/kernels/cpu/bilinear_tensor_product_grad_kernel.cc +++ b/paddle/phi/kernels/cpu/bilinear_grad_kernel.cc @@ -12,10 +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_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 84% rename from paddle/phi/kernels/cpu/bilinear_tensor_product_kernel.cc rename to paddle/phi/kernels/cpu/bilinear_kernel.cc index 2a4030b83878f1..71737d6a538d59 100644 --- a/paddle/phi/kernels/cpu/bilinear_tensor_product_kernel.cc +++ b/paddle/phi/kernels/cpu/bilinear_kernel.cc @@ -12,10 +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, 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 84% rename from paddle/phi/kernels/gpu/bilinear_tensor_product_grad_kernel.cu rename to paddle/phi/kernels/gpu/bilinear_grad_kernel.cu index 04590f81bf8a38..92308931a3257b 100644 --- a/paddle/phi/kernels/gpu/bilinear_tensor_product_grad_kernel.cu +++ b/paddle/phi/kernels/gpu/bilinear_grad_kernel.cu @@ -12,10 +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_grad, GPU, ALL_LAYOUT, phi::BilinearGradKernel, float, double) {} diff --git a/paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu b/paddle/phi/kernels/gpu/bilinear_kernel.cu similarity index 84% rename from paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu rename to paddle/phi/kernels/gpu/bilinear_kernel.cu index ac2ccb5a5af252..0d654361c412a5 100644 --- a/paddle/phi/kernels/gpu/bilinear_tensor_product_kernel.cu +++ b/paddle/phi/kernels/gpu/bilinear_kernel.cu @@ -12,10 +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, 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 100% rename from paddle/phi/kernels/impl/bilinear_tensor_product_grad_kernel_impl.h rename to paddle/phi/kernels/impl/bilinear_grad_kernel_impl.h diff --git a/paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h b/paddle/phi/kernels/impl/bilinear_kernel_impl.h similarity index 100% rename from paddle/phi/kernels/impl/bilinear_tensor_product_kernel_impl.h rename to paddle/phi/kernels/impl/bilinear_kernel_impl.h