Skip to content

[SOT][3.12] fix gen_load_attr index error in Python 3.12 #61883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SigureMo merged 2 commits into from
Feb 21, 2024
Merged

[SOT][3.12] fix gen_load_attr index error in Python 3.12 #61883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba700b
suppor py312 gen_load_attr
gouzil Feb 20, 2024
f6e7243
fix `py312-`
gouzil Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ def KW_NAMES(self, instr: Instruction):
assert isinstance(instr.arg, int)
self._call_shape = self._co_consts[instr.arg].get_py_value()

def CALL(self, instr: Instruction):
def call(self, instr: Instruction):
assert isinstance(instr.arg, int)
assert instr.arg + 2 <= len(self.stack)
is_method = not isinstance(self.stack.peek[instr.arg + 2], NullVariable)
Expand All @@ -1093,6 +1093,12 @@ def CALL(self, instr: Instruction):
self.stack.push(fn(*args, **kwargs))
self._call_shape = None

CALL = (
call_break_graph_decorator(push_n=1)(call)
if sys.version_info >= (3, 12)
else call
)

@call_break_graph_decorator(push_n=1)
def CALL_FUNCTION(self, instr: Instruction):
assert isinstance(instr.arg, int)
Expand Down
6 changes: 4 additions & 2 deletions python/paddle/jit/sot/opcode_translator/executor/pycode_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,8 @@ def gen_load_attr(self, name: str):
if name not in self._code_options["co_names"]:
self._code_options["co_names"].append(name)
idx = self._code_options["co_names"].index(name)
if sys.version_info >= (3, 12):
idx <<= 1
self._add_instr("LOAD_ATTR", arg=idx, argval=name)

def gen_store_attr(self, name: str):
Expand Down Expand Up @@ -878,7 +880,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) and sys.version_info < (3, 12):
if sys.version_info < (3, 12):
self._add_instr("PRECALL", arg=argc, argval=argc)
self._add_instr("CALL", arg=argc, argval=argc)
else:
Expand All @@ -892,7 +894,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) and sys.version_info < (3, 12):
if sys.version_info < (3, 12):
self._add_instr("PRECALL", arg=argc, argval=argc)
self._add_instr("CALL", arg=argc, argval=argc)
else:
Expand Down
10 changes: 0 additions & 10 deletions test/sot/skip_files_py312
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
./test_01_basic.py
./test_03_tuple.py
./test_04_list.py
./test_05_dict.py
./test_07_unpack.py
./test_09_f_string.py
./test_10_build_unpack.py
./test_11_jumps.py
./test_12_for_loop.py
./test_14_operators.py
./test_15_slice.py
./test_17_paddle_layer.py
./test_18_tensor_method.py
./test_19_closure.py
./test_20_string.py
./test_21_global.py
./test_analysis_inputs.py
./test_binary_operator_tracker.py
./test_break_graph.py
./test_builtin_dispatch.py
./test_builtin_map.py
./test_builtin_range.py
./test_builtin_zip.py
./test_constant_graph.py
./test_dup_top.py
./test_enumerate.py
./test_guard_user_defined_fn.py
Expand All @@ -33,7 +24,6 @@
./test_simulate_initialize.py
./test_sir_rollback.py
./test_sot_cost_model.py
./test_sot_exception.py
./test_sot_export.py
./test_sot_resnet.py
./test_sot_resnet50_backward.py
Expand Down