diff --git a/paddle/phi/kernels/assign_kernel.cc b/paddle/phi/kernels/assign_kernel.cc index 5eafc869fa551ac5dfdc7d2e4bec24d75808938f..720ebb5b78c9a8fe9d04025fcb35fbc57a5adc0b 100644 --- a/paddle/phi/kernels/assign_kernel.cc +++ b/paddle/phi/kernels/assign_kernel.cc @@ -23,22 +23,22 @@ namespace phi { template -void AssignRawKernel(const Context& dev_ctx, - const DenseTensor& x, - DenseTensor* out) { +void AssignKernel(const Context& dev_ctx, + const DenseTensor& x, + DenseTensor* out) { Copy(dev_ctx, x, x.place(), false, out); } template -void AssignKernel(const Context& dev_ctx, - paddle::optional x, - DenseTensor* out) { +void AssignRawKernel(const Context& dev_ctx, + paddle::optional x, + DenseTensor* out) { if (x) { if (!x->IsInitialized()) { return; } auto& x_tensor = *x.get_ptr(); - AssignRawKernel(dev_ctx, x_tensor, out); + AssignKernel(dev_ctx, x_tensor, out); } } @@ -111,14 +111,14 @@ void AssignValueKernel(const Context& dev_ctx, } // namespace phi +PD_REGISTER_GENERAL_KERNEL( + assign, CPU, ALL_LAYOUT, phi::AssignKernel, ALL_DTYPE) {} + PD_REGISTER_GENERAL_KERNEL(assign_raw, CPU, ALL_LAYOUT, phi::AssignRawKernel, - ALL_DTYPE) {} - -PD_REGISTER_GENERAL_KERNEL( - assign, CPU, ALL_LAYOUT, phi::AssignKernel, ALL_DTYPE) { + ALL_DTYPE) { kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND); } PD_REGISTER_GENERAL_KERNEL(assign_array, @@ -136,13 +136,13 @@ PD_REGISTER_KERNEL(assign_value, int64_t) {} #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) +PD_REGISTER_GENERAL_KERNEL( + assign, GPU, ALL_LAYOUT, phi::AssignKernel, ALL_DTYPE) {} PD_REGISTER_GENERAL_KERNEL(assign_raw, GPU, ALL_LAYOUT, phi::AssignRawKernel, - ALL_DTYPE) {} -PD_REGISTER_GENERAL_KERNEL( - assign, GPU, ALL_LAYOUT, phi::AssignKernel, ALL_DTYPE) { + ALL_DTYPE) { kernel->InputAt(0).SetBackend(phi::Backend::ALL_BACKEND); } PD_REGISTER_GENERAL_KERNEL(assign_array, diff --git a/paddle/phi/kernels/assign_kernel.h b/paddle/phi/kernels/assign_kernel.h index 437a2a0c189e868e8d6bee6567473439393eebaa..6881ac9f0ee22539985e6db1872164858d94fa81 100644 --- a/paddle/phi/kernels/assign_kernel.h +++ b/paddle/phi/kernels/assign_kernel.h @@ -22,17 +22,17 @@ namespace phi { template -void AssignRawKernel(const Context& dev_ctx, - const DenseTensor& x, - DenseTensor* out); +void AssignKernel(const Context& dev_ctx, + const DenseTensor& x, + DenseTensor* out); // In order to be compatible with the `AsDispensable` input in the original // assign op maker, the input parameter here needs to be dispensable, but // this looks weird template -void AssignKernel(const Context& dev_ctx, - paddle::optional x, - DenseTensor* out); +void AssignRawKernel(const Context& dev_ctx, + paddle::optional x, + DenseTensor* out); template void AssignArrayKernel(const Context& dev_ctx, diff --git a/paddle/phi/ops/compat/assign_sig.cc b/paddle/phi/ops/compat/assign_sig.cc index d149e8e6a9aa04d3cc8d02e370e7e07e3cbebeb0..c8cd9e44ff9ae9b5fd815fe9ce4dc1aff27b5fd1 100644 --- a/paddle/phi/ops/compat/assign_sig.cc +++ b/paddle/phi/ops/compat/assign_sig.cc @@ -23,10 +23,10 @@ KernelSignature AssignOpArgumentMapping(const ArgumentMappingContext& ctx) { } else if (ctx.IsSelectedRowsInput("X")) { return KernelSignature("assign_sr", {"X"}, {}, {"Out"}); } else { - return KernelSignature("assign", {"X"}, {}, {"Out"}); + return KernelSignature("assign_raw", {"X"}, {}, {"Out"}); } } else { - return KernelSignature("assign", {"X"}, {}, {"Out"}); + return KernelSignature("assign_raw", {"X"}, {}, {"Out"}); } } diff --git a/python/paddle/utils/code_gen/api.yaml b/python/paddle/utils/code_gen/api.yaml index 7e6740b6cb178caa9d2281389c0a8c60367066c9..b20259d3ebd2516bf0e63b7d3cab81d679938baa 100644 --- a/python/paddle/utils/code_gen/api.yaml +++ b/python/paddle/utils/code_gen/api.yaml @@ -174,7 +174,7 @@ infer_meta : func : UnchangedInferMeta kernel : - func : assign_raw + func : assign backward : assign_grad # atan diff --git a/python/paddle/utils/code_gen/backward.yaml b/python/paddle/utils/code_gen/backward.yaml index e2c5a970af17f6fd2729bd1c7272aacd8b0c0d99..78f4ac7c985fb67534929f5006840260f42f6e9d 100644 --- a/python/paddle/utils/code_gen/backward.yaml +++ b/python/paddle/utils/code_gen/backward.yaml @@ -120,7 +120,7 @@ func : UnchangedInferMeta param : [out_grad] kernel : - func : assign_raw + func : assign - backward_api : atan2_grad forward : atan2 (Tensor x, Tensor y) -> Tensor(out)