test_inference_model_io (#64731)

changeyoung98 · web-flow · commit 78198422eee6 · 2024-05-30T19:19:05.000+08:00
diff --git a/python/paddle/static/io.py b/python/paddle/static/io.py
@@ -63,6 +63,7 @@
     load_pir,
     load_pir_inference_model,
     load_vars_pir,
+    normalize_pir_program,
     save_pir,
     save_pir_inference_model,
     save_vars_pir,
@@ -183,6 +184,8 @@ def normalize_program(program, feed_vars, fetch_vars, **kwargs):
             >>> normalized_program = paddle.static.normalize_program(program, [image], [predict])
 
     """
+    if in_pir_mode():
+        return normalize_pir_program(program, feed_vars, fetch_vars, **kwargs)
     if not isinstance(program, Program):
         raise TypeError(
             "program type must be `base.Program`, but received `%s`"
diff --git a/python/paddle/static/nn/metric.py b/python/paddle/static/nn/metric.py
@@ -245,6 +245,28 @@ def auc(
             [array(1.)]
 
     """
+    if in_pir_mode():
+        if ins_tag_weight is None:
+            ins_tag_weight = paddle.full(
+                shape=[1, 1], dtype="float32", fill_value=1.0
+            )
+        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(
+            input,
+            label,
+            stat_pos,
+            stat_neg,
+            ins_tag_weight,
+            curve,
+            num_thresholds,
+            slide_steps,
+        )
+        return (
+            auc_out,
+            batch_stat_pos,
+            batch_stat_neg,
+        )
     helper = LayerHelper("auc", **locals())
 
     if ins_tag_weight is None:
diff --git a/python/paddle/static/pir_io.py b/python/paddle/static/pir_io.py
@@ -251,7 +251,13 @@ def normalize_pir_program(program, feed_vars, fetch_vars, **kwargs):
     if not all(isinstance(v, pir.Value) for v in fetch_vars):
         raise TypeError("fetch_vars type must be a Value or a list of Value.")
 
-    # TODO(Ruting) remind users to set auc_states to 0 if auc op were found.
+    # remind users to set auc_states to 0 if auc op were found.
+    for op in program.global_block().ops:
+        if op.name() == 'pd_op.auc':
+            warnings.warn(
+                "Be sure that you have set auc states to 0 before saving inference model."
+            )
+            break
 
     # fix the bug that the activation op's output as target will be pruned.
     # will affect the inference performance.
diff --git a/test/deprecated/legacy_test/test_inference_model_io.py b/test/deprecated/legacy_test/test_inference_model_io.py
@@ -29,6 +29,7 @@
     load_inference_model_distributed,
     save_persistables,
 )
+from paddle.pir_utils import test_with_pir_api
 from paddle.static.io import load_inference_model, save_inference_model
 
 paddle.enable_static()
@@ -161,14 +162,15 @@ def test_fit_line_inference_model(self):
 
 
 class TestSaveInferenceModel(unittest.TestCase):
+    @test_with_pir_api
     def test_save_inference_model(self):
         root_path = tempfile.TemporaryDirectory()
         MODEL_DIR = os.path.join(root_path.name, "inference_model2")
-        init_program = Program()
-        program = Program()
+        init_program = paddle.static.Program()
+        program = paddle.static.Program()
 
         # fake program without feed/fetch
-        with program_guard(program, init_program):
+        with paddle.static.program_guard(program, init_program):
             x = paddle.static.data(name='x', shape=[-1, 2], dtype='float32')
             y = paddle.static.data(name='y', shape=[-1, 1], dtype='float32')
 
@@ -188,14 +190,15 @@ def test_save_inference_model(self):
         )
         root_path.cleanup()
 
+    @test_with_pir_api
     def test_save_inference_model_with_auc(self):
         root_path = tempfile.TemporaryDirectory()
         MODEL_DIR = os.path.join(root_path.name, "inference_model4")
-        init_program = Program()
-        program = Program()
+        init_program = paddle.static.Program()
+        program = paddle.static.Program()
 
         # fake program without feed/fetch
-        with program_guard(program, init_program):
+        with paddle.static.program_guard(program, init_program):
             x = paddle.static.data(name='x', shape=[-1, 2], dtype='float32')
             y = paddle.static.data(name='y', shape=[-1, 1], dtype='int32')
             predict = paddle.static.nn.fc(x, size=2, activation='softmax')
@@ -223,14 +226,15 @@ def test_save_inference_model_with_auc(self):
 
 
 class TestInstance(unittest.TestCase):
+    # @test_with_pir_api
     def test_save_inference_model(self):
         root_path = tempfile.TemporaryDirectory()
         MODEL_DIR = os.path.join(root_path.name, "inference_model3")
-        init_program = Program()
-        program = Program()
+        init_program = paddle.static.Program()
+        program = paddle.static.Program()
 
         # fake program without feed/fetch
