Skip to content

[Pten] Adjust the design of the pten main directory #37916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2021
Merged

[Pten] Adjust the design of the pten main directory #37916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69edf3
adjust main dir
chenwhql Dec 7, 2021
255632c
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions paddle/fluid/operators/elementwise/elementwise_op_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/elementwise/elementwise_op_impl.cu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/math/math_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/math/math_function.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/reduce_ops/reduce_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions paddle/pten/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
0 ...ten/kernels/functions/blas/CMakeLists.txt → paddle/pten/backends/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion paddle/pten/infermeta/binary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
26 changes: 16 additions & 10 deletions paddle/pten/kernels/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
0 ...pten/kernels/functions/cpu/CMakeLists.txt → paddle/pten/kernels/blas/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion paddle/pten/kernels/cpu/creation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion paddle/pten/kernels/cpu/linalg.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions paddle/pten/kernels/cpu/manipulation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
12 changes: 6 additions & 6 deletions paddle/pten/kernels/cpu/math.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion paddle/pten/kernels/cuda/creation.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions paddle/pten/kernels/cuda/linalg.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions paddle/pten/kernels/cuda/manipulation.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
12 changes: 6 additions & 6 deletions paddle/pten/kernels/cuda/math.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...ten/kernels/functions/cuda/CMakeLists.txt → paddle/pten/kernels/dnnl/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...en/kernels/functions/eigen/CMakeLists.txt → paddle/pten/kernels/eigen/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions paddle/pten/kernels/functions/CMakeLists.txt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions paddle/pten/kernels/math/cuda/CMakeLists.txt → paddle/pten/kernels/hybird/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
0 .../kernels/functions/general/CMakeLists.txt → ...e/pten/kernels/hybird/blas/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
0 ...pten/kernels/functions/blas/elementwise.h → ...le/pten/kernels/hybird/blas/elementwise.h
View file
Open in desktop
File renamed without changes.
0 paddle/pten/kernels/mkldnn/CMakeLists.txt → ...le/pten/kernels/hybird/cpu/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../pten/kernels/functions/cpu/elementwise.h → paddle/pten/kernels/hybird/cpu/elementwise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Empty file added paddle/pten/kernels/hybird/cuda/CMakeLists.txt
View file
Open in desktop
Empty file.
0 ...kernels/functions/cuda/cast_kernel_impl.h → ...en/kernels/hybird/cuda/cast_kernel_impl.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../functions/cuda/elementwise/elementwise.h → ...els/hybird/cuda/elementwise/elementwise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...da/elementwise/elementwise_broadcast.cu.h → ...da/elementwise/elementwise_broadcast.cu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion .../cuda/elementwise/elementwise_common.cu.h → .../cuda/elementwise/elementwise_common.cu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...elementwise/elementwise_no_broadcast.cu.h → ...elementwise/elementwise_no_broadcast.cu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...en/kernels/functions/cuda/reduce/reduce.h → .../pten/kernels/hybird/cuda/reduce/reduce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion .../functions/cuda/reduce/reduce_cuda_impl.h → ...els/hybird/cuda/reduce/reduce_cuda_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file added paddle/pten/kernels/hybird/eigen/CMakeLists.txt
View file
Open in desktop
Empty file.
0 paddle/pten/kernels/functions/eigen/common.h → paddle/pten/kernels/hybird/eigen/common.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion paddle/pten/kernels/functions/eigen/dot.h → paddle/pten/kernels/hybird/eigen/dot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ten/kernels/functions/eigen/elementwise.h → ...e/pten/kernels/hybird/eigen/elementwise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion paddle/pten/kernels/functions/eigen/fill.h → paddle/pten/kernels/hybird/eigen/fill.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions paddle/pten/kernels/functions/eigen/reduce.h → paddle/pten/kernels/hybird/eigen/reduce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion paddle/pten/kernels/functions/eigen/scale.h → paddle/pten/kernels/hybird/eigen/scale.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion paddle/pten/kernels/functions/eigen/sign.h → paddle/pten/kernels/hybird/eigen/sign.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Empty file added paddle/pten/kernels/hybird/general/CMakeLists.txt
View file
Open in desktop
Empty file.
0 ...nels/functions/general/elementwise_base.h → ...kernels/hybird/general/elementwise_base.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...s/functions/general/elementwise_functor.h → ...nels/hybird/general/elementwise_functor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 .../kernels/functions/general/manipulation.h → ...ten/kernels/hybird/general/manipulation.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...n/kernels/functions/general/reduce_impl.h → ...pten/kernels/hybird/general/reduce_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
0 ...e/pten/kernels/functions/math/cast_func.h → paddle/pten/kernels/hybird/math/cast_func.h
View file
Open in desktop
File renamed without changes.
0 ...pten/kernels/functions/math/matmul_func.h → ...le/pten/kernels/hybird/math/matmul_func.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion paddle/pten/kernels/math/cpu/transpose.cc → paddle/pten/kernels/hybird/transpose.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions paddle/pten/kernels/math/cuda/transpose.cu → paddle/pten/kernels/hybird/transpose.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 paddle/pten/kernels/math/transpose.h → paddle/pten/kernels/hybird/transpose.h
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions paddle/pten/kernels/math/CMakeLists.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion paddle/pten/kernels/math/cpu/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Empty file added paddle/pten/kernels/primitive/CMakeLists.txt
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion paddle/pten/kernels/xpu/manipulation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Empty file added paddle/pten/ops/CMakeLists.txt
View file
Open in desktop
Empty file.