[SOT] Fix LOAD_METHOD stack layout when bound instance override the __getattr__ (#58956)

SigureMo · web-flow · commit fdfd63bc67e4 · 2023-11-13T22:15:20.000-08:00
* [SOT] Fix LOAD_METHOD stack layout when bound instance override the `__getattr__`

* add unittest
diff --git a/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py b/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
@@ -777,8 +777,11 @@ def LOAD_METHOD(self, instr: Instruction):
             getattr, graph=self._graph, tracker=DanglingTracker()
         )(obj, method_name_var)
 
-        if isinstance(method, MethodVariable):
-            # bound method, push the unbound method and the self
+        if isinstance(method, MethodVariable) and "__getattr__" not in dir(
+            method.bound_instance.get_py_type()
+        ):
+            # bound method or the class override the __getattr__
+            # push the unbound method and the self
             self.stack.push(method.fn)
             self.stack.push(obj)
         else:
diff --git a/test/sot/test_min_graph_size.py b/test/sot/test_min_graph_size.py
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# GET_ITER (new)
-# FOR_ITER (new)
-
 from __future__ import annotations
 
 import unittest
@@ -62,6 +59,14 @@ def case_all(x, vars):
     return x
 
 
+class CustomLayer(paddle.nn.Layer):
+    def forward(self, x):
+        return self.forward_features(x)
+
+    def forward_features(self, x):
+        return x.numpy()
+
+
 class TestMinGraphSize(TestCaseBase):
     @min_graph_size_guard(10)
     def test_cases(self):
@@ -71,6 +76,12 @@ def test_cases(self):
         self.assert_results(case_call, x)
         self.assert_results(case_all, x, [4, 5, 6])
 
+    @min_graph_size_guard(10)
+    def test_layer(self):
+        x = paddle.to_tensor(1)
+        layer = CustomLayer()
+        self.assert_results(layer.forward, x)
+
 
 if __name__ == "__main__":
     unittest.main()
