copy api from paddle to paddle.fluid (#24164)

* copy api from paddle to paddle.fluid, test=develop

* fix optest, test=develop

Author: JepsonWong

python/paddle/fluid/dygraph/nn.py

@@ -23,9 +23,9 @@ def allclose_check(self, use_cuda):
         a = fluid.data(name="a", shape=[2], dtype='float32')
         b = fluid.data(name="b", shape=[2], dtype='float32')
 
-        result = paddle.allclose(
+        result = fluid.layers.allclose(
             a, b, rtol=1e-05, atol=1e-08, equal_nan=False, name="ignore_nan")
-        result_nan = paddle.allclose(
+        result_nan = fluid.layers.allclose(
             a, b, rtol=1e-05, atol=1e-08, equal_nan=True, name="equal_nan")
 
         place = fluid.CUDAPlace(0) if use_cuda else fluid.CPUPlace()
@@ -82,15 +82,15 @@ def test_dygraph_mode(self):
         with fluid.dygraph.guard():
             x_v_1 = fluid.dygraph.to_variable(x_1)
             y_v_1 = fluid.dygraph.to_variable(y_1)
-            ret_1 = paddle.allclose(
+            ret_1 = fluid.layers.allclose(
                 x_v_1,
                 y_v_1,
                 rtol=1e-05,
                 atol=1e-08,
                 equal_nan=False,
                 name='test_1')
             self.assertEqual(ret_1.numpy()[0], False)
-            ret_1 = paddle.allclose(
+            ret_1 = fluid.layers.allclose(
                 x_v_1,
                 y_v_1,
                 rtol=1e-05,
@@ -100,15 +100,15 @@ def test_dygraph_mode(self):
             self.assertEqual(ret_1.numpy()[0], False)
             x_v_2 = fluid.dygraph.to_variable(x_2)
             y_v_2 = fluid.dygraph.to_variable(y_2)
-            ret_2 = paddle.allclose(
+            ret_2 = fluid.layers.allclose(
                 x_v_2,
                 y_v_2,
                 rtol=1e-05,
                 atol=1e-08,
                 equal_nan=False,
                 name='test_3')
             self.assertEqual(ret_2.numpy()[0], True)
-            ret_2 = paddle.allclose(
+            ret_2 = fluid.layers.allclose(
                 x_v_2,
                 y_v_2,
                 rtol=1e-05,
@@ -118,15 +118,15 @@ def test_dygraph_mode(self):
             self.assertEqual(ret_2.numpy()[0], True)
             x_v_3 = fluid.dygraph.to_variable(x_3)
             y_v_3 = fluid.dygraph.to_variable(y_3)
-            ret_3 = paddle.allclose(
+            ret_3 = fluid.layers.allclose(
                 x_v_3,
                 y_v_3,
                 rtol=1e-05,
                 atol=1e-08,
                 equal_nan=False,
                 name='test_5')
             self.assertEqual(ret_3.numpy()[0], False)
-            ret_3 = paddle.allclose(
+            ret_3 = fluid.layers.allclose(
                 x_v_3,
                 y_v_3,
                 rtol=1e-05,

python/paddle/fluid/layers/nn.py

@@ -14,7 +14,6 @@
 
 from __future__ import print_function
 
-import paddle
 import paddle.fluid as fluid
 import unittest
 import numpy as np
@@ -71,15 +70,15 @@ def init_config(self):
 class TestArangeAPI(unittest.TestCase):
     def test_out(self):
         with fluid.program_guard(fluid.Program()):
-            data = paddle.arange(0, 5, 1)
+            data = fluid.layers.arange(0, 5, 1)
             place = fluid.CPUPlace()
             exe = fluid.Executor(place)
             result, = exe.run(fetch_list=[data])
             expected_data = np.arange(0, 5, 1).astype(np.float32)
         self.assertEqual((result == expected_data).all(), True)
 
         with fluid.program_guard(fluid.Program()):
-            data = paddle.arange(0.0, 5.0, 1.0, 'int32')
+            data = fluid.layers.arange(0.0, 5.0, 1.0, 'int32')
             place = fluid.CPUPlace()
             exe = fluid.Executor(place)
             result, = exe.run(fetch_list=[data])

python/paddle/fluid/layers/tensor.py

@@ -36,7 +36,7 @@ def test_BCELoss(self):
                         name='input', shape=[None, 30], dtype='float64')
                     label = fluid.data(
                         name='label', shape=[None, 30], dtype='float64')
-                    bce_loss = paddle.nn.loss.BCELoss(reduction=red)
+                    bce_loss = fluid.dygraph.BCELoss(reduction=red)
                     res = bce_loss(input, label)
 
                     exe = fluid.Executor(place)
@@ -47,7 +47,7 @@ def test_BCELoss(self):
                         fetch_list=[res])
 
                 with fluid.dygraph.guard():
-                    bce_loss = paddle.nn.loss.BCELoss(reduction=red)
+                    bce_loss = fluid.dygraph.BCELoss(reduction=red)
                     dy_res = bce_loss(
                         fluid.dygraph.to_variable(input_np),
                         fluid.dygraph.to_variable(label_np))
@@ -80,7 +80,7 @@ def test_BCELoss_weight(self):
                 name='label', shape=[None, 3, 4, 10], dtype='float64')
             weight = fluid.data(
                 name='weight', shape=[3, 4, 10], dtype='float64')
-            bce_loss = paddle.nn.loss.BCELoss(weight=weight)
+            bce_loss = fluid.dygraph.BCELoss(weight=weight)
             res = bce_loss(input, label)
 
             exe = fluid.Executor(place)
@@ -93,7 +93,7 @@ def test_BCELoss_weight(self):
                                     fetch_list=[res])
 
         with fluid.dygraph.guard():
-            bce_loss = paddle.nn.loss.BCELoss(
+            bce_loss = fluid.dygraph.BCELoss(
                 weight=fluid.dygraph.to_variable(weight_np))
             dy_res = bce_loss(
                 fluid.dygraph.to_variable(input_np),

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

@@ -82,7 +82,7 @@ def test_api(self):
         with fluid.program_guard(fluid.Program(), fluid.Program()):
             label = fluid.layers.assign(np.array([3, 3], dtype="int32"))
             limit = fluid.layers.assign(np.array([3, 2], dtype="int32"))
-            out = paddle.elementwise_equal(x=label, y=limit)
+            out = fluid.layers.elementwise_equal(x=label, y=limit)
             place = fluid.CPUPlace()
             exe = fluid.Executor(place)
             res, = exe.run(fetch_list=[out])
@@ -91,7 +91,7 @@ def test_api(self):
         with fluid.program_guard(fluid.Program(), fluid.Program()):
             label = fluid.layers.assign(np.array([3, 3], dtype="int32"))
             limit = fluid.layers.assign(np.array([3, 3], dtype="int32"))
-            out = paddle.elementwise_equal(x=label, y=limit)
+            out = fluid.layers.elementwise_equal(x=label, y=limit)
             place = fluid.CPUPlace()
             exe = fluid.Executor(place)
             res, = exe.run(fetch_list=[out])

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

@@ -35,7 +35,7 @@ def test_cross_entropy_loss_mean(self):
             label = fluid.layers.data(name='label', shape=[5, 1], dtype='int64')
             weight = fluid.layers.data(
                 name='weight', shape=[100], dtype='float32')
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(weight=weight)
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(weight=weight)
             ret = cross_entropy_loss(input, label)
 
             exe = fluid.Executor(place)
@@ -48,7 +48,7 @@ def test_cross_entropy_loss_mean(self):
                                  fetch_list=[ret])
             self.assertIsNotNone(static_ret)
         with fluid.dygraph.guard():
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(
                 weight=fluid.dygraph.to_variable(weight_np))
             dy_ret = cross_entropy_loss(
                 fluid.dygraph.to_variable(input_np),
@@ -71,7 +71,7 @@ def test_cross_entropy_loss_sum(self):
             label = fluid.layers.data(name='label', shape=[5, 1], dtype='int64')
             weight = fluid.layers.data(
                 name='weight', shape=[100], dtype='float32')
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(
                 weight=weight, reduction='sum')
             ret = cross_entropy_loss(input, label)
 
@@ -85,7 +85,7 @@ def test_cross_entropy_loss_sum(self):
                                  fetch_list=[ret])
             self.assertIsNotNone(static_ret)
         with fluid.dygraph.guard():
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(
                 weight=fluid.dygraph.to_variable(weight_np), reduction='sum')
             dy_ret = cross_entropy_loss(
                 fluid.dygraph.to_variable(input_np),
@@ -108,7 +108,7 @@ def test_cross_entropy_loss_none(self):
             label = fluid.layers.data(name='label', shape=[5, 1], dtype='int64')
             weight = fluid.layers.data(
                 name='weight', shape=[100], dtype='float32')
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(
                 weight=weight, reduction='none')
             ret = cross_entropy_loss(input, label)
 
@@ -122,7 +122,7 @@ def test_cross_entropy_loss_none(self):
                                  fetch_list=[ret])
             self.assertIsNotNone(static_ret)
         with fluid.dygraph.guard():
-            cross_entropy_loss = paddle.nn.loss.CrossEntropyLoss(
+            cross_entropy_loss = fluid.dygraph.CrossEntropyLoss(
                 weight=fluid.dygraph.to_variable(weight_np), reduction='none')
             dy_ret = cross_entropy_loss(
                 fluid.dygraph.to_variable(input_np),

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

@@ -106,7 +106,7 @@ def test_attr_tensor_API(self):
         with fluid.program_guard(train_program, startup_program):
             fill_value = 2.0
             input = fluid.data(name='input', dtype='float32', shape=[2, 3])
-            output = paddle.full_like(input, fill_value)
+            output = fluid.layers.full_like(input, fill_value)
 
             place = fluid.CPUPlace()
             if fluid.core.is_compiled_with_cuda():
@@ -132,20 +132,20 @@ def test_errors(self):
             #for ci coverage
 
             input_data = fluid.data(name='input', dtype='float32', shape=[2, 3])
-            output = paddle.full_like(input_data, 2.0)
+            output = fluid.layers.full_like(input_data, 2.0)
 
             def test_input_dtype():
-                paddle.full_like
+                fluid.layers.full_like
 
             self.assertRaises(
                 ValueError,
-                paddle.full_like,
+                fluid.layers.full_like,
                 input=input_data,
                 fill_value=2,
                 dtype='uint4')
             self.assertRaises(
                 TypeError,
-                paddle.full_like,
+                fluid.layers.full_like,
                 input=input_data,
                 fill_value=2,
                 dtype='int16')

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

@@ -16,7 +16,6 @@
 
 import unittest
 import numpy as np
-import paddle
 import paddle.fluid as fluid
 import paddle.fluid.core as core
 from paddle.fluid import Program, program_guard
@@ -32,7 +31,7 @@ def test_static_graph(self):
         with fluid.program_guard(train_program, startup_program):
             dims = [0]
             input = fluid.data(name='input', dtype='float32', shape=[2, 3])
-            output = paddle.flip(input, dims)
+            output = fluid.layers.flip(input, dims)
             place = fluid.CPUPlace()
             if fluid.core.is_compiled_with_cuda():
                 place = fluid.CUDAPlace(0)
@@ -52,7 +51,7 @@ def test_dygraph(self):
         img = np.array([[1, 2, 3], [4, 5, 6]]).astype(np.float32)
         with fluid.dygraph.guard():
             inputs = fluid.dygraph.to_variable(img)
-            ret = paddle.flip(inputs, [0])
+            ret = fluid.layers.flip(inputs, [0])
             out_ref = np.array([[4, 5, 6], [1, 2, 3]]).astype(np.float32)
             self.assertTrue(
                 (ret.numpy() == out_ref).all(),