fix

Author: risemeup1

python/paddle/static/nn/metric.py

@@ -250,6 +250,11 @@ def auc(
             ins_tag_weight = paddle.full(
                 shape=[1, 1], dtype="float32", fill_value=1.0
             )
+        check_variable_and_dtype(input, 'input', ['float32', 'float64'], 'auc')
+        check_variable_and_dtype(label, 'label', ['int32', 'int64'], 'auc')
+        check_variable_and_dtype(
+            ins_tag_weight, 'ins_tag_weight', ['float32', 'float64'], 'auc'
+        )
         stat_pos = paddle.zeros(shape=[1, num_thresholds + 1], dtype="int64")
         stat_neg = paddle.zeros(shape=[1, num_thresholds + 1], dtype="int64")
         auc_out, batch_stat_pos, batch_stat_neg = _C_ops.auc(
@@ -260,7 +265,7 @@ def auc(
             ins_tag_weight,
             curve,
             num_thresholds,
-            slide_steps,
+            0,
         )
         return (
             auc_out,

test/deprecated/legacy_test/test_auc_op.py

@@ -18,7 +18,6 @@
 from op_test import OpTest
 
 import paddle
-from paddle import base
 
 
 class TestAucOp(OpTest):
@@ -139,7 +138,9 @@ def test_static(self):
 
 class TestAucOpError(unittest.TestCase):
     def test_errors(self):
-        with base.program_guard(base.Program(), base.Program()):
+        with paddle.static.program_guard(
+            paddle.static.Program(), paddle.static.Program()
+        ):
 
             def test_type1():
                 data1 = paddle.static.data(

test/legacy_test/test_auc_op.py

@@ -0,0 +1,174 @@
+#   Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import numpy as np
+from op_test import OpTest
+
+import paddle
+
+
+class TestAucOp(OpTest):
+    def setUp(self):
+        self.op_type = "auc"
+        pred = np.random.random((128, 2)).astype("float32")
+        labels = np.random.randint(0, 2, (128, 1)).astype("int64")
+        num_thresholds = 200
+        slide_steps = 1
+
+        stat_pos = np.zeros(
+            (1 + slide_steps) * (num_thresholds + 1) + 1,
+        ).astype("int64")
+        stat_neg = np.zeros(
+            (1 + slide_steps) * (num_thresholds + 1) + 1,
+        ).astype("int64")
+
+        self.inputs = {
+            'Predict': pred,
+            'Label': labels,
+            "StatPos": stat_pos,
+            "StatNeg": stat_neg,
+        }
+        self.attrs = {
+            'curve': 'ROC',
+            'num_thresholds': num_thresholds,
+            "slide_steps": slide_steps,
+        }
+
+        python_auc = paddle.metric.Auc(
+            name="auc", curve='ROC', num_thresholds=num_thresholds
+        )
+        python_auc.update(pred, labels)
+
+        pos = python_auc._stat_pos.tolist() * 2
+        pos.append(1)
+        neg = python_auc._stat_neg.tolist() * 2
+        neg.append(1)
+        self.outputs = {
+            'AUC': np.array(python_auc.accumulate()),
+            'StatPosOut': np.array(pos),
+            'StatNegOut': np.array(neg),
+        }
+
+    def test_check_output(self):
+        self.check_output(check_dygraph=False)
+
+
+class TestGlobalAucOp(OpTest):
+    def setUp(self):
+        self.op_type = "auc"
+        pred = np.random.random((128, 2)).astype("float32")
+        labels = np.random.randint(0, 2, (128, 1)).astype("int64")
+        num_thresholds = 200
+        slide_steps = 0
+
+        stat_pos = np.zeros((1, (num_thresholds + 1))).astype("int64")
+        stat_neg = np.zeros((1, (num_thresholds + 1))).astype("int64")
+
+        self.inputs = {
+            'Predict': pred,
+            'Label': labels,
+            "StatPos": stat_pos,
+            "StatNeg": stat_neg,
+        }
+        self.attrs = {
+            'curve': 'ROC',
+            'num_thresholds': num_thresholds,
+            "slide_steps": slide_steps,
+        }
+
+        python_auc = paddle.metric.Auc(
+            name="auc", curve='ROC', num_thresholds=num_thresholds
+        )
+        python_auc.update(pred, labels)
+
+        pos = python_auc._stat_pos
+        neg = python_auc._stat_neg
+        self.outputs = {
+            'AUC': np.array(python_auc.accumulate()),
+            'StatPosOut': np.array([pos]),
+            'StatNegOut': np.array([neg]),
+        }
+
+    def test_check_output(self):
+        self.check_output(check_dygraph=False)
+
+
+class TestAucAPI(unittest.TestCase):
+    def test_static(self):
+        paddle.enable_static()
+        data = paddle.static.data(name="input", shape=[-1, 1], dtype="float32")
+        label = paddle.static.data(name="label", shape=[4], dtype="int64")
+        ins_tag_weight = paddle.static.data(
+            name="ins_tag_weight", shape=[4], dtype="float32"
+        )
+        result = paddle.static.auc(
+            input=data, label=label, ins_tag_weight=ins_tag_weight
+        )
+
+        place = paddle.CPUPlace()
+        exe = paddle.static.Executor(place)
+
+        exe.run(paddle.static.default_startup_program())
+
+        x = np.array([[0.0474], [0.5987], [0.7109], [0.9997]]).astype("float32")
+
+        y = np.array([0, 0, 1, 0]).astype('int64')
+        z = np.array([1, 1, 1, 1]).astype('float32')
+        (output,) = exe.run(
+            feed={"input": x, "label": y, "ins_tag_weight": z},
+            fetch_list=[result[0]],
+        )
+        auc_np = np.array(0.66666667).astype("float32")
+        np.testing.assert_allclose(output, auc_np, rtol=1e-05)
+        assert auc_np.shape == auc_np.shape
+
+
+class TestAucOpError(unittest.TestCase):
+    def test_errors(self):
+        with paddle.static.program_guard(
+            paddle.static.Program(), paddle.static.Program()
+        ):
+
+            def test_type1():
+                data1 = paddle.static.data(
+                    name="input1", shape=[-1, 2], dtype="int"
+                )
+                label1 = paddle.static.data(
+                    name="label1", shape=[-1], dtype="int"
+                )
+                ins_tag_w1 = paddle.static.data(
+                    name="label1", shape=[-1], dtype="int"
+                )
+                result1 = paddle.static.auc(
+                    input=data1, label=label1, ins_tag_weight=ins_tag_w1
+                )
+
+            self.assertRaises(TypeError, test_type1)
+
+            def test_type2():
+                data2 = paddle.static.data(
+                    name="input2", shape=[-1, 2], dtype="float32"
+                )
+                label2 = paddle.static.data(
+                    name="label2", shape=[-1], dtype="float32"
+                )
+                result2 = paddle.static.auc(input=data2, label=label2)
+
+            self.assertRaises(TypeError, test_type2)
+
+
+if __name__ == '__main__':
+    unittest.main()

test/deprecated/legacy_test/test_sparse_conv_op.py renamed to test/legacy_test/test_sparse_conv_op.py

@@ -16,12 +16,10 @@
 import unittest
 
 import numpy as np
-from utils import compare_legacy_with_pt
 
 import paddle
 from paddle import sparse
 from paddle.base import core
-from paddle.pir_utils import test_with_pir_api
 
 logging.basicConfig(
     format='%(asctime)s - %(levelname)s - %(message)s', level=logging.INFO
@@ -316,8 +314,6 @@ def test_Conv3D_bias(self):
 
 
 class TestStatic(unittest.TestCase):
-    @compare_legacy_with_pt
-    @test_with_pir_api
     def test(self):
         paddle.enable_static()
         main = paddle.static.Program()
@@ -386,8 +382,6 @@ def test(self):
             self.assertTrue(out_indices.dtype == paddle.int32)
         paddle.disable_static()
 
-    @compare_legacy_with_pt
-    @test_with_pir_api
     def test_cpu(self):
         paddle.enable_static()
         main = paddle.static.Program()
@@ -457,8 +451,6 @@ def test_cpu(self):
             self.assertTrue(out_indices.dtype == paddle.int32)
         paddle.disable_static()
 
-    @compare_legacy_with_pt
-    @test_with_pir_api
     def test2D(self):
         paddle.enable_static()
         main = paddle.static.Program()
@@ -522,8 +514,6 @@ def test2D(self):
             self.assertTrue(out_indices.dtype == paddle.int32)
         paddle.disable_static()
 
-    @compare_legacy_with_pt
-    @test_with_pir_api
     def test2D_cpu(self):
         paddle.enable_static()
         main = paddle.static.Program()

test/deprecated/legacy_test/test_sparse_isnan_op.py renamed to test/legacy_test/test_sparse_isnan_op.py

@@ -15,10 +15,8 @@
 import unittest
 
 import numpy as np
-from utils import compare_legacy_with_pt
 
 import paddle
-from paddle.pir_utils import test_with_pir_api
 
 
 class TestSparseIsnan(unittest.TestCase):
@@ -65,8 +63,6 @@ def test_isnan_dtype(self):
 
 
 class TestStatic(unittest.TestCase):
-    @compare_legacy_with_pt
-    @test_with_pir_api
     def test(self):
         paddle.enable_static()
         main_program = paddle.static.Program()

test/deprecated/legacy_test/test_sparse_slice_op.py renamed to test/legacy_test/test_sparse_slice_op.py

@@ -15,7 +15,6 @@
 import unittest
 
 import numpy as np
-from utils import compare_legacy_with_pt
 
 import paddle
 
@@ -207,32 +206,26 @@ def check_result_with_list(self, x, axes, starts, ends, format='coo'):
         if format == 'coo':
             self._check_result_coo(np_x, axes, starts, ends)
 
-    @compare_legacy_with_pt
     def test_coo_5d(self):
         for item in data_5d:
             self.check_result_with_shape(*item, format='coo')
 
-    @compare_legacy_with_pt
     def test_coo_4d(self):
         for item in data_4d:
             self.check_result_with_shape(*item, format='coo')
 
-    @compare_legacy_with_pt
     def test_coo_3d(self):
         for item in data_3d:
             self.check_result_with_shape(*item, format='coo')
 
-    @compare_legacy_with_pt
     def test_coo_2d(self):
         for item in data_2d:
             self.check_result_with_shape(*item, format='coo')
 
-    @compare_legacy_with_pt
     def test_coo_1d(self):
         x = [-49, 55, -5, 0, 3, 0, 0, -60, -21, 0, 0, 0]
         self.check_result_with_list(x, [0], [3], [5], format='coo')
 
-    @compare_legacy_with_pt
     def test_coo_1d_zero(self):
         x = [-49, 55, -5, 0, 3, 0, 0, -60, -21, 0, 0, 0]
         self.check_result_with_list(x, [0], [-3], [-1], format='coo')

test/deprecated/legacy_test/test_sparse_sum_op.py renamed to test/legacy_test/test_sparse_sum_op.py

@@ -15,10 +15,8 @@
 import unittest
 
 import numpy as np
-from utils import compare_legacy_with_pt
 
 import paddle
-from paddle.pir_utils import test_with_dygraph_pir
 
 devices = ['cpu']
 if paddle.device.get_device() != "cpu":
@@ -178,8 +176,6 @@ def check_result_coo(self, x_shape, dims, keepdim, dtype=None):
                 )
             paddle.disable_static()
 
-    @compare_legacy_with_pt
-    @test_with_dygraph_pir
     def test_sum(self):
         # 1d
         self.check_result_coo([5], None, False)