[SOT] Always emit SIR even if outputs is None (#69010)

SigureMo · web-flow · commit 2db0f340fb7f · 2024-10-28T23:47:18.000+08:00
diff --git a/python/paddle/jit/sot/opcode_translator/executor/function_graph.py b/python/paddle/jit/sot/opcode_translator/executor/function_graph.py
@@ -68,7 +68,6 @@
 )
 from .tracker import BuiltinTracker, DummyTracker, SymbolicOperationTracker
 from .variables import (
-    ConstantVariable,
     DictVariable,
     GlobalVariable,
     ListVariable,
@@ -741,36 +740,34 @@ def try_infer_meta_fn(args, kwargs) -> Any:
                 FunctionGraph.get_opcode_executor_stack()
             ),
         )
-        if outputs is not None:
-            if is_inplace_api(func):
-                # if we want to use a non-inplace api (static api) to replace an inplace behavior (in simulation)
-                # just set it back in SIR, and return outputs to replace tensor meta (it might changes?)
-                # in this case, the output will not exactly be used
-                compute_fn(
-                    func,
-                    inputs_symbols,
-                    convert_to_symbol(args[0]),
-                    stmt_stacks,
-                )
-            else:
-                compute_fn(
-                    func,
-                    inputs_symbols,
-                    convert_to_symbol(outputs),
-                    stmt_stacks,
-                )  # symbolic only contain symbols.
-                self._put_inner(outputs)
-            if is_symbolic_var:
-                # compute_fn should be call_method
-                tracker = SymbolicOperationTracker(
-                    list(args) + list(kwargs.values()), func
-                )
-            else:
-                tracker = DummyTracker(list(args) + list(kwargs.values()))
 
-            return VariableFactory.from_value(outputs, self, tracker)
+        if is_inplace_api(func):
+            # if we want to use a non-inplace api (static api) to replace an inplace behavior (in simulation)
+            # just set it back in SIR, and return outputs to replace tensor meta (it might changes?)
+            # in this case, the output will not exactly be used
+            compute_fn(
+                func,
+                inputs_symbols,
+                convert_to_symbol(args[0]),
+                stmt_stacks,
+            )
+        else:
+            compute_fn(
+                func,
+                inputs_symbols,
+                convert_to_symbol(outputs),
+                stmt_stacks,
+            )  # symbolic only contain symbols.
+            self._put_inner(outputs)
+        if is_symbolic_var:
+            # compute_fn should be call_method
+            tracker = SymbolicOperationTracker(
+                list(args) + list(kwargs.values()), func
+            )
         else:
-            return ConstantVariable.wrap_literal(None, self)
+            tracker = DummyTracker(list(args) + list(kwargs.values()))
+
+        return VariableFactory.from_value(outputs, self, tracker)
 
     @staticmethod
     def get_opcode_executor_stack():
diff --git a/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py b/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
@@ -2170,7 +2170,6 @@ def create_after_loop_fn():
         )
 
         for name in loop_body_inputs[:-1]:
-            # var_loader.load(self.get_var(name))
             self._graph.pycode_gen.gen_load(name)
 
         # this is the _break_flag
diff --git a/test/sot/test_sot_stop_gradient.py b/test/sot/test_sot_stop_gradient.py
@@ -0,0 +1,46 @@
+# Copyright (c) 2024 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
+#
+#     https://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.
+
+from __future__ import annotations
+
+import unittest
+
+import paddle
+from paddle.jit.sot import symbolic_translate
+
+
+def api_with_set_stop_gradient(x):
+    y = x + x
+    y.stop_gradient = True
+    return y
+
+
+class TestApiWithSetStopGradient(unittest.TestCase):
+    def test_api_with_set_stop_gradient(self):
+        x_dy = paddle.to_tensor(1.0, stop_gradient=False)
+        y_dy = api_with_set_stop_gradient(x_dy)
+        y_dy.backward()
+
+        x_st = paddle.to_tensor(1.0, stop_gradient=False)
+        y_st = symbolic_translate(api_with_set_stop_gradient)(x_st)
+        y_st.backward()
+
+        self.assertTrue(y_dy.stop_gradient)
+        self.assertTrue(y_st.stop_gradient)
+        self.assertIsNone(x_dy.grad)
+        self.assertIsNone(x_st.grad)
+
+
+if __name__ == "__main__":
+    unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -2170,7 +2170,6 @@ def create_after_loop_fn():`
`2170`	`2170`	`)`
`2171`	`2171`
`2172`	`2172`	`for name in loop_body_inputs[:-1]:`
`2173`		`- # var_loader.load(self.get_var(name))`
`2174`	`2173`	`self._graph.pycode_gen.gen_load(name)`
`2175`	`2174`
`2176`	`2175`	`# this is the _break_flag`