RollBACK opcode_translator

PaddlePaddle · Jan 29, 2024 · f2335d7 · f2335d7
1 parent 1ce3ed8
commit f2335d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py b/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
@@ -561,8 +561,7 @@ def step(self, instr: Instruction):
             breakpoint()  # noqa: T100
 
         opname = instr.opname if instr.opname != "PRECALL" else "PRECALL__CALL"
-        if sys.version_info < (3, 12):
-            assert opname != "CALL", "CALL should fused with PRECALL"
+        assert opname != "CALL", "CALL should fused with PRECALL"
         with EventGuard(f"{opname}", event_level=2):
             return getattr(self, opname)(instr)  # run single step.
 
@@ -717,33 +716,7 @@ def NOP(self, instr: Instruction):
 
     @call_break_graph_decorator(push_n=1)
     def LOAD_ATTR(self, instr: Instruction):
-        if sys.version_info >= (3, 12):
-            assert isinstance(instr.arg, int)
-            attr_name = self._code.co_names[instr.arg >> 1]
-        else:
-            attr_name = self._code.co_names[instr.arg]
-        if sys.version_info >= (3, 12) and instr.arg & 1:
-            attr_name_var = ConstantVariable.wrap_literal(
-                attr_name, self._graph
-            )
-            obj = self.stack.pop()
-
-            method = BuiltinVariable(
-                getattr, graph=self._graph, tracker=DanglingTracker()
-            )(obj, attr_name_var)
-
-            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:
-                # unbound method, push the dummy and the function
-                self.stack.push(NullVariable())
-                self.stack.push(method)
-            return
+        attr_name = self._code.co_names[instr.arg]
         attr_name_var = ConstantVariable.wrap_literal(attr_name, self._graph)
         obj = self.stack.pop()
         self.stack.push(

diff --git a/python/paddle/jit/sot/opcode_translator/executor/pycode_generator.py b/python/paddle/jit/sot/opcode_translator/executor/pycode_generator.py
@@ -878,8 +878,7 @@ def gen_unpack_sequence(self, count):
 
     def gen_call_function(self, argc=0):
         if sys.version_info >= (3, 11):
-            if sys.version_info == (3, 11):
-                self._add_instr("PRECALL", arg=argc, argval=argc)
+            self._add_instr("PRECALL", arg=argc, argval=argc)
             self._add_instr("CALL", arg=argc, argval=argc)
         else:
             self._add_instr("CALL_FUNCTION", arg=argc, argval=argc)
@@ -892,8 +891,7 @@ def gen_call_function_ex(self, has_kwargs):
 
     def gen_call_method(self, argc=0):
         if sys.version_info >= (3, 11):
-            if sys.version_info == (3, 11):
-                self._add_instr("PRECALL", arg=argc, argval=argc)
+            self._add_instr("PRECALL", arg=argc, argval=argc)
             self._add_instr("CALL", arg=argc, argval=argc)
         else:
             self._add_instr("CALL_METHOD", arg=argc, argval=argc)