[NPU]remove fluid apis accoring to Paddle (PaddlePaddle#231)

Author: USTCKAY

backends/npu/tests/unittests/test_conv2d_transpose_op_npu.py

@@ -513,47 +513,47 @@ def test_case1(self):
             name='data1', shape=[3, 5, 5], dtype='float32')
         data2 = fluid.layers.data(
             name='data2', shape=[5, 5, 3], dtype='float32')
-        out1 = fluid.layers.conv2d_transpose(
+        out1 = paddle.static.nn.conv2d_transpose(
             input=data1,
             groups=1,
             num_filters=6,
             filter_size=3,
             data_format='NCHW')
-        out2 = fluid.layers.conv2d_transpose(
+        out2 = paddle.static.nn.conv2d_transpose(
             input=data2,
             groups=1,
             num_filters=6,
             filter_size=3,
             data_format='NHWC')
-        out3 = fluid.layers.conv2d_transpose(
+        out3 = paddle.static.nn.conv2d_transpose(
             input=data1,
             groups=1,
             num_filters=6,
             filter_size=3,
             padding=[[0, 0], [1, 1], [1, 1], [0, 0]],
             data_format='NHWC')
-        out4 = fluid.layers.conv2d_transpose(
+        out4 = paddle.static.nn.conv2d_transpose(
             input=data1,
             groups=3,
             num_filters=6,
             filter_size=3,
             padding=[[0, 0], [0, 0], [2, 1], [0, 0]],
             data_format='NCHW')
-        out5 = fluid.layers.conv2d_transpose(
+        out5 = paddle.static.nn.conv2d_transpose(
             input=data2,
             groups=1,
             num_filters=6,
             filter_size=3,
             padding='SAME',
             data_format='NCHW')
-        out6 = fluid.layers.conv2d_transpose(
+        out6 = paddle.static.nn.conv2d_transpose(
             input=data1,
             groups=1,
             num_filters=6,
             filter_size=3,
             padding='VALID',
             data_format='NHWC')
-        out7 = fluid.layers.conv2d_transpose(
+        out7 = paddle.static.nn.conv2d_transpose(
             input=data1,
             groups=1,
             num_filters=6,

backends/npu/tests/unittests/test_hard_sigmoid_op_npu.py

@@ -125,15 +125,15 @@ def test_dygraph_api(self):
     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)
         self.assertTrue(np.allclose(out_ref, res[0]))
 
         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)
         self.assertTrue(np.allclose(out_ref, out.numpy()))
         paddle.enable_static()
 

backends/npu/tests/unittests/test_huber_loss_op_npu.py

@@ -116,26 +116,5 @@ def init_dtype(self):
         self.dtype = np.float16
 
 
-class TestHuberLossOpError(unittest.TestCase):
-    def test_errors(self):
-        with program_guard(Program(), Program()):
-            # the input and label must be Variable
-            xw = np.random.random((6, 6)).astype("float32")
-            xr = fluid.data(name='xr', shape=[None, 6], dtype="float32")
-            lw = np.random.random((6, 6)).astype("float32")
-            lr = fluid.data(name='lr', shape=[None, 6], dtype="float32")
-            delta = 1.0
-            self.assertRaises(TypeError, fluid.layers.huber_loss, xr, lw, delta)
-            self.assertRaises(TypeError, fluid.layers.huber_loss, xw, lr, delta)
-
-            # the dtype of input and label must be float32 or float64
-            xw2 = fluid.data(name='xw2', shape=[None, 6], dtype="int32")
-            lw2 = fluid.data(name='lw2', shape=[None, 6], dtype="int32")
-            self.assertRaises(TypeError, fluid.layers.huber_loss, xw2, lr,
-                              delta)
-            self.assertRaises(TypeError, fluid.layers.huber_loss, xr, lw2,
-                              delta)
-
-
 if __name__ == '__main__':
     unittest.main()