Fix

PaddlePaddle · Aug 30, 2024 · 62d1dc7 · 62d1dc7
1 parent 1794f42
commit 62d1dc7
Show file tree

Hide file tree

Showing 22 changed files with 337 additions and 1,155 deletions.
diff --git a/paddle/fluid/operators/matmul_op.cc b/paddle/fluid/operators/matmul_op.cc
@@ -946,51 +946,6 @@ REGISTER_OPERATOR(matmul_grad,
                   ops::MatMulOpDoubleGradMaker<paddle::framework::OpDesc>,
                   ops::MatMulOpDoubleGradMaker<paddle::imperative::OpBase>);
 REGISTER_OPERATOR(matmul_grad_grad, ops::MatMulOpDoubleGrad);
-REGISTER_OP_CPU_KERNEL(matmul,
-                       ops::MatMulKernel<phi::CPUContext, float>,
-                       ops::MatMulKernel<phi::CPUContext, double>);
-REGISTER_OP_CPU_KERNEL(matmul_grad,
-                       ops::MatMulGradKernel<phi::CPUContext, float>,
-                       ops::MatMulGradKernel<phi::CPUContext, double>);
-
-REGISTER_OP_CPU_KERNEL(matmul_grad_grad,
-                       ops::MatMulDoubleGradKernel<phi::CPUContext, float>,
-                       ops::MatMulDoubleGradKernel<phi::CPUContext, double>);
-
-#if defined(PADDLE_WITH_HIP)
-REGISTER_OP_CUDA_KERNEL(
-    matmul,
-    ops::MatMulKernel<phi::GPUContext, int8_t>,
-    ops::MatMulKernel<phi::GPUContext, float>,
-    ops::MatMulKernel<phi::GPUContext, double>,
-    ops::MatMulKernel<phi::GPUContext, phi::dtype::float16>);
-#endif
-
-#if defined(PADDLE_WITH_CUDA)
-#if CUDA_VERSION >= 11060
-REGISTER_OP_CUDA_KERNEL(
-    matmul,
-    ops::MatMulKernel<phi::GPUContext, int8_t>,
-    ops::MatMulKernel<phi::GPUContext, float>,
-    ops::MatMulKernel<phi::GPUContext, double>,
-    ops::MatMulKernel<phi::GPUContext, phi::dtype::float16>);
-#else
-REGISTER_OP_CUDA_KERNEL(
-    matmul,
-    ops::MatMulKernel<phi::GPUContext, float>,
-    ops::MatMulKernel<phi::GPUContext, double>,
-    ops::MatMulKernel<phi::GPUContext, phi::dtype::float16>);
-#endif
-#endif
-
-REGISTER_OP_CUDA_KERNEL(
-    matmul_grad,
-    ops::MatMulGradKernel<phi::GPUContext, float>,
-    ops::MatMulGradKernel<phi::GPUContext, double>,
-    ops::MatMulGradKernel<phi::GPUContext, phi::dtype::float16>);
-REGISTER_OP_CUDA_KERNEL(matmul_grad_grad,
-                        ops::MatMulDoubleGradKernel<phi::GPUContext, float>,
-                        ops::MatMulDoubleGradKernel<phi::GPUContext, double>);
 
 REGISTER_OP_VERSION(matmul).AddCheckpoint(
     R"ROC(Register matmul for adding the attribute of

diff --git a/paddle/fluid/operators/matmul_op_xpu.cc b/paddle/fluid/operators/matmul_op_xpu.cc