From 6f86c96ba351bbf7a1ee8d7fa4307b3e32eed5c4 Mon Sep 17 00:00:00 2001 From: zhangyuqin1998 <75946871+zhangyuqin1998@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:30:50 +0800 Subject: [PATCH] Delete randperm raw op (#51631) * Delete randperm raw op * fix --- paddle/phi/backends/xpu/xpu2_op_list.cc | 5 ----- paddle/phi/kernels/cpu/randperm_kernel.cc | 24 +++++----------------- paddle/phi/kernels/gpu/randperm_kernel.cu | 24 +++++----------------- paddle/phi/kernels/randperm_kernel.h | 4 ---- paddle/phi/kernels/xpu/randperm_kernel.cc | 25 +++++------------------ paddle/phi/ops/compat/randperm_sig.cc | 7 +------ 6 files changed, 16 insertions(+), 73 deletions(-) diff --git a/paddle/phi/backends/xpu/xpu2_op_list.cc b/paddle/phi/backends/xpu/xpu2_op_list.cc index fee4472d78c..76234856d05 100644 --- a/paddle/phi/backends/xpu/xpu2_op_list.cc +++ b/paddle/phi/backends/xpu/xpu2_op_list.cc @@ -514,11 +514,6 @@ XPUOpMap& get_kl2_ops() { XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::FLOAT16})}, {"prod_raw", XPUKernelSet({phi::DataType::FLOAT32})}, {"range", XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::INT64})}, - {"randperm_raw", - XPUKernelSet({phi::DataType::INT32, - phi::DataType::INT64, - phi::DataType::FLOAT32, - phi::DataType::FLOAT64})}, {"randperm", XPUKernelSet({phi::DataType::INT32, phi::DataType::INT64, diff --git a/paddle/phi/kernels/cpu/randperm_kernel.cc b/paddle/phi/kernels/cpu/randperm_kernel.cc index 6cb435f53b8..b536f75a715 100644 --- a/paddle/phi/kernels/cpu/randperm_kernel.cc +++ b/paddle/phi/kernels/cpu/randperm_kernel.cc @@ -19,9 +19,12 @@ namespace phi { template -void RandpermRawKernel( - const Context& dev_ctx, int n, DataType dtype, int seed, DenseTensor* out) { +void RandpermKernel(const Context& dev_ctx, + int n, + DataType dtype, + DenseTensor* out) { T* out_data = dev_ctx.template Alloc(out); + int seed = 0; std::shared_ptr engine; if (seed) { @@ -37,25 +40,8 @@ void RandpermRawKernel( std::shuffle(out_data, out_data + n, *engine); } -template -void RandpermKernel(const Context& dev_ctx, - int n, - DataType dtype, - DenseTensor* out) { - RandpermRawKernel(dev_ctx, n, dtype, 0, out); -} - } // namespace phi -PD_REGISTER_KERNEL(randperm_raw, - CPU, - ALL_LAYOUT, - phi::RandpermRawKernel, - float, - double, - int, - int64_t) {} - PD_REGISTER_KERNEL(randperm, CPU, ALL_LAYOUT, diff --git a/paddle/phi/kernels/gpu/randperm_kernel.cu b/paddle/phi/kernels/gpu/randperm_kernel.cu index a688e99ecd0..dbfe2dd992e 100644 --- a/paddle/phi/kernels/gpu/randperm_kernel.cu +++ b/paddle/phi/kernels/gpu/randperm_kernel.cu @@ -85,9 +85,12 @@ __global__ void SwapRepeatKernel(keyT* key_out_data, } template -void RandpermRawKernel( - const Context& dev_ctx, int n, DataType dtype, int seed, DenseTensor* out) { +void RandpermKernel(const Context& dev_ctx, + int n, + DataType dtype, + DenseTensor* out) { DenseTensor key; + int seed = 0; RandintKernel(dev_ctx, std::numeric_limits::min(), std::numeric_limits::max(), @@ -151,25 +154,8 @@ void RandpermRawKernel( key_out.data(), out_data, n, seed_offset.first, seed_offset.second); } -template -void RandpermKernel(const Context& dev_ctx, - int n, - DataType dtype, - DenseTensor* out) { - RandpermRawKernel(dev_ctx, n, dtype, 0, out); -} - } // namespace phi -PD_REGISTER_KERNEL(randperm_raw, - GPU, - ALL_LAYOUT, - phi::RandpermRawKernel, - float, - double, - int, - int64_t) {} - PD_REGISTER_KERNEL(randperm, GPU, ALL_LAYOUT, diff --git a/paddle/phi/kernels/randperm_kernel.h b/paddle/phi/kernels/randperm_kernel.h index 70b95db98be..ea77721d886 100644 --- a/paddle/phi/kernels/randperm_kernel.h +++ b/paddle/phi/kernels/randperm_kernel.h @@ -19,10 +19,6 @@ namespace phi { -template -void RandpermRawKernel( - const Context& dev_ctx, int n, DataType dtype, int seed, DenseTensor* out); - template void RandpermKernel(const Context& dev_ctx, int n, diff --git a/paddle/phi/kernels/xpu/randperm_kernel.cc b/paddle/phi/kernels/xpu/randperm_kernel.cc index 7f5f85e5160..b5ba469b837 100644 --- a/paddle/phi/kernels/xpu/randperm_kernel.cc +++ b/paddle/phi/kernels/xpu/randperm_kernel.cc @@ -21,10 +21,12 @@ namespace phi { template -void RandpermRawKernel( - const Context& dev_ctx, int n, DataType dtype, int seed, DenseTensor* out) { +void RandpermKernel(const Context& dev_ctx, + int n, + DataType dtype, + DenseTensor* out) { std::shared_ptr engine; - + int seed = 0; if (seed) { engine = std::make_shared(); engine->seed(seed); @@ -51,25 +53,8 @@ void RandpermRawKernel( } } -template -void RandpermKernel(const Context& dev_ctx, - int n, - DataType dtype, - DenseTensor* out) { - RandpermRawKernel(dev_ctx, n, dtype, 0, out); -} - } // namespace phi -PD_REGISTER_KERNEL(randperm_raw, - XPU, - ALL_LAYOUT, - phi::RandpermRawKernel, - int, - int64_t, - float, - double) {} - PD_REGISTER_KERNEL(randperm, XPU, ALL_LAYOUT, diff --git a/paddle/phi/ops/compat/randperm_sig.cc b/paddle/phi/ops/compat/randperm_sig.cc index 89548beff67..14b28512e40 100644 --- a/paddle/phi/ops/compat/randperm_sig.cc +++ b/paddle/phi/ops/compat/randperm_sig.cc @@ -17,12 +17,7 @@ namespace phi { KernelSignature RandpermOpArgumentMapping(const ArgumentMappingContext& ctx) { - int seed = paddle::any_cast(ctx.Attr("seed")); - if (seed) { - return KernelSignature("randperm", {}, {"n", "dtype", "seed"}, {"Out"}); - } else { - return KernelSignature("randperm", {}, {"n", "dtype"}, {"Out"}); - } + return KernelSignature("randperm", {}, {"n", "dtype"}, {"Out"}); } } // namespace phi -- GitLab