-        with program_guard(program, init_program):
+        with paddle.static.program_guard(program, init_program):
             x = paddle.static.data(name='x', shape=[-1, 2], dtype='float32')
             y = paddle.static.data(name='y', shape=[-1, 1], dtype='float32')
 
@@ -261,14 +265,15 @@ def test_save_inference_model(self):
 
 
 class TestSaveInferenceModelNew(unittest.TestCase):
+    # @test_with_pir_api
     def test_save_and_load_inference_model(self):
         root_path = tempfile.TemporaryDirectory()
         MODEL_DIR = os.path.join(root_path.name, "inference_model5")
-        init_program = base.default_startup_program()
-        program = base.default_main_program()
+        init_program = paddle.static.default_startup_program()
+        program = paddle.static.default_main_program()
 
         # fake program without feed/fetch
-        with program_guard(program, init_program):
+        with paddle.static.program_guard(program, init_program):
             x = paddle.static.data(name='x', shape=[-1, 2], dtype='float32')
             y = paddle.static.data(name='y', shape=[-1, 1], dtype='float32')
 
@@ -283,7 +288,7 @@ def test_save_and_load_inference_model(self):
             sgd_optimizer.minimize(avg_cost, init_program)
 
         place = core.CPUPlace()
-        exe = executor.Executor(place)
+        exe = base.Executor(place)
         exe.run(init_program, feed={}, fetch_list=[])
 
         tensor_x = np.array([[1, 1], [1, 2], [5, 2]]).astype("float32")
@@ -344,7 +349,12 @@ def test_save_and_load_inference_model(self):
             exe,
         )
 
-        model_path = MODEL_DIR + "_isdir.pdmodel"
+        if paddle.framework.in_pir_mode():
+            MODEL_SUFFIX = ".json"
+        else:
+            MODEL_SUFFIX = ".pdmodel"
+
+        model_path = MODEL_DIR + "_isdir" + MODEL_SUFFIX
         os.makedirs(model_path)
         self.assertRaises(
             ValueError,
@@ -356,7 +366,7 @@ def test_save_and_load_inference_model(self):
         )
         os.rmdir(model_path)
 
-        params_path = MODEL_DIR + "_isdir.pdmodel"
+        params_path = MODEL_DIR + "_isdir" + MODEL_SUFFIX
         os.makedirs(params_path)
         self.assertRaises(
             ValueError,
@@ -372,7 +382,7 @@ def test_save_and_load_inference_model(self):
             MODEL_DIR, [x, y], [avg_cost], exe
         )
 
-        self.assertTrue(os.path.exists(MODEL_DIR + ".pdmodel"))
+        self.assertTrue(os.path.exists(MODEL_DIR + MODEL_SUFFIX))
         self.assertTrue(os.path.exists(MODEL_DIR + ".pdiparams"))
 
         expected = exe.run(
@@ -405,7 +415,7 @@ def test_save_and_load_inference_model(self):
             unsupported_param=None,
         )
         self.assertRaises(
-            (TypeError, ValueError),
+            (TypeError, RuntimeError, ValueError),
             paddle.static.load_inference_model,
             None,
             exe,
@@ -435,7 +445,7 @@ def test_save_and_load_inference_model(self):
         self.assertRaises(ValueError, paddle.static.io.save_to_file, '', 123)
         # test _get_valid_program
         self.assertRaises(TypeError, paddle.static.io._get_valid_program, 0)
-        p = Program()
+        p = paddle.static.Program()
         cp = CompiledProgram(p)
         paddle.static.io._get_valid_program(cp)
         self.assertTrue(paddle.static.io._get_valid_program(cp) is p)
@@ -491,12 +501,13 @@ def test_serialize_program_and_persistables(self):
             None,
         )
 
+    @test_with_pir_api
     def test_normalize_program(self):
-        init_program = base.default_startup_program()
-        program = base.default_main_program()
+        init_program = paddle.static.default_startup_program()
+        program = paddle.static.default_main_program()
 
         # fake program without feed/fetch
-        with program_guard(program, init_program):
+        with paddle.static.program_guard(program, init_program):
             x = paddle.static.data(name='x', shape=[-1, 2], dtype='float32')
             y = paddle.static.data(name='y', shape=[-1, 1], dtype='float32')
 
@@ -525,7 +536,7 @@ def test_normalize_program(self):
 
         # test if return type of serialize_program is bytes
         res = paddle.static.normalize_program(program, [x, y], [avg_cost])
-        self.assertTrue(isinstance(res, Program))
+        self.assertTrue(isinstance(res, paddle.static.Program))
         # test program type
         self.assertRaises(
             TypeError, paddle.static.normalize_program, None, [x, y], [avg_cost]
@@ -545,6 +556,7 @@ def test_normalize_program(self):
 
 
 class TestLoadInferenceModelError(unittest.TestCase):
+    @test_with_pir_api
     def test_load_model_not_exist(self):
         place = core.CPUPlace()
         exe = executor.Executor(place)
