From 1b71a718f185421f4f7b77faa111781133465e82 Mon Sep 17 00:00:00 2001
From: Jackwaterveg <87408988+Jackwaterveg@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:44:58 +0800
Subject: [PATCH] [NPU] Add square grad (#34889)

* test=develop

* test=develop
---
 paddle/fluid/operators/activation_op_npu.cc   | 35 +++++++++++++++++++
 .../tests/unittests/npu/test_square_op_npu.py | 10 +++---
 2 files changed, 39 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 paddle/fluid/operators/activation_op_npu.cc

diff --git a/paddle/fluid/operators/activation_op_npu.cc b/paddle/fluid/operators/activation_op_npu.cc
old mode 100755
new mode 100644
index d815a3eeb4..5f2925784e
--- a/paddle/fluid/operators/activation_op_npu.cc
+++ b/paddle/fluid/operators/activation_op_npu.cc
@@ -386,6 +386,35 @@ class SquareNPUKernel : public framework::OpKernel<T> {
   }
 };
 
+template <typename DeviceContext, typename T>
+class SquareGradNPUKernel : public framework::OpKernel<T> {
+ public:
+  void Compute(const framework::ExecutionContext& ctx) const override {
+    auto* x = ctx.Input<Tensor>("X");
+    auto* dout = ctx.Input<Tensor>(framework::GradVarName("Out"));
+    auto* dx = ctx.Output<Tensor>(framework::GradVarName("X"));
+
+    auto factor = static_cast<float>(2.0);
+
+    auto place = ctx.GetPlace();
+    auto stream =
+        ctx.template device_context<paddle::platform::NPUDeviceContext>()
+            .stream();
+    // Step 1: Compute x_muls_factor = factor * x
+    Tensor x_muls_factor(x->type());
+    x_muls_factor.mutable_data<T>(x->dims(), place);
+    const auto& runner_muls_1 =
+        NpuOpRunner("Muls", {*x}, {x_muls_factor}, {{"value", factor}});
+    runner_muls_1.Run(stream);
+
+    // Step 2: Compute dx = dout * factor * x
+    dx->mutable_data<T>(place);
+    const auto& runner_mul_2 =
+        NpuOpRunner("Mul", {*dout, x_muls_factor}, {*dx}, {});
+    runner_mul_2.Run(stream);
+  }
+};
+
 template <typename DeviceContext, typename T>
 class SigmoidNPUKernel : public framework::OpKernel<T> {
  public:
@@ -869,6 +898,12 @@ REGISTER_OP_NPU_KERNEL(
                          paddle::platform::float16>,
     ops::SquareNPUKernel<paddle::platform::NPUDeviceContext, int>);
 
+REGISTER_OP_NPU_KERNEL(
+    square_grad,
+    ops::SquareGradNPUKernel<paddle::platform::NPUDeviceContext, float>,
+    ops::SquareNPUKernel<paddle::platform::NPUDeviceContext,
+                         paddle::platform::float16>);
+
 REGISTER_OP_NPU_KERNEL(
     sigmoid, ops::SigmoidNPUKernel<paddle::platform::NPUDeviceContext, float>,
     ops::SigmoidNPUKernel<paddle::platform::NPUDeviceContext,
diff --git a/python/paddle/fluid/tests/unittests/npu/test_square_op_npu.py b/python/paddle/fluid/tests/unittests/npu/test_square_op_npu.py
index 8262c3b94d..caf55b4850 100644
--- a/python/paddle/fluid/tests/unittests/npu/test_square_op_npu.py
+++ b/python/paddle/fluid/tests/unittests/npu/test_square_op_npu.py
@@ -50,12 +50,10 @@ class TestSquare(OpTest):
     def test_check_output(self):
         self.check_output_with_place(self.place)
 
-    # TODO(ascendrc): Add grad test
-    # def test_check_grad(self):
-    #     if self.dtype == np.float16:
-    #         return
-    #     self.check_grad(['X'], 'Out')
-    #
+    def test_check_grad(self):
+        if self.dtype == np.float16:
+            return
+        self.check_grad_with_place(self.place, ['X'], 'Out')
 
 
 class TestSquareFp16(OpTest):
-- 
GitLab