[Inference]Remove scale when export pir model (#69200)

YuanRisheng · web-flow · commit 4ce2da5a9d89 · 2024-11-08T16:13:44.000+08:00
* remove scale when export model

* fix bugs

* trigger ci
diff --git a/python/paddle/static/pir_io.py b/python/paddle/static/pir_io.py
@@ -284,6 +284,11 @@ 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.")
 
+    if len(program.global_block().ops) == 0:
+        raise ValueError(
+            "program must not be empty. at least one operator is required!"
+        )
+
     # 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':
@@ -292,20 +297,6 @@ def normalize_pir_program(program, feed_vars, fetch_vars, **kwargs):
             )
             break
 
-    # fix the bug that the activation op's output as target will be pruned.
-    # will affect the inference performance.
-    # TODO(Superjomn) add an IR pass to remove 1-scale op.
-
-    with paddle.static.program_guard(program):
-        uniq_fetch_vars = []
-        for var in fetch_vars:
-            if var.dtype != paddle.bool:
-                var_ = paddle.scale(var, 1.0)
-                uniq_fetch_vars.append(var_)
-            else:
-                uniq_fetch_vars.append(var)
-            fetch_vars = uniq_fetch_vars
-
     # serialize program
     value_map = paddle.pir.IrMapping()
     copy_program = program.clone(value_map)
diff --git a/test/legacy_test/test_cumsum_op.py b/test/legacy_test/test_cumsum_op.py
@@ -610,7 +610,6 @@ def test_static(self):
                 exe = paddle.static.Executor(self.place)
                 exe.run(startup_prog)
                 static_out = exe.run(feed={'x': np_x}, fetch_list=[out])
-
                 # run infer
                 paddle.static.save_inference_model(
                     self.save_path, [x], [out], exe, program=main_prog
@@ -623,7 +622,7 @@ def test_static(self):
 
                 self.assertEqual(
                     len(load_program.global_block().ops),
-                    11,
+                    9,
                 )
                 print(load_program)
                 self.assertEqual(
diff --git a/test/legacy_test/test_save_inference_model_conditional_op.py b/test/legacy_test/test_save_inference_model_conditional_op.py
@@ -104,12 +104,12 @@ def test_while_op(self):
         paddle.enable_static()
         if paddle.framework.use_pir_api():
             program = GetPirModelOp(model_file + ".json")
-            self.assertEqual(program.global_block().ops[-4].name(), "pd_op.add")
+            self.assertEqual(program.global_block().ops[-2].name(), "pd_op.add")
             self.assertEqual(
-                program.global_block().ops[-5].result(1).shape, [1, 3, -1, -1]
+                program.global_block().ops[-3].result(1).shape, [1, 3, -1, -1]
             )
             self.assertEqual(
-                program.global_block().ops[-5].name(), "pd_op.while"
+                program.global_block().ops[-3].name(), "pd_op.while"
             )
         else:
             right_pdmodel = {
@@ -142,9 +142,9 @@ def test_for_op(self):
         paddle.enable_static()
         if paddle.framework.use_pir_api():
             program = GetPirModelOp(model_file + ".json")
-            self.assertEqual(program.global_block().ops[-4].name(), "pd_op.add")
+            self.assertEqual(program.global_block().ops[-2].name(), "pd_op.add")
             self.assertEqual(
-                program.global_block().ops[-5].name(), "pd_op.while"
+                program.global_block().ops[-3].name(), "pd_op.while"
             )
         else:
             right_pdmodel = {
@@ -185,8 +185,6 @@ def test_if_op(self):
                 "pd_op.cast",
                 "pd_op.greater_than",
                 "pd_op.if",
-                "pd_op.full",
-                "pd_op.scale",
                 "pd_op.fetch",
             ]
             i = 0
diff --git a/test/legacy_test/test_static_save_load.py b/test/legacy_test/test_static_save_load.py
@@ -1189,8 +1189,6 @@ def test_no_params(self):
                     [
                         'pd_op.data',
                         'pd_op.add',
-                        'pd_op.full',
-                        'pd_op.scale',
                         'pd_op.fetch',
                     ],
                 )

Original file line number	Diff line number	Diff line change
`@@ -1189,8 +1189,6 @@ def test_no_params(self):`
`1189`	`1189`	`[`
`1190`	`1190`	`'pd_op.data',`
`1191`	`1191`	`'pd_op.add',`
`1192`		`- 'pd_op.full',`
`1193`		`- 'pd_op.scale',`
`1194`	`1192`	`'pd_op.fetch',`
`1195`	`1193`	`],`
`1196`	`1194`	`)`