From 60857b0f2c8bd8cd96ce75277920da44255037f4 Mon Sep 17 00:00:00 2001 From: zhouwei25 Date: Mon, 13 Jun 2022 15:04:54 +0000 Subject: [PATCH] fix comment --- paddle/fluid/pybind/eager_method.cc | 2 -- .../sparse/cpu/{sparse_full_kernel.cc => full_kernel.cc} | 4 +++- .../cpu/{sparse_mm_grad_kernel.cc => matmul_grad_kernel.cc} | 2 +- .../sparse/cpu/{sparse_mm_kernel.cc => matmul_kernel.cc} | 2 +- .../kernels/sparse/{sparse_full_kernel.h => full_kernel.h} | 4 ---- .../sparse/gpu/{sparse_full_kernel.cu => full_kernel.cu} | 4 +++- .../gpu/{sparse_mm_grad_kernel.cu => matmul_grad_kernel.cu} | 4 +++- .../sparse/gpu/{sparse_mm_kernel.cu => matmul_kernel.cu} | 2 +- .../sparse/{sparse_mm_grad_kernel.h => matmul_grad_kernel.h} | 0 .../kernels/sparse/{sparse_mm_kernel.h => matmul_kernel.h} | 0 10 files changed, 12 insertions(+), 12 deletions(-) rename paddle/phi/kernels/sparse/cpu/{sparse_full_kernel.cc => full_kernel.cc} (96%) rename paddle/phi/kernels/sparse/cpu/{sparse_mm_grad_kernel.cc => matmul_grad_kernel.cc} (97%) rename paddle/phi/kernels/sparse/cpu/{sparse_mm_kernel.cc => matmul_kernel.cc} (97%) rename paddle/phi/kernels/sparse/{sparse_full_kernel.h => full_kernel.h} (92%) rename paddle/phi/kernels/sparse/gpu/{sparse_full_kernel.cu => full_kernel.cu} (96%) rename paddle/phi/kernels/sparse/gpu/{sparse_mm_grad_kernel.cu => matmul_grad_kernel.cu} (98%) rename paddle/phi/kernels/sparse/gpu/{sparse_mm_kernel.cu => matmul_kernel.cu} (99%) rename paddle/phi/kernels/sparse/{sparse_mm_grad_kernel.h => matmul_grad_kernel.h} (100%) rename paddle/phi/kernels/sparse/{sparse_mm_kernel.h => matmul_kernel.h} (100%) diff --git a/paddle/fluid/pybind/eager_method.cc b/paddle/fluid/pybind/eager_method.cc index 871e57570d9fd..f41e84537a96c 100644 --- a/paddle/fluid/pybind/eager_method.cc +++ b/paddle/fluid/pybind/eager_method.cc @@ -1777,8 +1777,6 @@ PyMethodDef variable_methods[] = { METH_VARARGS | METH_KEYWORDS, NULL}, {"cols", (PyCFunction)(void (*)(void))tensor_method_get_non_zero_cols, METH_VARARGS | METH_KEYWORDS, NULL}, - {"is_dense", (PyCFunction)(void (*)(void))tensor_method_is_dense, - METH_VARARGS | METH_KEYWORDS, NULL}, {"is_sparse", (PyCFunction)(void (*)(void))tensor_method_is_sparse, METH_VARARGS | METH_KEYWORDS, NULL}, {"is_sparse_coo", (PyCFunction)(void (*)(void))tensor_method_is_sparse_coo, diff --git a/paddle/phi/kernels/sparse/cpu/sparse_full_kernel.cc b/paddle/phi/kernels/sparse/cpu/full_kernel.cc similarity index 96% rename from paddle/phi/kernels/sparse/cpu/sparse_full_kernel.cc rename to paddle/phi/kernels/sparse/cpu/full_kernel.cc index de0da7a852505..3c8be16626202 100644 --- a/paddle/phi/kernels/sparse/cpu/sparse_full_kernel.cc +++ b/paddle/phi/kernels/sparse/cpu/full_kernel.cc @@ -12,10 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/phi/kernels/sparse/sparse_full_kernel.h" +#include "paddle/phi/kernels/sparse/full_kernel.h" #include "paddle/phi/backends/cpu/cpu_context.h" +#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/kernel_registry.h" +#include "paddle/phi/kernels/copy_kernel.h" #include "paddle/phi/kernels/funcs/eigen/common.h" #include "paddle/phi/kernels/funcs/eigen/eigen_function.h" diff --git a/paddle/phi/kernels/sparse/cpu/sparse_mm_grad_kernel.cc b/paddle/phi/kernels/sparse/cpu/matmul_grad_kernel.cc similarity index 97% rename from paddle/phi/kernels/sparse/cpu/sparse_mm_grad_kernel.cc rename to paddle/phi/kernels/sparse/cpu/matmul_grad_kernel.cc index 1ef6e31604d7a..7abf7cce7f092 100644 --- a/paddle/phi/kernels/sparse/cpu/sparse_mm_grad_kernel.cc +++ b/paddle/phi/kernels/sparse/cpu/matmul_grad_kernel.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/phi/kernels/sparse/sparse_mm_grad_kernel.h" +#include "paddle/phi/kernels/sparse/matmul_grad_kernel.h" #include "paddle/phi/backends/cpu/cpu_context.h" #include "paddle/phi/core/kernel_registry.h" diff --git a/paddle/phi/kernels/sparse/cpu/sparse_mm_kernel.cc b/paddle/phi/kernels/sparse/cpu/matmul_kernel.cc similarity index 97% rename from paddle/phi/kernels/sparse/cpu/sparse_mm_kernel.cc rename to paddle/phi/kernels/sparse/cpu/matmul_kernel.cc index bb66cd28888d9..9b9e309762521 100644 --- a/paddle/phi/kernels/sparse/cpu/sparse_mm_kernel.cc +++ b/paddle/phi/kernels/sparse/cpu/matmul_kernel.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/phi/kernels/sparse/sparse_mm_kernel.h" +#include "paddle/phi/kernels/sparse/matmul_kernel.h" #include "paddle/phi/backends/cpu/cpu_context.h" #include "paddle/phi/core/kernel_registry.h" diff --git a/paddle/phi/kernels/sparse/sparse_full_kernel.h b/paddle/phi/kernels/sparse/full_kernel.h similarity index 92% rename from paddle/phi/kernels/sparse/sparse_full_kernel.h rename to paddle/phi/kernels/sparse/full_kernel.h index 5e63f4ebf207e..8c84d43ff0219 100644 --- a/paddle/phi/kernels/sparse/sparse_full_kernel.h +++ b/paddle/phi/kernels/sparse/full_kernel.h @@ -14,14 +14,10 @@ #pragma once -#include - #include "paddle/phi/common/data_type.h" #include "paddle/phi/common/scalar.h" -#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/sparse_coo_tensor.h" #include "paddle/phi/core/sparse_csr_tensor.h" -#include "paddle/phi/kernels/copy_kernel.h" namespace phi { diff --git a/paddle/phi/kernels/sparse/gpu/sparse_full_kernel.cu b/paddle/phi/kernels/sparse/gpu/full_kernel.cu similarity index 96% rename from paddle/phi/kernels/sparse/gpu/sparse_full_kernel.cu rename to paddle/phi/kernels/sparse/gpu/full_kernel.cu index 18fecb9e4126c..6c1e0160bca8e 100644 --- a/paddle/phi/kernels/sparse/gpu/sparse_full_kernel.cu +++ b/paddle/phi/kernels/sparse/gpu/full_kernel.cu @@ -13,9 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "paddle/phi/backends/gpu/gpu_context.h" +#include "paddle/phi/core/dense_tensor.h" #include "paddle/phi/core/kernel_registry.h" +#include "paddle/phi/kernels/copy_kernel.h" #include "paddle/phi/kernels/funcs/elementwise_base.h" -#include "paddle/phi/kernels/sparse/sparse_full_kernel.h" +#include "paddle/phi/kernels/sparse/full_kernel.h" namespace phi { diff --git a/paddle/phi/kernels/sparse/gpu/sparse_mm_grad_kernel.cu b/paddle/phi/kernels/sparse/gpu/matmul_grad_kernel.cu similarity index 98% rename from paddle/phi/kernels/sparse/gpu/sparse_mm_grad_kernel.cu rename to paddle/phi/kernels/sparse/gpu/matmul_grad_kernel.cu index 1dcaba3a2c946..60d6a2918704d 100644 --- a/paddle/phi/kernels/sparse/gpu/sparse_mm_grad_kernel.cu +++ b/paddle/phi/kernels/sparse/gpu/matmul_grad_kernel.cu @@ -12,12 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ +#include + #include "paddle/phi/backends/gpu/gpu_context.h" #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/kernels/copy_kernel.h" #include "paddle/phi/kernels/empty_kernel.h" #include "paddle/phi/kernels/funcs/sparse/sparse_blas.h" -#include "paddle/phi/kernels/sparse/sparse_mm_grad_kernel.h" +#include "paddle/phi/kernels/sparse/matmul_grad_kernel.h" #include "paddle/phi/kernels/transpose_kernel.h" namespace phi { diff --git a/paddle/phi/kernels/sparse/gpu/sparse_mm_kernel.cu b/paddle/phi/kernels/sparse/gpu/matmul_kernel.cu similarity index 99% rename from paddle/phi/kernels/sparse/gpu/sparse_mm_kernel.cu rename to paddle/phi/kernels/sparse/gpu/matmul_kernel.cu index 96bc8fe5c73b3..2bab65a44a65d 100644 --- a/paddle/phi/kernels/sparse/gpu/sparse_mm_kernel.cu +++ b/paddle/phi/kernels/sparse/gpu/matmul_kernel.cu @@ -24,7 +24,7 @@ limitations under the License. */ #include "paddle/phi/kernels/copy_kernel.h" #include "paddle/phi/kernels/empty_kernel.h" #include "paddle/phi/kernels/funcs/sparse/sparse_blas.h" -#include "paddle/phi/kernels/sparse/sparse_mm_kernel.h" +#include "paddle/phi/kernels/sparse/matmul_kernel.h" namespace phi { namespace sparse { diff --git a/paddle/phi/kernels/sparse/sparse_mm_grad_kernel.h b/paddle/phi/kernels/sparse/matmul_grad_kernel.h similarity index 100% rename from paddle/phi/kernels/sparse/sparse_mm_grad_kernel.h rename to paddle/phi/kernels/sparse/matmul_grad_kernel.h diff --git a/paddle/phi/kernels/sparse/sparse_mm_kernel.h b/paddle/phi/kernels/sparse/matmul_kernel.h similarity index 100% rename from paddle/phi/kernels/sparse/sparse_mm_kernel.h rename to paddle/phi/kernels/sparse/matmul_kernel.h