Skip to content
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

Jump to bottom

[SOT][3.11] add __repr__ for PyInterpreterFrameProxy #57588

Merged
merged 11 commits into from
Sep 22, 2023
Merged

[SOT][3.11] add __repr__ for PyInterpreterFrameProxy #57588

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d5e0a3e
[SOT] fix eval frame for python 3.11
SigureMo Sep 19, 2023
5c6a07f
fix missing `()`
SigureMo Sep 19, 2023
ed21f7d
fix no Paddle_PyInterpreterFrameProxyType in < 3.11
SigureMo Sep 19, 2023
2dd3d6c
`Paddle_PyInterpreterFrameProxy` -> `PyInterpreterFrameProxy`
SigureMo Sep 19, 2023
8902d4e
compat for eval_custom_code
SigureMo Sep 20, 2023
19d5038
clean callback result is None logic
SigureMo Sep 20, 2023
af1c69d
refine internal API name
SigureMo Sep 20, 2023
d856283
refine comments
SigureMo Sep 20, 2023
1ee5382
[SOT][3.11] add `__repr__` for `PyInterpreterFrameProxy`
SigureMo Sep 21, 2023
281b180
Merge branch 'develop' into sot/refine-eval-frame-311-code
SigureMo Sep 21, 2023
5b2e8c1
fix missing code due to merge conflict
SigureMo Sep 21, 2023
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
26 changes: 26 additions & 0 deletions paddle/fluid/pybind/jit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ namespace pybind {
typedef _PyInterpreterFrame FrameObject;
#define CALL_STAT_INC(name) ((void)0)

int Internal_PyInterpreterFrame_GetLine(_PyInterpreterFrame *frame);
static int Internal_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame,
int opcode,
int oparg);
int Internal_PyFrame_FastToLocalsWithError(_PyInterpreterFrame *frame);

// clang-format off
// Define a proxy PyObject to access _PyInterpreterFrame's properties.
// It will be passed as an argument to the eval frame's callback.
Expand Down Expand Up @@ -86,6 +92,20 @@ DECLARE_PROXY_PROPERTY(f_locals)
DECLARE_PROXY_PROPERTY(f_globals)
DECLARE_PROXY_PROPERTY(f_builtins)

// Refer to
// https://github.com/python/cpython/blob/9414ddf91898892f3f6a672ae946931ee4b3ceb7/Objects/frameobject.c#L953-L961
static PyObject *PyInterpreterFrameProxy_method_repr(
PyInterpreterFrameProxy *self) {
int lineno = Internal_PyInterpreterFrame_GetLine(self->frame);
PyCodeObject *code = self->frame->f_code;
return PyUnicode_FromFormat(
"<PyInterpreterFrameProxy at %p, file %R, line %d, code %S>",
self,
code->co_filename,
lineno,
code->co_name);
}

static PyGetSetDef PyInterpreterFrameProxy_properties[] = {
REGISTER_PROXY_PROPERTY(f_code),
REGISTER_PROXY_PROPERTY(f_locals),
Expand All @@ -100,6 +120,7 @@ static PyTypeObject PyInterpreterFrameProxyType = {
.tp_name = "paddle.framework.core.PyInterpreterFrameProxy",
.tp_doc = PyDoc_STR("A proxy object for _PyInterpreterFrame, "
"it's only define all properties we need."),
.tp_repr = reinterpret_cast<reprfunc>(PyInterpreterFrameProxy_method_repr),
.tp_basicsize = sizeof(PyInterpreterFrameProxy),
.tp_itemsize = 0,
.tp_flags = Py_TPFLAGS_DEFAULT,
Expand All @@ -122,6 +143,11 @@ PyInterpreterFrameProxy *PyInterpreterFrameProxy_New(

// We copy some cpython internal API from cpython project.
// To avoid name conflict, we use "Internal_" prefix to mark them.
int Internal_PyInterpreterFrame_GetLine(_PyInterpreterFrame *frame) {
int addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT);
return PyCode_Addr2Line(frame->f_code, addr);
}

static int Internal_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame,
int opcode,
int oparg) {
Expand Down