remove hard_sigmoid in nn.py under fluid (#47890)

* remove hard_sigmoid in nn.py under fluid

* fix hardsigmoid test case

* fix hardsigmoid test case

python/paddle/fluid/layers/nn.py

@@ -124,7 +124,6 @@ __all__ = [
     'log',
     'crop_tensor',
     'pow',
-    'hard_sigmoid',
     'prelu',
     'brelu',
     'leaky_relu',
@@ -9056,50 +9055,6 @@ def pow(x, factor=1.0, name=None):
     return out
 
 
-@templatedoc()
-def hard_sigmoid(x, slope=0.2, offset=0.5, name=None):
-    """
-    ${comment}
-    Parameters:
-        x (${x_type}): ${x_comment}
-        slope (float, optional): ${slope_comment}
-        offset (float, optional): ${offset_comment}
-        name (str, optional): The default value is None. Normally there is no
-            need for user to set this property. For more information, please
-            refer to :ref:`api_guide_Name`
-
-    Returns:
-        ${out_type}: ${out_comment}
-
-    Examples:
-
-        .. code-block:: python
-
-            import paddle.fluid as fluid
-            import paddle
-            paddle.enable_static()
-
-            data = fluid.layers.fill_constant(shape=[3, 2], value=0.5, dtype='float32') # [[0.5, 0.5], [0.5, 0.5], [0.5, 0.5]]
-            result = fluid.layers.hard_sigmoid(data) # [[0.6, 0.6], [0.6, 0.6], [0.6, 0.6]]
-    """
-    if _non_static_mode():
-        return _legacy_C_ops.hard_sigmoid(x, 'slope', slope, 'offset', offset)
-
-    check_variable_and_dtype(
-        x, 'x', ['float16', 'float32', 'float64'], 'hard_sigmoid'
-    )
-
-    helper = LayerHelper('hard_sigmoid', **locals())
-    out = helper.create_variable_for_type_inference(dtype=x.dtype)
-    helper.append_op(
-        type='hard_sigmoid',
-        inputs={'X': x},
-        outputs={'Out': out},
-        attrs={'slope': slope, 'offset': offset},
-    )
-    return out
-
-
 @deprecated(since="2.0.0", update_to="paddle.static.nn.prelu")
 def prelu(x, mode, param_attr=None, data_format="NCHW", name=None):
     r"""

python/paddle/fluid/tests/unittests/ir/inference/test_trt_activation_pass.py

@@ -92,7 +92,7 @@ class TensorRTSubgraphPassHardSwishTest(TensorRTSubgraphPassActivationTest):
 
 class TensorRTSubgraphPassHardSigmoidTest(TensorRTSubgraphPassActivationTest):
     def append_act(self, x):
-        return fluid.layers.hard_sigmoid(x)
+        return paddle.nn.functional.hardsigmoid(x)
 
 
 class TensorRTSubgraphPassHardSwishPluginTest(

python/paddle/fluid/tests/unittests/mlu/test_hard_sigmoid_op_mlu.py

@@ -162,7 +162,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
         paddle.enable_static()
         with fluid.program_guard(fluid.Program()):
             x = fluid.data('X', self.x_np.shape, self.x_np.dtype)
-            out = fluid.layers.hard_sigmoid(x)
+            out = paddle.nn.functional.hardsigmoid(x)
             exe = fluid.Executor(self.place)
             res = exe.run(feed={'X': self.x_np}, fetch_list=[out])
         out_ref = ref_hardsigmoid(self.x_np, 0.2, 0.5)
@@ -170,7 +170,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
 
         paddle.disable_static(self.place)
         x = paddle.to_tensor(self.x_np)
-        out = paddle.fluid.layers.hard_sigmoid(x)
+        out = paddle.nn.functional.hardsigmoid(x)
         np.testing.assert_allclose(out_ref, out.numpy())
         paddle.enable_static()
 

python/paddle/fluid/tests/unittests/npu/test_hard_sigmoid_op_npu.py

@@ -123,7 +123,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
     def test_fluid_api(self):
         with fluid.program_guard(fluid.Program()):
             x = fluid.data('X', self.x_np.shape, self.x_np.dtype)
-            out = fluid.layers.hard_sigmoid(x)
+            out = paddle.nn.functional.hardsigmoid(x)
             exe = fluid.Executor(self.place)
             res = exe.run(feed={'X': self.x_np}, fetch_list=[out])
         out_ref = ref_hardsigmoid(self.x_np, 0.2, 0.5)
@@ -131,7 +131,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
 
         paddle.disable_static(self.place)
         x = paddle.to_tensor(self.x_np)
-        out = paddle.fluid.layers.hard_sigmoid(x)
+        out = paddle.nn.functional.hardsigmoid(x)
         np.testing.assert_allclose(out_ref, out.numpy())
         paddle.enable_static()
 

python/paddle/fluid/tests/unittests/test_activation_op.py

@@ -3338,7 +3338,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
     def test_fluid_api(self):
         with fluid.program_guard(fluid.Program()):
             x = fluid.data('X', self.x_np.shape, self.x_np.dtype)
-            out = fluid.layers.hard_sigmoid(x)
+            out = paddle.nn.functional.hardsigmoid(x, slope=0.2)
             exe = fluid.Executor(self.place)
             res = exe.run(feed={'X': self.x_np}, fetch_list=[out])
         out_ref = ref_hardsigmoid(self.x_np, 0.2, 0.5)
@@ -3346,7 +3346,7 @@ class TestHardsigmoidAPI(unittest.TestCase):
 
         paddle.disable_static(self.place)
         x = paddle.to_tensor(self.x_np)
-        out = paddle.fluid.layers.hard_sigmoid(x)
+        out = paddle.nn.functional.hardsigmoid(x, slope=0.2)
         np.testing.assert_allclose(out_ref, out.numpy(), rtol=1e-05)
         paddle.enable_static()
 

python/paddle/fluid/tests/unittests/test_imperative_basic.py

@@ -896,7 +896,7 @@ class TestDygraphUtils(unittest.TestCase):
         with fluid.dygraph.guard():
             a = paddle.to_tensor(a_np)
             res1 = func(a, act="hard_sigmoid")
-            res2 = fluid.layers.hard_sigmoid(a)
+            res2 = paddle.nn.functional.hardsigmoid(a, slope=0.2)
             np.testing.assert_array_equal(res1.numpy(), res2.numpy())
 
     def test_append_activation_in_dygraph1(self):