fix kernel name

PaddlePaddle · Jun 22, 2022 · 89d8cc5 · 89d8cc5 · paddle-bot-old · Jun 22, 2022
1 parent 581f0e2
commit 89d8cc5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/paddle/phi/kernels/sparse/cpu/elementwise_grad_kernel.cc b/paddle/phi/kernels/sparse/cpu/elementwise_grad_kernel.cc
@@ -298,7 +298,7 @@ DEFINE_ELEMENTWISE_GRAD_KERNEL(Multiply)
 }  // namespace sparse
 }  // namespace phi
 
-PD_REGISTER_KERNEL(add_grad_csr,
+PD_REGISTER_KERNEL(add_csr_csr_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseAddCsrGradKernel,
@@ -312,7 +312,7 @@ PD_REGISTER_KERNEL(add_grad_csr,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(subtract_grad_csr,
+PD_REGISTER_KERNEL(subtract_csr_csr_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseSubtractCsrGradKernel,
@@ -326,7 +326,7 @@ PD_REGISTER_KERNEL(subtract_grad_csr,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(multiply_grad_csr,
+PD_REGISTER_KERNEL(multiply_csr_csr_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseMultiplyCsrGradKernel,
@@ -340,7 +340,7 @@ PD_REGISTER_KERNEL(multiply_grad_csr,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(divide_grad_csr,
+PD_REGISTER_KERNEL(divide_csr_csr_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseDivideCsrGradKernel,
@@ -355,7 +355,7 @@ PD_REGISTER_KERNEL(divide_grad_csr,
   kernel->InputAt(3).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(add_grad_coo,
+PD_REGISTER_KERNEL(add_coo_coo_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseAddCooGradKernel,
@@ -369,7 +369,7 @@ PD_REGISTER_KERNEL(add_grad_coo,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(subtract_grad_coo,
+PD_REGISTER_KERNEL(subtract_coo_coo_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseSubtractCooGradKernel,
@@ -383,7 +383,7 @@ PD_REGISTER_KERNEL(subtract_grad_coo,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(multiply_grad_coo,
+PD_REGISTER_KERNEL(multiply_coo_coo_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseMultiplyCooGradKernel,
@@ -397,7 +397,7 @@ PD_REGISTER_KERNEL(multiply_grad_coo,
   kernel->InputAt(2).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(divide_grad_coo,
+PD_REGISTER_KERNEL(divide_coo_coo_grad,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseDivideCooGradKernel,

diff --git a/paddle/phi/kernels/sparse/cpu/elementwise_kernel.cc b/paddle/phi/kernels/sparse/cpu/elementwise_kernel.cc
@@ -346,7 +346,7 @@ DEFINE_COO_ELEMENTWISE_KERNEL(Divide)
 }  // namespace sparse
 }  // namespace phi
 
-PD_REGISTER_KERNEL(add_csr,
+PD_REGISTER_KERNEL(add_csr_csr,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseAddCsrKernel,
@@ -359,7 +359,7 @@ PD_REGISTER_KERNEL(add_csr,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(add_coo,
+PD_REGISTER_KERNEL(add_coo_coo,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseAddCooKernel,
@@ -372,7 +372,7 @@ PD_REGISTER_KERNEL(add_coo,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(subtract_csr,
+PD_REGISTER_KERNEL(subtract_csr_csr,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseSubtractCsrKernel,
@@ -385,7 +385,7 @@ PD_REGISTER_KERNEL(subtract_csr,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(subtract_coo,
+PD_REGISTER_KERNEL(subtract_coo_coo,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseSubtractCooKernel,
@@ -398,7 +398,7 @@ PD_REGISTER_KERNEL(subtract_coo,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(multiply_csr,
+PD_REGISTER_KERNEL(multiply_csr_csr,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseMultiplyCsrKernel,
@@ -411,7 +411,7 @@ PD_REGISTER_KERNEL(multiply_csr,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(multiply_coo,
+PD_REGISTER_KERNEL(multiply_coo_coo,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseMultiplyCooKernel,
@@ -424,7 +424,7 @@ PD_REGISTER_KERNEL(multiply_coo,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_COO);
 }
 
-PD_REGISTER_KERNEL(divide_csr,
+PD_REGISTER_KERNEL(divide_csr_csr,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseDivideCsrKernel,
@@ -437,7 +437,7 @@ PD_REGISTER_KERNEL(divide_csr,
   kernel->InputAt(1).SetDataLayout(phi::DataLayout::SPARSE_CSR);
 }
 
-PD_REGISTER_KERNEL(divide_coo,
+PD_REGISTER_KERNEL(divide_coo_coo,
                    CPU,
                    ALL_LAYOUT,
                    phi::sparse::ElementWiseDivideCooKernel,

diff --git a/python/paddle/utils/code_gen/sparse_api.yaml b/python/paddle/utils/code_gen/sparse_api.yaml
@@ -2,8 +2,8 @@
   args : (Tensor x, Tensor y)
   output : Tensor(out)
   kernel :
-    func : add_coo{sparse_coo -> sparse_coo},
-           add_csr{sparse_csr -> sparse_csr}
+    func : add_coo_coo{sparse_coo -> sparse_coo},
+           add_csr_csr{sparse_csr -> sparse_csr}
     layout : x
   backward : add_grad
 
@@ -41,17 +41,17 @@
   args : (Tensor x, Tensor y)
   output : Tensor(out)
   kernel :
-    func : divide_coo{sparse_coo -> sparse_coo},
-           divide_csr{sparse_csr -> sparse_csr}
+    func : divide_coo_coo{sparse_coo -> sparse_coo},
+           divide_csr_csr{sparse_csr -> sparse_csr}
     layout : x
   backward : divide_grad
 
 - api : multiply
   args : (Tensor x, Tensor y)
   output : Tensor(out)
   kernel :
-    func : multiply_coo{sparse_coo -> sparse_coo},
-           multiply_csr{sparse_csr -> sparse_csr}
+    func : multiply_coo_coo{sparse_coo -> sparse_coo},
+           multiply_csr_csr{sparse_csr -> sparse_csr}
     layout : x
   backward : multiply_grad
 
@@ -86,8 +86,8 @@
   args : (Tensor x, Tensor y)
   output : Tensor(out)
   kernel :
-    func : subtract_coo{sparse_coo -> sparse_coo},
-           subtract_csr{sparse_csr -> sparse_csr}
+    func : subtract_coo_coo{sparse_coo -> sparse_coo},
+           subtract_csr_csr{sparse_csr -> sparse_csr}
     layout : x
   backward : subtract_grad
 

diff --git a/python/paddle/utils/code_gen/sparse_bw_api.yaml b/python/paddle/utils/code_gen/sparse_bw_api.yaml
@@ -3,8 +3,8 @@
   args : (Tensor x, Tensor y, Tensor out_grad)
   output : Tensor(x_grad), Tensor(y_grad)
   kernel :
-    func : add_grad_coo{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
-           add_grad_csr{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
+    func : add_coo_coo_grad{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
+           add_csr_csr_grad{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
 
 - backward_api : conv3d_grad
   forward : conv3d (Tensor x, Tensor kernel, int[] paddings, int[] dilations, int[] strides, int groups, bool subm) -> Tensor(out@SparseCooTensor), Tensor(rulebook@DenseTensor)
@@ -38,8 +38,8 @@
   args : (Tensor x, Tensor y, Tensor out, Tensor out_grad)
   output : Tensor(x_grad), Tensor(y_grad)
   kernel :
-    func : divide_grad_coo{sparse_coo, sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
-           divide_grad_csr{sparse_csr, sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
+    func : divide_coo_coo_grad{sparse_coo, sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
+           divide_csr_csr_grad{sparse_csr, sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
 
 - backward_api : masked_matmul_grad
   forward : masked_matmul(Tensor x, Tensor y, Tensor mask) -> Tensor(out)
@@ -60,8 +60,8 @@
   args : (Tensor x, Tensor y, Tensor out_grad)
   output : Tensor(x_grad), Tensor(y_grad)
   kernel :
-    func : multiply_grad_coo{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
-           multiply_grad_csr{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
+    func : multiply_coo_coo_grad{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
+           multiply_csr_csr_grad{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
 
 - backward_api : relu_grad
   forward : relu(Tensor x) -> Tensor(out)
@@ -96,8 +96,8 @@
   args : (Tensor x, Tensor y, Tensor out_grad)
   output : Tensor(x_grad), Tensor(y_grad)
   kernel :
-    func : subtract_grad_coo{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
-           subtract_grad_csr{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
+    func : subtract_coo_coo_grad{sparse_coo, sparse_coo, sparse_coo -> sparse_coo, sparse_coo},
+           subtract_csr_csr_grad{sparse_csr, sparse_csr, sparse_csr -> sparse_csr, sparse_csr}
 
 - backward_api : tanh_grad
   forward : tanh(Tensor x) -> Tensor(out)