From 1911b6f0da63dee423bc47754362da8fc45e1127 Mon Sep 17 00:00:00 2001 From: Chen Weihang Date: Wed, 8 Dec 2021 20:31:16 -0600 Subject: [PATCH] adjust main dir (#37916) --- .../elementwise/elementwise_op_function.h | 4 +-- .../elementwise/elementwise_op_impl.cu.h | 2 +- paddle/fluid/operators/math/math_function.cc | 2 +- paddle/fluid/operators/math/math_function.cu | 2 +- paddle/fluid/operators/reduce_ops/reduce_op.h | 2 +- paddle/pten/CMakeLists.txt | 4 +++ .../blas => backends}/CMakeLists.txt | 0 paddle/pten/infermeta/binary.cc | 2 +- paddle/pten/kernels/CMakeLists.txt | 26 ++++++++++++------- .../{functions/cpu => blas}/CMakeLists.txt | 0 paddle/pten/kernels/cpu/creation.cc | 2 +- paddle/pten/kernels/cpu/linalg.cc | 2 +- paddle/pten/kernels/cpu/manipulation.cc | 4 +-- paddle/pten/kernels/cpu/math.cc | 12 ++++----- paddle/pten/kernels/cuda/creation.cu | 2 +- paddle/pten/kernels/cuda/linalg.cu | 4 +-- paddle/pten/kernels/cuda/manipulation.cu | 4 +-- paddle/pten/kernels/cuda/math.cu | 12 ++++----- .../{functions/cuda => dnnl}/CMakeLists.txt | 0 .../{functions => }/eigen/CMakeLists.txt | 0 paddle/pten/kernels/functions/CMakeLists.txt | 3 --- .../{math/cuda => hybird}/CMakeLists.txt | 5 ++++ .../general => hybird/blas}/CMakeLists.txt | 0 .../{functions => hybird}/blas/elementwise.h | 0 .../{mkldnn => hybird/cpu}/CMakeLists.txt | 0 .../{functions => hybird}/cpu/elementwise.h | 2 +- .../pten/kernels/hybird/cuda/CMakeLists.txt | 0 .../cuda/cast_kernel_impl.h | 0 .../cuda/elementwise/elementwise.h | 4 +-- .../elementwise/elementwise_broadcast.cu.h | 2 +- .../cuda/elementwise/elementwise_common.cu.h | 2 +- .../elementwise/elementwise_no_broadcast.cu.h | 2 +- .../cuda/reduce/reduce.h | 2 +- .../cuda/reduce/reduce_cuda_impl.h | 2 +- .../pten/kernels/hybird/eigen/CMakeLists.txt | 0 .../{functions => hybird}/eigen/common.h | 0 .../kernels/{functions => hybird}/eigen/dot.h | 2 +- .../{functions => hybird}/eigen/elementwise.h | 2 +- .../{functions => hybird}/eigen/fill.h | 2 +- .../{functions => hybird}/eigen/reduce.h | 4 +-- .../{functions => hybird}/eigen/scale.h | 2 +- .../{functions => hybird}/eigen/sign.h | 2 +- .../kernels/hybird/general/CMakeLists.txt | 0 .../general/elementwise_base.h | 0 .../general/elementwise_functor.h | 4 +-- .../general/manipulation.h | 0 .../general/reduce_impl.h | 4 +-- .../{functions => hybird}/math/cast_func.h | 0 .../{functions => hybird}/math/matmul_func.h | 0 .../kernels/{math/cpu => hybird}/transpose.cc | 2 +- .../{math/cuda => hybird}/transpose.cu | 4 +-- .../pten/kernels/{math => hybird}/transpose.h | 0 paddle/pten/kernels/math/CMakeLists.txt | 4 --- paddle/pten/kernels/math/cpu/CMakeLists.txt | 1 - paddle/pten/kernels/primitive/CMakeLists.txt | 0 paddle/pten/kernels/xpu/manipulation.cc | 2 +- paddle/pten/ops/CMakeLists.txt | 0 57 files changed, 76 insertions(+), 69 deletions(-) rename paddle/pten/{kernels/functions/blas => backends}/CMakeLists.txt (100%) rename paddle/pten/kernels/{functions/cpu => blas}/CMakeLists.txt (100%) rename paddle/pten/kernels/{functions/cuda => dnnl}/CMakeLists.txt (100%) rename paddle/pten/kernels/{functions => }/eigen/CMakeLists.txt (100%) delete mode 100644 paddle/pten/kernels/functions/CMakeLists.txt rename paddle/pten/kernels/{math/cuda => hybird}/CMakeLists.txt (58%) rename paddle/pten/kernels/{functions/general => hybird/blas}/CMakeLists.txt (100%) rename paddle/pten/kernels/{functions => hybird}/blas/elementwise.h (100%) rename paddle/pten/kernels/{mkldnn => hybird/cpu}/CMakeLists.txt (100%) rename paddle/pten/kernels/{functions => hybird}/cpu/elementwise.h (99%) create mode 100644 paddle/pten/kernels/hybird/cuda/CMakeLists.txt rename paddle/pten/kernels/{functions => hybird}/cuda/cast_kernel_impl.h (100%) rename paddle/pten/kernels/{functions => hybird}/cuda/elementwise/elementwise.h (90%) rename paddle/pten/kernels/{functions => hybird}/cuda/elementwise/elementwise_broadcast.cu.h (99%) rename paddle/pten/kernels/{functions => hybird}/cuda/elementwise/elementwise_common.cu.h (97%) rename paddle/pten/kernels/{functions => hybird}/cuda/elementwise/elementwise_no_broadcast.cu.h (98%) rename paddle/pten/kernels/{functions => hybird}/cuda/reduce/reduce.h (97%) rename paddle/pten/kernels/{functions => hybird}/cuda/reduce/reduce_cuda_impl.h (99%) create mode 100644 paddle/pten/kernels/hybird/eigen/CMakeLists.txt rename paddle/pten/kernels/{functions => hybird}/eigen/common.h (100%) rename paddle/pten/kernels/{functions => hybird}/eigen/dot.h (96%) rename paddle/pten/kernels/{functions => hybird}/eigen/elementwise.h (97%) rename paddle/pten/kernels/{functions => hybird}/eigen/fill.h (95%) rename paddle/pten/kernels/{functions => hybird}/eigen/reduce.h (98%) rename paddle/pten/kernels/{functions => hybird}/eigen/scale.h (96%) rename paddle/pten/kernels/{functions => hybird}/eigen/sign.h (96%) create mode 100644 paddle/pten/kernels/hybird/general/CMakeLists.txt rename paddle/pten/kernels/{functions => hybird}/general/elementwise_base.h (100%) rename paddle/pten/kernels/{functions => hybird}/general/elementwise_functor.h (98%) rename paddle/pten/kernels/{functions => hybird}/general/manipulation.h (100%) rename paddle/pten/kernels/{functions => hybird}/general/reduce_impl.h (95%) rename paddle/pten/kernels/{functions => hybird}/math/cast_func.h (100%) rename paddle/pten/kernels/{functions => hybird}/math/matmul_func.h (100%) rename paddle/pten/kernels/{math/cpu => hybird}/transpose.cc (98%) rename paddle/pten/kernels/{math/cuda => hybird}/transpose.cu (97%) rename paddle/pten/kernels/{math => hybird}/transpose.h (100%) delete mode 100644 paddle/pten/kernels/math/CMakeLists.txt delete mode 100644 paddle/pten/kernels/math/cpu/CMakeLists.txt create mode 100644 paddle/pten/kernels/primitive/CMakeLists.txt create mode 100644 paddle/pten/ops/CMakeLists.txt diff --git a/paddle/fluid/operators/elementwise/elementwise_op_function.h b/paddle/fluid/operators/elementwise/elementwise_op_function.h index ad5a55aede..2cdacfcf10 100644 --- a/paddle/fluid/operators/elementwise/elementwise_op_function.h +++ b/paddle/fluid/operators/elementwise/elementwise_op_function.h @@ -31,8 +31,8 @@ limitations under the License. */ // only can include the headers in paddle/pten/include dirs #include "paddle/pten/api/lib/utils/tensor_utils.h" -#include "paddle/pten/kernels/functions/cpu/elementwise.h" -#include "paddle/pten/kernels/functions/general/elementwise_base.h" +#include "paddle/pten/kernels/hybird/cpu/elementwise.h" +#include "paddle/pten/kernels/hybird/general/elementwise_base.h" #if defined(__NVCC__) || defined(__HIPCC__) #ifdef __NVCC__ diff --git a/paddle/fluid/operators/elementwise/elementwise_op_impl.cu.h b/paddle/fluid/operators/elementwise/elementwise_op_impl.cu.h index 531a6ad224..12fdcd40aa 100644 --- a/paddle/fluid/operators/elementwise/elementwise_op_impl.cu.h +++ b/paddle/fluid/operators/elementwise/elementwise_op_impl.cu.h @@ -23,7 +23,7 @@ limitations under the License. */ // only can include the headers in paddle/top/api dirs #include "paddle/pten/api/lib/utils/tensor_utils.h" #include "paddle/pten/include/core.h" -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise.h" #ifdef __HIPCC__ #define ELEMENTWISE_BLOCK_SIZE 256 diff --git a/paddle/fluid/operators/math/math_function.cc b/paddle/fluid/operators/math/math_function.cc index cd919b18b8..4201af18ca 100644 --- a/paddle/fluid/operators/math/math_function.cc +++ b/paddle/fluid/operators/math/math_function.cc @@ -29,7 +29,7 @@ limitations under the License. */ #include "paddle/fluid/operators/math/math_function_impl.h" #include "paddle/fluid/platform/bfloat16.h" #include "paddle/fluid/platform/float16.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" #include "unsupported/Eigen/CXX11/Tensor" namespace paddle { diff --git a/paddle/fluid/operators/math/math_function.cu b/paddle/fluid/operators/math/math_function.cu index 144db9f5a2..fa214c6389 100644 --- a/paddle/fluid/operators/math/math_function.cu +++ b/paddle/fluid/operators/math/math_function.cu @@ -21,7 +21,7 @@ limitations under the License. */ #include "paddle/fluid/operators/math/math_function_impl.h" #include "paddle/fluid/platform/bfloat16.h" #include "paddle/fluid/platform/float16.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" namespace paddle { namespace operators { diff --git a/paddle/fluid/operators/reduce_ops/reduce_op.h b/paddle/fluid/operators/reduce_ops/reduce_op.h index df27083edb..76a14f6b1b 100644 --- a/paddle/fluid/operators/reduce_ops/reduce_op.h +++ b/paddle/fluid/operators/reduce_ops/reduce_op.h @@ -28,7 +28,7 @@ limitations under the License. */ #include "paddle/pten/api/lib/utils/tensor_utils.h" #include "paddle/pten/include/core.h" #include "paddle/pten/include/math.h" -#include "paddle/pten/kernels/functions/general/reduce_impl.h" +#include "paddle/pten/kernels/hybird/general/reduce_impl.h" #if defined(__HIPCC__) || defined(__NVCC__) #include "paddle/fluid/operators/reduce_ops/reduce_op.cu.h" diff --git a/paddle/pten/CMakeLists.txt b/paddle/pten/CMakeLists.txt index 448bcb80aa..7f6a64a1bb 100644 --- a/paddle/pten/CMakeLists.txt +++ b/paddle/pten/CMakeLists.txt @@ -11,10 +11,14 @@ add_subdirectory(common) add_subdirectory(api) # pten core components add_subdirectory(core) +# pten components of specific backends +add_subdirectory(backends) # pten kernels for diff device add_subdirectory(kernels) # pten infermeta add_subdirectory(infermeta) +# pten operator definitions +add_subdirectory(ops) # pten tests add_subdirectory(tests) diff --git a/paddle/pten/kernels/functions/blas/CMakeLists.txt b/paddle/pten/backends/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/functions/blas/CMakeLists.txt rename to paddle/pten/backends/CMakeLists.txt diff --git a/paddle/pten/infermeta/binary.cc b/paddle/pten/infermeta/binary.cc index a0d4cba90d..5d3844a1de 100644 --- a/paddle/pten/infermeta/binary.cc +++ b/paddle/pten/infermeta/binary.cc @@ -14,7 +14,7 @@ limitations under the License. */ // See Note [ Why still include the fluid headers? ] #include "paddle/pten/infermeta/binary.h" -#include "paddle/pten/kernels/functions/general/elementwise_base.h" +#include "paddle/pten/kernels/hybird/general/elementwise_base.h" namespace pten { diff --git a/paddle/pten/kernels/CMakeLists.txt b/paddle/pten/kernels/CMakeLists.txt index ffc45a5cf2..ebf659da47 100644 --- a/paddle/pten/kernels/CMakeLists.txt +++ b/paddle/pten/kernels/CMakeLists.txt @@ -1,22 +1,28 @@ -# pten math functions called by kernels -add_subdirectory(math) -# pten basic functions called by kernels -add_subdirectory(functions) -# pten kernels for diff device +# kernel primitive api +add_subdirectory(primitive) +# pten hybird functors and functions called by kernels +add_subdirectory(hybird) + +# pten kernels for different backends +# NOTE(chenweihang): We need to increase the compilation option of WITH_EIGEN, +# which will support splitting eigen at compile time on demand in the future +add_subdirectory(eigen) +# NOTE(chenweihang): We need to increase the compilation option of WITH_BLAS, +# which will support splitting eigen at compile time on demand in the future, +# and if necessary, blas can be split into openblas and cublas +add_subdirectory(blas) add_subdirectory(cpu) if(WITH_GPU OR WITH_ROCM) - # TODO(chenweihang): if hip can split from cuda impl, we should add hip dir + # NOTE(chenweihang): if hip can split from cuda impl, we should add hip dir add_subdirectory(cuda) endif() -# TODO(chenweihang): migrate MKLDNN Kernel in the second phase of the project if(WITH_MKLDNN) - add_subdirectory(mkldnn) + # mkldnn will be deprecated and use the new name dnnl + add_subdirectory(dnnl) endif() -# TODO(chenweihang): migrate NPU Kernel in the second phase of the project if(WITH_ASCEND_CL) add_subdirectory(npu) endif() -# TODO(chenweihang): migrate XPU Kernel in the second phase of the project if(WITH_XPU) add_subdirectory(xpu) endif() diff --git a/paddle/pten/kernels/functions/cpu/CMakeLists.txt b/paddle/pten/kernels/blas/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/functions/cpu/CMakeLists.txt rename to paddle/pten/kernels/blas/CMakeLists.txt diff --git a/paddle/pten/kernels/cpu/creation.cc b/paddle/pten/kernels/cpu/creation.cc index db3d5c2bf4..4f09fc489f 100644 --- a/paddle/pten/kernels/cpu/creation.cc +++ b/paddle/pten/kernels/cpu/creation.cc @@ -15,7 +15,7 @@ #include "paddle/pten/kernels/cpu/creation.h" #include "paddle/pten/core/kernel_registry.h" -#include "paddle/pten/kernels/functions/eigen/fill.h" +#include "paddle/pten/kernels/hybird/eigen/fill.h" namespace pten { diff --git a/paddle/pten/kernels/cpu/linalg.cc b/paddle/pten/kernels/cpu/linalg.cc index ced13dc41d..32411560b5 100644 --- a/paddle/pten/kernels/cpu/linalg.cc +++ b/paddle/pten/kernels/cpu/linalg.cc @@ -21,7 +21,7 @@ #include "paddle/fluid/operators/math/blas.h" #include "paddle/fluid/platform/complex.h" -#include "paddle/pten/kernels/functions/math/matmul_func.h" +#include "paddle/pten/kernels/hybird/math/matmul_func.h" namespace pten { diff --git a/paddle/pten/kernels/cpu/manipulation.cc b/paddle/pten/kernels/cpu/manipulation.cc index bf94d00964..e0e9cefbf6 100644 --- a/paddle/pten/kernels/cpu/manipulation.cc +++ b/paddle/pten/kernels/cpu/manipulation.cc @@ -16,8 +16,8 @@ #include "paddle/pten/api/ext/dispatch.h" #include "paddle/pten/infermeta/unary.h" #include "paddle/pten/kernels/cpu/utils.h" -#include "paddle/pten/kernels/functions/general/manipulation.h" -#include "paddle/pten/kernels/functions/math/cast_func.h" +#include "paddle/pten/kernels/hybird/general/manipulation.h" +#include "paddle/pten/kernels/hybird/math/cast_func.h" namespace pten { diff --git a/paddle/pten/kernels/cpu/math.cc b/paddle/pten/kernels/cpu/math.cc index e768d4f1ef..ddfb2f5f45 100644 --- a/paddle/pten/kernels/cpu/math.cc +++ b/paddle/pten/kernels/cpu/math.cc @@ -15,12 +15,12 @@ #include "paddle/pten/kernels/cpu/math.h" #include "paddle/pten/api/ext/dispatch.h" -#include "paddle/pten/kernels/functions/cpu/elementwise.h" -#include "paddle/pten/kernels/functions/eigen/reduce.h" -#include "paddle/pten/kernels/functions/eigen/scale.h" -#include "paddle/pten/kernels/functions/eigen/sign.h" -#include "paddle/pten/kernels/functions/general/elementwise_functor.h" -#include "paddle/pten/kernels/functions/general/reduce_impl.h" +#include "paddle/pten/kernels/hybird/cpu/elementwise.h" +#include "paddle/pten/kernels/hybird/eigen/reduce.h" +#include "paddle/pten/kernels/hybird/eigen/scale.h" +#include "paddle/pten/kernels/hybird/eigen/sign.h" +#include "paddle/pten/kernels/hybird/general/elementwise_functor.h" +#include "paddle/pten/kernels/hybird/general/reduce_impl.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/framework/eigen.h" diff --git a/paddle/pten/kernels/cuda/creation.cu b/paddle/pten/kernels/cuda/creation.cu index 84d9fa255c..8bc23fb6af 100644 --- a/paddle/pten/kernels/cuda/creation.cu +++ b/paddle/pten/kernels/cuda/creation.cu @@ -15,7 +15,7 @@ #include "paddle/pten/kernels/cuda/creation.h" #include "paddle/pten/core/kernel_registry.h" -#include "paddle/pten/kernels/functions/eigen/fill.h" +#include "paddle/pten/kernels/hybird/eigen/fill.h" namespace pten { diff --git a/paddle/pten/kernels/cuda/linalg.cu b/paddle/pten/kernels/cuda/linalg.cu index 6811afa8a4..fe2ac6f184 100644 --- a/paddle/pten/kernels/cuda/linalg.cu +++ b/paddle/pten/kernels/cuda/linalg.cu @@ -15,8 +15,8 @@ #include "paddle/pten/kernels/cuda/linalg.h" #include "paddle/pten/core/kernel_registry.h" -#include "paddle/pten/kernels/functions/eigen/dot.h" -#include "paddle/pten/kernels/functions/math/matmul_func.h" +#include "paddle/pten/kernels/hybird/eigen/dot.h" +#include "paddle/pten/kernels/hybird/math/matmul_func.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/platform/complex.h" diff --git a/paddle/pten/kernels/cuda/manipulation.cu b/paddle/pten/kernels/cuda/manipulation.cu index 9c7fded091..acaf1ac2cc 100644 --- a/paddle/pten/kernels/cuda/manipulation.cu +++ b/paddle/pten/kernels/cuda/manipulation.cu @@ -16,8 +16,8 @@ #include "paddle/pten/infermeta/unary.h" #include "paddle/pten/kernels/cuda/manipulation.h" #include "paddle/pten/kernels/cuda/utils.h" -#include "paddle/pten/kernels/functions/cuda/cast_kernel_impl.h" -#include "paddle/pten/kernels/functions/general/manipulation.h" +#include "paddle/pten/kernels/hybird/cuda/cast_kernel_impl.h" +#include "paddle/pten/kernels/hybird/general/manipulation.h" namespace pten { diff --git a/paddle/pten/kernels/cuda/math.cu b/paddle/pten/kernels/cuda/math.cu index e7fa599cb6..388d42942c 100644 --- a/paddle/pten/kernels/cuda/math.cu +++ b/paddle/pten/kernels/cuda/math.cu @@ -15,12 +15,12 @@ limitations under the License. */ #include "paddle/pten/kernels/cuda/math.h" #include "paddle/fluid/operators/reduce_ops/reduce_functor_op.h" -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise.h" -#include "paddle/pten/kernels/functions/cuda/reduce/reduce.h" -#include "paddle/pten/kernels/functions/eigen/scale.h" -#include "paddle/pten/kernels/functions/eigen/sign.h" -#include "paddle/pten/kernels/functions/general/elementwise_functor.h" -#include "paddle/pten/kernels/functions/general/reduce_impl.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise.h" +#include "paddle/pten/kernels/hybird/cuda/reduce/reduce.h" +#include "paddle/pten/kernels/hybird/eigen/scale.h" +#include "paddle/pten/kernels/hybird/eigen/sign.h" +#include "paddle/pten/kernels/hybird/general/elementwise_functor.h" +#include "paddle/pten/kernels/hybird/general/reduce_impl.h" #ifdef __NVCC__ #include "cub/cub.cuh" diff --git a/paddle/pten/kernels/functions/cuda/CMakeLists.txt b/paddle/pten/kernels/dnnl/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/functions/cuda/CMakeLists.txt rename to paddle/pten/kernels/dnnl/CMakeLists.txt diff --git a/paddle/pten/kernels/functions/eigen/CMakeLists.txt b/paddle/pten/kernels/eigen/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/functions/eigen/CMakeLists.txt rename to paddle/pten/kernels/eigen/CMakeLists.txt diff --git a/paddle/pten/kernels/functions/CMakeLists.txt b/paddle/pten/kernels/functions/CMakeLists.txt deleted file mode 100644 index a5b4bb3e8b..0000000000 --- a/paddle/pten/kernels/functions/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(eigen) -add_subdirectory(blas) -add_subdirectory(general) diff --git a/paddle/pten/kernels/math/cuda/CMakeLists.txt b/paddle/pten/kernels/hybird/CMakeLists.txt similarity index 58% rename from paddle/pten/kernels/math/cuda/CMakeLists.txt rename to paddle/pten/kernels/hybird/CMakeLists.txt index b0be23bb09..c82cbd1ef9 100644 --- a/paddle/pten/kernels/math/cuda/CMakeLists.txt +++ b/paddle/pten/kernels/hybird/CMakeLists.txt @@ -1,3 +1,8 @@ +add_subdirectory(eigen) +add_subdirectory(blas) +add_subdirectory(general) + +cc_library(pten_transpose_cpu SRCS transpose.cc DEPS dense_tensor device_context) if(WITH_GPU) nv_library(pten_transpose_cuda SRCS transpose.cu DEPS dense_tensor malloc device_context) elseif(WITH_ROCM) diff --git a/paddle/pten/kernels/functions/general/CMakeLists.txt b/paddle/pten/kernels/hybird/blas/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/functions/general/CMakeLists.txt rename to paddle/pten/kernels/hybird/blas/CMakeLists.txt diff --git a/paddle/pten/kernels/functions/blas/elementwise.h b/paddle/pten/kernels/hybird/blas/elementwise.h similarity index 100% rename from paddle/pten/kernels/functions/blas/elementwise.h rename to paddle/pten/kernels/hybird/blas/elementwise.h diff --git a/paddle/pten/kernels/mkldnn/CMakeLists.txt b/paddle/pten/kernels/hybird/cpu/CMakeLists.txt similarity index 100% rename from paddle/pten/kernels/mkldnn/CMakeLists.txt rename to paddle/pten/kernels/hybird/cpu/CMakeLists.txt diff --git a/paddle/pten/kernels/functions/cpu/elementwise.h b/paddle/pten/kernels/hybird/cpu/elementwise.h similarity index 99% rename from paddle/pten/kernels/functions/cpu/elementwise.h rename to paddle/pten/kernels/hybird/cpu/elementwise.h index 98600f2991..e8213c8b45 100644 --- a/paddle/pten/kernels/functions/cpu/elementwise.h +++ b/paddle/pten/kernels/hybird/cpu/elementwise.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/general/elementwise_base.h" +#include "paddle/pten/kernels/hybird/general/elementwise_base.h" namespace pten { diff --git a/paddle/pten/kernels/hybird/cuda/CMakeLists.txt b/paddle/pten/kernels/hybird/cuda/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/paddle/pten/kernels/functions/cuda/cast_kernel_impl.h b/paddle/pten/kernels/hybird/cuda/cast_kernel_impl.h similarity index 100% rename from paddle/pten/kernels/functions/cuda/cast_kernel_impl.h rename to paddle/pten/kernels/hybird/cuda/cast_kernel_impl.h diff --git a/paddle/pten/kernels/functions/cuda/elementwise/elementwise.h b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise.h similarity index 90% rename from paddle/pten/kernels/functions/cuda/elementwise/elementwise.h rename to paddle/pten/kernels/hybird/cuda/elementwise/elementwise.h index b769936089..9bcfa1d857 100644 --- a/paddle/pten/kernels/functions/cuda/elementwise/elementwise.h +++ b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise.h @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise_broadcast.cu.h" -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise_no_broadcast.cu.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise_broadcast.cu.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h" namespace pten { diff --git a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_broadcast.cu.h b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_broadcast.cu.h similarity index 99% rename from paddle/pten/kernels/functions/cuda/elementwise/elementwise_broadcast.cu.h rename to paddle/pten/kernels/hybird/cuda/elementwise/elementwise_broadcast.cu.h index 40d3cf60f0..258e8f410e 100644 --- a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_broadcast.cu.h +++ b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_broadcast.cu.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise_common.cu.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise_common.cu.h" namespace pten { diff --git a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_common.cu.h b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_common.cu.h similarity index 97% rename from paddle/pten/kernels/functions/cuda/elementwise/elementwise_common.cu.h rename to paddle/pten/kernels/hybird/cuda/elementwise/elementwise_common.cu.h index 1c0dd56254..053b53041d 100644 --- a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_common.cu.h +++ b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_common.cu.h @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/aligned_vector.h" #include "paddle/fluid/platform/function_traits.h" #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/general/elementwise_base.h" +#include "paddle/pten/kernels/hybird/general/elementwise_base.h" namespace pten { namespace kps = paddle::operators::kernel_primitives; diff --git a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_no_broadcast.cu.h b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h similarity index 98% rename from paddle/pten/kernels/functions/cuda/elementwise/elementwise_no_broadcast.cu.h rename to paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h index 4eaf8867fd..e2659271bd 100644 --- a/paddle/pten/kernels/functions/cuda/elementwise/elementwise_no_broadcast.cu.h +++ b/paddle/pten/kernels/hybird/cuda/elementwise/elementwise_no_broadcast.cu.h @@ -14,7 +14,7 @@ limitations under the License. */ #pragma once -#include "paddle/pten/kernels/functions/cuda/elementwise/elementwise_common.cu.h" +#include "paddle/pten/kernels/hybird/cuda/elementwise/elementwise_common.cu.h" #ifdef __HIPCC__ #define ELEMENTWISE_BLOCK_SIZE 256 diff --git a/paddle/pten/kernels/functions/cuda/reduce/reduce.h b/paddle/pten/kernels/hybird/cuda/reduce/reduce.h similarity index 97% rename from paddle/pten/kernels/functions/cuda/reduce/reduce.h rename to paddle/pten/kernels/hybird/cuda/reduce/reduce.h index 0f7917f79e..1e47726333 100644 --- a/paddle/pten/kernels/functions/cuda/reduce/reduce.h +++ b/paddle/pten/kernels/hybird/cuda/reduce/reduce.h @@ -21,7 +21,7 @@ #include "paddle/pten/core/dense_tensor.h" #include "paddle/fluid/platform/device_context.h" -#include "paddle/pten/kernels/functions/cuda/reduce/reduce_cuda_impl.h" +#include "paddle/pten/kernels/hybird/cuda/reduce/reduce_cuda_impl.h" namespace pten { diff --git a/paddle/pten/kernels/functions/cuda/reduce/reduce_cuda_impl.h b/paddle/pten/kernels/hybird/cuda/reduce/reduce_cuda_impl.h similarity index 99% rename from paddle/pten/kernels/functions/cuda/reduce/reduce_cuda_impl.h rename to paddle/pten/kernels/hybird/cuda/reduce/reduce_cuda_impl.h index 21663ee038..94fab974ac 100644 --- a/paddle/pten/kernels/functions/cuda/reduce/reduce_cuda_impl.h +++ b/paddle/pten/kernels/hybird/cuda/reduce/reduce_cuda_impl.h @@ -43,7 +43,7 @@ namespace cub = hipcub; #include "paddle/pten/api/ext/dispatch.h" #include "paddle/pten/api/include/tensor.h" #include "paddle/pten/kernels/cuda/utils.h" -#include "paddle/pten/kernels/functions/math/cast_func.h" +#include "paddle/pten/kernels/hybird/math/cast_func.h" // Reduce split or not, Whether to use ReduceHigherDim #define REDUCE_SPLIT_BOUNDARY 512 diff --git a/paddle/pten/kernels/hybird/eigen/CMakeLists.txt b/paddle/pten/kernels/hybird/eigen/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/paddle/pten/kernels/functions/eigen/common.h b/paddle/pten/kernels/hybird/eigen/common.h similarity index 100% rename from paddle/pten/kernels/functions/eigen/common.h rename to paddle/pten/kernels/hybird/eigen/common.h diff --git a/paddle/pten/kernels/functions/eigen/dot.h b/paddle/pten/kernels/hybird/eigen/dot.h similarity index 96% rename from paddle/pten/kernels/functions/eigen/dot.h rename to paddle/pten/kernels/hybird/eigen/dot.h index 27a0b8cf32..eb089037fa 100644 --- a/paddle/pten/kernels/functions/eigen/dot.h +++ b/paddle/pten/kernels/hybird/eigen/dot.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/operators/eigen/eigen_function.h" diff --git a/paddle/pten/kernels/functions/eigen/elementwise.h b/paddle/pten/kernels/hybird/eigen/elementwise.h similarity index 97% rename from paddle/pten/kernels/functions/eigen/elementwise.h rename to paddle/pten/kernels/hybird/eigen/elementwise.h index 369ff36c46..e67cce63d4 100644 --- a/paddle/pten/kernels/functions/eigen/elementwise.h +++ b/paddle/pten/kernels/hybird/eigen/elementwise.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" namespace pten { namespace eigen { diff --git a/paddle/pten/kernels/functions/eigen/fill.h b/paddle/pten/kernels/hybird/eigen/fill.h similarity index 95% rename from paddle/pten/kernels/functions/eigen/fill.h rename to paddle/pten/kernels/hybird/eigen/fill.h index 122a6aef22..80e310847e 100644 --- a/paddle/pten/kernels/functions/eigen/fill.h +++ b/paddle/pten/kernels/hybird/eigen/fill.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/operators/eigen/eigen_function.h" diff --git a/paddle/pten/kernels/functions/eigen/reduce.h b/paddle/pten/kernels/hybird/eigen/reduce.h similarity index 98% rename from paddle/pten/kernels/functions/eigen/reduce.h rename to paddle/pten/kernels/hybird/eigen/reduce.h index 1e10278521..52ea1e68e1 100644 --- a/paddle/pten/kernels/functions/eigen/reduce.h +++ b/paddle/pten/kernels/hybird/eigen/reduce.h @@ -16,8 +16,8 @@ #include "paddle/pten/api/lib/utils/allocator.h" #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" -#include "paddle/pten/kernels/math/transpose.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" +#include "paddle/pten/kernels/hybird/transpose.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/operators/eigen/eigen_function.h" diff --git a/paddle/pten/kernels/functions/eigen/scale.h b/paddle/pten/kernels/hybird/eigen/scale.h similarity index 96% rename from paddle/pten/kernels/functions/eigen/scale.h rename to paddle/pten/kernels/hybird/eigen/scale.h index 49ee561df5..111f6c22cc 100644 --- a/paddle/pten/kernels/functions/eigen/scale.h +++ b/paddle/pten/kernels/hybird/eigen/scale.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/operators/eigen/eigen_function.h" diff --git a/paddle/pten/kernels/functions/eigen/sign.h b/paddle/pten/kernels/hybird/eigen/sign.h similarity index 96% rename from paddle/pten/kernels/functions/eigen/sign.h rename to paddle/pten/kernels/hybird/eigen/sign.h index 5cd620815b..0beebda4f3 100644 --- a/paddle/pten/kernels/functions/eigen/sign.h +++ b/paddle/pten/kernels/hybird/eigen/sign.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/common.h" +#include "paddle/pten/kernels/hybird/eigen/common.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/operators/eigen/eigen_function.h" diff --git a/paddle/pten/kernels/hybird/general/CMakeLists.txt b/paddle/pten/kernels/hybird/general/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/paddle/pten/kernels/functions/general/elementwise_base.h b/paddle/pten/kernels/hybird/general/elementwise_base.h similarity index 100% rename from paddle/pten/kernels/functions/general/elementwise_base.h rename to paddle/pten/kernels/hybird/general/elementwise_base.h diff --git a/paddle/pten/kernels/functions/general/elementwise_functor.h b/paddle/pten/kernels/hybird/general/elementwise_functor.h similarity index 98% rename from paddle/pten/kernels/functions/general/elementwise_functor.h rename to paddle/pten/kernels/hybird/general/elementwise_functor.h index 973389f147..109f0907c6 100644 --- a/paddle/pten/kernels/functions/general/elementwise_functor.h +++ b/paddle/pten/kernels/hybird/general/elementwise_functor.h @@ -18,8 +18,8 @@ limitations under the License. */ #include "paddle/fluid/platform/float16.h" #include "paddle/fluid/platform/hostdevice.h" #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/blas/elementwise.h" -#include "paddle/pten/kernels/functions/eigen/elementwise.h" +#include "paddle/pten/kernels/hybird/blas/elementwise.h" +#include "paddle/pten/kernels/hybird/eigen/elementwise.h" namespace pten { namespace general { diff --git a/paddle/pten/kernels/functions/general/manipulation.h b/paddle/pten/kernels/hybird/general/manipulation.h similarity index 100% rename from paddle/pten/kernels/functions/general/manipulation.h rename to paddle/pten/kernels/hybird/general/manipulation.h diff --git a/paddle/pten/kernels/functions/general/reduce_impl.h b/paddle/pten/kernels/hybird/general/reduce_impl.h similarity index 95% rename from paddle/pten/kernels/functions/general/reduce_impl.h rename to paddle/pten/kernels/hybird/general/reduce_impl.h index a48eb7e44b..50f40c5f2c 100644 --- a/paddle/pten/kernels/functions/general/reduce_impl.h +++ b/paddle/pten/kernels/hybird/general/reduce_impl.h @@ -16,8 +16,8 @@ #include "paddle/fluid/platform/transform.h" #include "paddle/pten/api/ext/dispatch.h" #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/eigen/reduce.h" -#include "paddle/pten/kernels/functions/math/cast_func.h" +#include "paddle/pten/kernels/hybird/eigen/reduce.h" +#include "paddle/pten/kernels/hybird/math/cast_func.h" namespace pten { namespace general { diff --git a/paddle/pten/kernels/functions/math/cast_func.h b/paddle/pten/kernels/hybird/math/cast_func.h similarity index 100% rename from paddle/pten/kernels/functions/math/cast_func.h rename to paddle/pten/kernels/hybird/math/cast_func.h diff --git a/paddle/pten/kernels/functions/math/matmul_func.h b/paddle/pten/kernels/hybird/math/matmul_func.h similarity index 100% rename from paddle/pten/kernels/functions/math/matmul_func.h rename to paddle/pten/kernels/hybird/math/matmul_func.h diff --git a/paddle/pten/kernels/math/cpu/transpose.cc b/paddle/pten/kernels/hybird/transpose.cc similarity index 98% rename from paddle/pten/kernels/math/cpu/transpose.cc rename to paddle/pten/kernels/hybird/transpose.cc index c8580b8877..73375a6a37 100644 --- a/paddle/pten/kernels/math/cpu/transpose.cc +++ b/paddle/pten/kernels/hybird/transpose.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/kernels/math/transpose.h" +#include "paddle/pten/kernels/hybird/transpose.h" #include "paddle/fluid/framework/ddim.h" #include "paddle/pten/core/dense_tensor.h" diff --git a/paddle/pten/kernels/math/cuda/transpose.cu b/paddle/pten/kernels/hybird/transpose.cu similarity index 97% rename from paddle/pten/kernels/math/cuda/transpose.cu rename to paddle/pten/kernels/hybird/transpose.cu index a18efde2c2..bf7a140993 100644 --- a/paddle/pten/kernels/math/cuda/transpose.cu +++ b/paddle/pten/kernels/hybird/transpose.cu @@ -15,8 +15,8 @@ #include "paddle/fluid/framework/ddim.h" #include "paddle/fluid/memory/memcpy.h" #include "paddle/pten/core/dense_tensor.h" -#include "paddle/pten/kernels/functions/math/cast_func.h" -#include "paddle/pten/kernels/math/transpose.h" +#include "paddle/pten/kernels/hybird/math/cast_func.h" +#include "paddle/pten/kernels/hybird/transpose.h" // See Note [ Why still include the fluid headers? ] #include "paddle/fluid/platform/bfloat16.h" diff --git a/paddle/pten/kernels/math/transpose.h b/paddle/pten/kernels/hybird/transpose.h similarity index 100% rename from paddle/pten/kernels/math/transpose.h rename to paddle/pten/kernels/hybird/transpose.h diff --git a/paddle/pten/kernels/math/CMakeLists.txt b/paddle/pten/kernels/math/CMakeLists.txt deleted file mode 100644 index 429a6df8e2..0000000000 --- a/paddle/pten/kernels/math/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(cpu) -if(WITH_GPU OR WITH_ROCM) - add_subdirectory(cuda) -endif() diff --git a/paddle/pten/kernels/math/cpu/CMakeLists.txt b/paddle/pten/kernels/math/cpu/CMakeLists.txt deleted file mode 100644 index 235a49a5e4..0000000000 --- a/paddle/pten/kernels/math/cpu/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -cc_library(pten_transpose_cpu SRCS transpose.cc DEPS dense_tensor device_context) diff --git a/paddle/pten/kernels/primitive/CMakeLists.txt b/paddle/pten/kernels/primitive/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/paddle/pten/kernels/xpu/manipulation.cc b/paddle/pten/kernels/xpu/manipulation.cc index 352d21e6e9..5f1c0d42eb 100644 --- a/paddle/pten/kernels/xpu/manipulation.cc +++ b/paddle/pten/kernels/xpu/manipulation.cc @@ -14,7 +14,7 @@ #include "paddle/pten/kernels/xpu/manipulation.h" #include "paddle/pten/infermeta/unary.h" -#include "paddle/pten/kernels/functions/general/manipulation.h" +#include "paddle/pten/kernels/hybird/general/manipulation.h" #include "paddle/pten/kernels/xpu/utils.h" namespace pten { diff --git a/paddle/pten/ops/CMakeLists.txt b/paddle/pten/ops/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 -- GitLab