diff --git a/paddle/pten/kernels/cpu/slice_grad_kernel.cc b/paddle/phi/kernels/cpu/slice_grad_kernel.cc similarity index 63% rename from paddle/pten/kernels/cpu/slice_grad_kernel.cc rename to paddle/phi/kernels/cpu/slice_grad_kernel.cc index 67e3b6859addbf119bc258fdd120e9984be6b83f..641447f20f040b4cc00d6eb7bf53988f10d783f2 100644 --- a/paddle/pten/kernels/cpu/slice_grad_kernel.cc +++ b/paddle/phi/kernels/cpu/slice_grad_kernel.cc @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/kernels/slice_grad_kernel.h" -#include "paddle/pten/kernels/impl/slice_grad_kernel_impl.h" +#include "paddle/phi/kernels/slice_grad_kernel.h" +#include "paddle/phi/kernels/impl/slice_grad_kernel_impl.h" -#include "paddle/pten/backends/cpu/cpu_context.h" -#include "paddle/pten/core/kernel_registry.h" +#include "paddle/phi/backends/cpu/cpu_context.h" +#include "paddle/phi/core/kernel_registry.h" -PT_REGISTER_KERNEL(slice_grad, +PD_REGISTER_KERNEL(slice_grad, CPU, ALL_LAYOUT, - pten::SliceGradRawKernel, + phi::SliceGradRawKernel, bool, int, int64_t, float, double, - pten::dtype::complex, - pten::dtype::complex, - pten::dtype::bfloat16, - pten::dtype::float16) {} + phi::dtype::complex, + phi::dtype::complex, + phi::dtype::bfloat16, + phi::dtype::float16) {} diff --git a/paddle/pten/kernels/cpu/slice_kernel.cc b/paddle/phi/kernels/cpu/slice_kernel.cc similarity index 66% rename from paddle/pten/kernels/cpu/slice_kernel.cc rename to paddle/phi/kernels/cpu/slice_kernel.cc index e49038425b12bd95884c35f42ba2037056a9287c..736540609dd720aa8cab93487c273ac2b3dfab52 100644 --- a/paddle/pten/kernels/cpu/slice_kernel.cc +++ b/paddle/phi/kernels/cpu/slice_kernel.cc @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/kernels/slice_kernel.h" -#include "paddle/pten/kernels/impl/slice_kernel_impl.h" +#include "paddle/phi/kernels/slice_kernel.h" +#include "paddle/phi/kernels/impl/slice_kernel_impl.h" -#include "paddle/pten/backends/cpu/cpu_context.h" -#include "paddle/pten/core/kernel_registry.h" +#include "paddle/phi/backends/cpu/cpu_context.h" +#include "paddle/phi/core/kernel_registry.h" -PT_REGISTER_KERNEL(slice, +PD_REGISTER_KERNEL(slice, CPU, ALL_LAYOUT, - pten::SliceRawKernel, + phi::SliceRawKernel, bool, int, int64_t, float, double, - pten::dtype::complex, - pten::dtype::complex, - pten::dtype::bfloat16) {} + phi::dtype::complex, + phi::dtype::complex, + phi::dtype::bfloat16) {} diff --git a/paddle/pten/kernels/funcs/slice_utils.h b/paddle/phi/kernels/funcs/slice_utils.h similarity index 81% rename from paddle/pten/kernels/funcs/slice_utils.h rename to paddle/phi/kernels/funcs/slice_utils.h index 5a52cb4ab5576b14f369a223450a1da1418e9b2b..568aa2b18c22486489249218306a3a1b0022f971 100644 --- a/paddle/pten/kernels/funcs/slice_utils.h +++ b/paddle/phi/kernels/funcs/slice_utils.h @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. */ #pragma once -#include +#include #include #include -namespace pten { +namespace phi { template -inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, +inline void CheckAndUpdateSliceAttrs(const DDim in_dims, const std::vector& axes, std::vector* starts, std::vector* ends, @@ -31,7 +31,7 @@ inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, PADDLE_ENFORCE_LT( axis, in_dims.size(), - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "The axis value should be less than the rank of input, " "but received axes[%d] = %d, rank of input is %d.", i, @@ -49,7 +49,7 @@ inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, PADDLE_ENFORCE_NE( step, 0, - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "Step should not be 0, but received step = %d.", step)); T start = (*starts)[i] < 0 ? ((*starts)[i] + dim_value) : (*starts)[i]; @@ -65,7 +65,7 @@ inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, PADDLE_ENFORCE_GE( end, start, - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "When step > 0, end should be greater than start, but " "received end = %d, start = %d.", end, @@ -79,7 +79,7 @@ inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, PADDLE_ENFORCE_GE( start, end, - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "When step < 0, start should be greater than end, but " "received start = %d, end = %d.", start, @@ -96,14 +96,13 @@ inline void CheckAndUpdateSliceAttrs(const framework::DDim in_dims, } template -inline pten::framework::DDim GetSliceDims( - const pten::framework::DDim in_dims, - const std::vector& axes, - const std::vector& starts, - const std::vector& ends, - std::vector* steps = nullptr, - std::vector* infer_flags = nullptr) { - pten::framework::DDim slice_dims(in_dims); +inline phi::DDim GetSliceDims(const phi::DDim in_dims, + const std::vector& axes, + const std::vector& starts, + const std::vector& ends, + std::vector* steps = nullptr, + std::vector* infer_flags = nullptr) { + phi::DDim slice_dims(in_dims); for (size_t i = 0; i < axes.size(); ++i) { T axis = axes[i]; @@ -126,10 +125,10 @@ inline pten::framework::DDim GetSliceDims( } template -inline framework::DDim GetDecreasedDims(const framework::DDim slice_dims, - const std::vector& decrease_axes, - std::vector* infer_flags = nullptr) { - framework::DDim decreased_dims(slice_dims); +inline DDim GetDecreasedDims(const DDim slice_dims, + const std::vector& decrease_axes, + std::vector* infer_flags = nullptr) { + DDim decreased_dims(slice_dims); std::vector decrease_flag(slice_dims.size(), 0); if (decrease_axes.size() > 0) { for (size_t i = 0; i < decrease_axes.size(); ++i) { @@ -138,7 +137,7 @@ inline framework::DDim GetDecreasedDims(const framework::DDim slice_dims, if (infer_flags && (*infer_flags)[i] != -1) { PADDLE_ENFORCE_EQ(decreased_dims[axis], 1, - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "Decrease dim should be 1, but now received %d", decreased_dims[axis])); } @@ -162,4 +161,4 @@ inline framework::DDim GetDecreasedDims(const framework::DDim slice_dims, return decreased_dims; } -} // namespace pten +} // namespace phi diff --git a/paddle/pten/kernels/gpu/slice_grad_kernel.cu b/paddle/phi/kernels/gpu/slice_grad_kernel.cu similarity index 63% rename from paddle/pten/kernels/gpu/slice_grad_kernel.cu rename to paddle/phi/kernels/gpu/slice_grad_kernel.cu index a8902e8900b5df679fb36a08dd9e78c3c65d8cc3..0c82be2371ad1e588cb6af829df38ee3ff4ef1d4 100644 --- a/paddle/pten/kernels/gpu/slice_grad_kernel.cu +++ b/paddle/phi/kernels/gpu/slice_grad_kernel.cu @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/kernels/impl/slice_grad_kernel_impl.h" -#include "paddle/pten/kernels/slice_grad_kernel.h" +#include "paddle/phi/kernels/impl/slice_grad_kernel_impl.h" +#include "paddle/phi/kernels/slice_grad_kernel.h" -#include "paddle/pten/backends/gpu/gpu_context.h" -#include "paddle/pten/core/kernel_registry.h" +#include "paddle/phi/backends/gpu/gpu_context.h" +#include "paddle/phi/core/kernel_registry.h" -PT_REGISTER_KERNEL(slice_grad, +PD_REGISTER_KERNEL(slice_grad, GPU, ALL_LAYOUT, - pten::SliceGradRawKernel, + phi::SliceGradRawKernel, bool, int, int64_t, float, double, - pten::dtype::complex, - pten::dtype::complex, - pten::dtype::bfloat16, - pten::dtype::float16) {} + phi::dtype::complex, + phi::dtype::complex, + phi::dtype::bfloat16, + phi::dtype::float16) {} diff --git a/paddle/pten/kernels/gpu/slice_kernel.cu b/paddle/phi/kernels/gpu/slice_kernel.cu.cc similarity index 66% rename from paddle/pten/kernels/gpu/slice_kernel.cu rename to paddle/phi/kernels/gpu/slice_kernel.cu.cc index 217dacdafc04f82fd02518000a14440f3ae6f95b..016edf4e5c1258011a6f158015c8fe792d48822c 100644 --- a/paddle/pten/kernels/gpu/slice_kernel.cu +++ b/paddle/phi/kernels/gpu/slice_kernel.cu.cc @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/kernels/impl/slice_kernel_impl.h" -#include "paddle/pten/kernels/slice_kernel.h" +#include "paddle/phi/kernels/slice_kernel.h" +#include "paddle/phi/kernels/impl/slice_kernel_impl.h" -#include "paddle/pten/backends/gpu/gpu_context.h" -#include "paddle/pten/core/kernel_registry.h" +#include "paddle/phi/backends/gpu/gpu_context.h" +#include "paddle/phi/core/kernel_registry.h" -PT_REGISTER_KERNEL(slice, +PD_REGISTER_KERNEL(slice, GPU, ALL_LAYOUT, - pten::SliceRawKernel, + phi::SliceRawKernel, bool, int, int64_t, float, double, - pten::dtype::complex, - pten::dtype::complex, - pten::dtype::bfloat16) {} + phi::dtype::complex, + phi::dtype::complex, + phi::dtype::bfloat16) {} diff --git a/paddle/pten/kernels/impl/slice_grad_kernel_impl.h b/paddle/phi/kernels/impl/slice_grad_kernel_impl.h similarity index 93% rename from paddle/pten/kernels/impl/slice_grad_kernel_impl.h rename to paddle/phi/kernels/impl/slice_grad_kernel_impl.h index e188522fc7bb9295e8eb03c73018c1471934ce74..6ec95dc34d6b1900be6e8bb2b68a4dd44a90c9f7 100644 --- a/paddle/pten/kernels/impl/slice_grad_kernel_impl.h +++ b/paddle/phi/kernels/impl/slice_grad_kernel_impl.h @@ -14,12 +14,12 @@ #pragma once -#include "paddle/pten/kernels/funcs/eigen/common.h" -#include "paddle/pten/kernels/funcs/eigen/eigen_function.h" -#include "paddle/pten/kernels/funcs/slice_utils.h" -#include "paddle/pten/kernels/slice_grad_kernel.h" +#include "paddle/phi/kernels/funcs/eigen/common.h" +#include "paddle/phi/kernels/funcs/eigen/eigen_function.h" +#include "paddle/phi/kernels/funcs/slice_utils.h" +#include "paddle/phi/kernels/slice_grad_kernel.h" -namespace pten { +namespace phi { template void LaunchEigenPadding( @@ -108,8 +108,8 @@ void EigenPaddingCompute( // out_tore_shape[1] = out_dims[pad_dim]; // // convert array from std::vector to DDim - // DDim reshaped_in_dims = framework::make_ddim(in_tore_shape); - // DDim reshaped_out_dims = framework::make_ddim(out_tore_shape); + // DDim reshaped_in_dims = make_ddim(in_tore_shape); + // DDim reshaped_out_dims = make_ddim(out_tore_shape); // // after reshape: the first dimension do not need padding, // // set padding[0] zero @@ -138,8 +138,8 @@ void EigenPaddingCompute( // } // // convert array from std::vector to DDim - // DDim reshaped_in_dims = framework::make_ddim(in_tore_shape); - // DDim reshaped_out_dims = framework::make_ddim(out_tore_shape); + // DDim reshaped_in_dims = make_ddim(in_tore_shape); + // DDim reshaped_out_dims = make_ddim(out_tore_shape); // // after reshape: // // the first dimension is the previous padding dimension @@ -173,8 +173,8 @@ void EigenPaddingCompute( // } // // convert array from std::vector to DDim - // DDim reshaped_in_dims = framework::make_ddim(in_tore_shape); - // DDim reshaped_out_dims = framework::make_ddim(out_tore_shape); + // DDim reshaped_in_dims = make_ddim(in_tore_shape); + // DDim reshaped_out_dims = make_ddim(out_tore_shape); // // after reshape: // // the first dimension do not need padding, set padding[0] zero @@ -219,7 +219,7 @@ void SliceGradCompute(const Context& ctx, if (decrease_size == static_cast(in_dims.size())) { // all dims decrease std::vector origin_out_shape(decrease_size, 1); - out_dims = framework::make_ddim(std::vector(decrease_size, 1)); + out_dims = make_ddim(std::vector(decrease_size, 1)); } else { std::vector origin_out_shape(out_dims.size() + decrease_size, -1); for (size_t i = 0; i < decrease_size; ++i) { @@ -234,7 +234,7 @@ void SliceGradCompute(const Context& ctx, } } - out_dims = framework::make_ddim(origin_out_shape); + out_dims = make_ddim(origin_out_shape); } } @@ -334,9 +334,9 @@ void SliceGradRawKernel(const Context& ctx, input_grad); break; default: - PADDLE_THROW(pten::errors::InvalidArgument( + PADDLE_THROW(phi::errors::InvalidArgument( "The rank of input should be less than 7, but received %d.", rank)); } } -} // namespace pten +} // namespace phi diff --git a/paddle/pten/kernels/impl/slice_kernel_impl.h b/paddle/phi/kernels/impl/slice_kernel_impl.h similarity index 93% rename from paddle/pten/kernels/impl/slice_kernel_impl.h rename to paddle/phi/kernels/impl/slice_kernel_impl.h index b9075e12384668a53ced796bdb28e2ce5a73e7ff..54d199e53925da011a8b73932411267338d3dcef 100644 --- a/paddle/pten/kernels/impl/slice_kernel_impl.h +++ b/paddle/phi/kernels/impl/slice_kernel_impl.h @@ -14,11 +14,11 @@ #pragma once -#include "paddle/pten/kernels/funcs/eigen/common.h" -#include "paddle/pten/kernels/funcs/eigen/eigen_function.h" -#include "paddle/pten/kernels/funcs/slice_utils.h" +#include "paddle/phi/kernels/funcs/eigen/common.h" +#include "paddle/phi/kernels/funcs/eigen/eigen_function.h" +#include "paddle/phi/kernels/funcs/slice_utils.h" -namespace pten { +namespace phi { template void SliceCompute(const Context& ctx, @@ -35,11 +35,11 @@ void SliceCompute(const Context& ctx, PADDLE_ENFORCE_EQ( starts.size(), axes.size(), - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "The size of starts must be equal to the size of axes.")); PADDLE_ENFORCE_EQ(ends.size(), axes.size(), - pten::errors::InvalidArgument( + phi::errors::InvalidArgument( "The size of ends must be equal to the size of axes.")); // Step 2: Compute output @@ -143,9 +143,9 @@ void SliceRawKernel(const Context& ctx, ctx, input, axes, starts, ends, infer_flags, decrease_axis, out); break; default: - PADDLE_THROW(pten::errors::InvalidArgument( + PADDLE_THROW(phi::errors::InvalidArgument( "The rank of input should be less than 7, but received %d.", rank)); } } -} // namespace pten +} // namespace phi diff --git a/paddle/pten/kernels/slice_grad_kernel.h b/paddle/phi/kernels/slice_grad_kernel.h similarity index 93% rename from paddle/pten/kernels/slice_grad_kernel.h rename to paddle/phi/kernels/slice_grad_kernel.h index a0c3e3532ac66af4f8b7843cbeb0de8aa2127333..c76c9dede5f3736c76f5b218f1dc861e11771319 100644 --- a/paddle/pten/kernels/slice_grad_kernel.h +++ b/paddle/phi/kernels/slice_grad_kernel.h @@ -14,9 +14,9 @@ #pragma once -#include "paddle/pten/core/dense_tensor.h" +#include "paddle/phi/core/dense_tensor.h" -namespace pten { +namespace phi { template void SliceGradRawKernel(const Context& ctx, @@ -28,4 +28,4 @@ void SliceGradRawKernel(const Context& ctx, const std::vector& decrease_axis, DenseTensor* input_grad); -} // namespace pten +} // namespace phi diff --git a/paddle/phi/kernels/slice_kernel.h b/paddle/phi/kernels/slice_kernel.h new file mode 100644 index 0000000000000000000000000000000000000000..2bbe590ce65361fe667dfcd518f7da022c093e61 --- /dev/null +++ b/paddle/phi/kernels/slice_kernel.h @@ -0,0 +1,31 @@ +// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// 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. + +#pragma once + +#include "paddle/phi/core/dense_tensor.h" + +namespace phi { + +template +void SliceRawKernel(const Context& ctx, + const DenseTensor& input, + const std::vector& axes, + const std::vector& starts, + const std::vector& ends, + const std::vector& infer_flags, + const std::vector& decrease_axis, + DenseTensor* out); + +} // namespace phi diff --git a/paddle/pten/ops/compat/slice_sig.cc b/paddle/phi/ops/compat/slice_sig.cc similarity index 83% rename from paddle/pten/ops/compat/slice_sig.cc rename to paddle/phi/ops/compat/slice_sig.cc index 9bfd2ec0a60e5f3a57a590c3e9b5e1169644e322..5048ba260abbf9c56f6a3a29b8b8d92899353b6a 100644 --- a/paddle/pten/ops/compat/slice_sig.cc +++ b/paddle/phi/ops/compat/slice_sig.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/core/compat/op_utils.h" +#include "paddle/phi/core/compat/op_utils.h" -namespace pten { +namespace phi { KernelSignature SliceOpArgumentMapping(const ArgumentMappingContext& ctx) { return KernelSignature( @@ -32,7 +32,7 @@ KernelSignature SliceGradOpArgumentMapping(const ArgumentMappingContext& ctx) { {GradVarName("Input")}); } -} // namespace pten +} // namespace phi -PT_REGISTER_ARG_MAPPING_FN(slice, pten::SliceOpArgumentMapping); -PT_REGISTER_ARG_MAPPING_FN(slice_grad, pten::SliceGradOpArgumentMapping); +PD_REGISTER_ARG_MAPPING_FN(slice, phi::SliceOpArgumentMapping); +PD_REGISTER_ARG_MAPPING_FN(slice_grad, phi::SliceGradOpArgumentMapping); diff --git a/paddle/pten/kernels/slice_kernel.h b/paddle/pten/kernels/slice_kernel.h index 539fa1ab507d27a827be2ff90672cb9eda34ca39..2bbe590ce65361fe667dfcd518f7da022c093e61 100644 --- a/paddle/pten/kernels/slice_kernel.h +++ b/paddle/pten/kernels/slice_kernel.h @@ -14,9 +14,9 @@ #pragma once -#include "paddle/pten/core/dense_tensor.h" +#include "paddle/phi/core/dense_tensor.h" -namespace pten { +namespace phi { template void SliceRawKernel(const Context& ctx, @@ -28,4 +28,4 @@ void SliceRawKernel(const Context& ctx, const std::vector& decrease_axis, DenseTensor* out); -} // namespace pten +} // namespace phi