-
-
Notifications
You must be signed in to change notification settings - Fork 32k
gh-134160: Use multi-phase init in documentation examples #134296
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.
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
Conversation
cc @erlend-aasland @encukou Just in case you're interested. |
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Doc/extending/embedding.rst
Outdated
static PyModuleDef_Slot emb_module_slots[] = { | ||
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, | ||
{Py_mod_gil, Py_MOD_GIL_NOT_USED}, | ||
{0, NULL} | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having done trial conversions of NumPy to multi-phase, I think we should include the relevant PY_VERSION_HEX checks. Both Py_mod_multiple_interpreters and Py_mod_gil were added very recently.
If we agree on adding these checks, we should add them for all relevant PyModuleDef_Slot structs. It is verbose, but aids in the copy-and-paste scenario.
static PyModuleDef_Slot emb_module_slots[] = { | |
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, | |
{Py_mod_gil, Py_MOD_GIL_NOT_USED}, | |
{0, NULL} | |
}; | |
static PyModuleDef_Slot emb_module_slots[] = { | |
#if PY_VERSION_HEX >= 0x030C00F0 // Python 3.12+ | |
// signal that this module can be imported in isolated subinterpreters | |
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, | |
#endif | |
#if PY_VERSION_HEX >= 0x030D00F0 // Python 3.13+ | |
// signal that this module supports running without an active GIL | |
{Py_mod_gil, Py_MOD_GIL_NOT_USED}, | |
#endif | |
{0, NULL} | |
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alternative:
static PyModuleDef_Slot emb_module_slots[] = { | |
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, | |
{Py_mod_gil, Py_MOD_GIL_NOT_USED}, | |
{0, NULL} | |
}; | |
static PyModuleDef_Slot emb_module_slots[] = { | |
#ifdef Py_mod_multiple_interpreters | |
// signal that this module can be imported in isolated subinterpreters | |
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, | |
#endif | |
#ifdef Py_mod_gil | |
// signal that this module supports running without an active GIL | |
{Py_mod_gil, Py_MOD_GIL_NOT_USED}, | |
#endif | |
{0, NULL} | |
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this PR omit these slots entirely?
IMO, they should be introduced later, after you compile your first module, along with a longer discussion about isolated state & thread safety.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree better to keep simple. @neonene perhaps remove the gil and interpreter slots from where we've added them in this PR unless they were already present?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed, but not all. I can complete.
Other places to update:
|
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
I tried, but I conclude that |
Thanks @neonene for the PR, and @AA-Turner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14. |
…onGH-134296) (cherry picked from commit 96905bd) Co-authored-by: neonene <53406459+neonene@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
…onGH-134296) (cherry picked from commit 96905bd) Co-authored-by: neonene <53406459+neonene@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
GH-134753 is a backport of this pull request to the 3.14 branch. |
GH-134754 is a backport of this pull request to the 3.13 branch. |
You can also define a new exception that is unique to your module. | ||
For this, you can declare a static global object variable at the beginning | ||
of the file:: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not correct for multi-phase initialization, without preventing the exec
function from other module instances from overriding this pointer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's fine -- module state deserves a better explanation a bit later in the tutorial. And the ImportError
being added in the next PR is a good thing to show.
The main thing I'd do differently is not backporting to 3.13 -- that's like pushing directly to production. 3.14 is out in a few months; that sounds like a good amount of time for this all to spend in prerelease.
Replaces
PyModule_Create()
withPyModuleDef_Init()
.Static types still remain unchanged in the doc.
📚 Documentation preview 📚: https://cpython-previews--134296.org.readthedocs.build/