Skip to content

ENH: Globally enable Cython free-threading directive #59248

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
merged 3 commits into from
Jul 16, 2024
Merged

ENH: Globally enable Cython free-threading directive #59248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e702061
ENH: Globally enable Cython free-threading directive
lysnikolaou Jul 15, 2024
4363dc3
Use add_project_arguments
lysnikolaou Jul 16, 2024
424d56f
Mark json with Py_MOD_GIL_NOT_USED & remove PYTHON_GIL env var from c…
lysnikolaou Jul 16, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,6 @@ jobs:

- name: Run Tests
uses: ./.github/actions/run-tests
env:
PYTHON_GIL: 0

# NOTE: this job must be kept in sync with the Pyodide build job in wheels.yml
emscripten:
Expand Down
5 changes: 5 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ else
meson.add_dist_script(py, versioneer, '-o', '_version_meson.py')
endif

cy = meson.get_compiler('cython')
if cy.version().version_compare('>=3.1.0')
Copy link
Member

@mroeschke mroeschke Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may have to bump Cython first for this to get hit. Our build dependency is currently ~=3.0.5
Copy link
Contributor Author

@lysnikolaou lysnikolaou Jul 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cython 3.1.0 has not been released yet. However, in #59136 we install Cython nightly to build 3.13 and free-threading wheels which supports this.
add_project_arguments('-Xfreethreading_compatible=true', language : 'cython')
endif

# Needed by pandas.test() when it looks for the pytest ini options
py.install_sources(
'pyproject.toml',
Expand Down
4 changes: 4 additions & 0 deletions pandas/_libs/src/vendored/ujson/python/ujson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ PyMODINIT_FUNC PyInit_json(void) {
return NULL;
}

#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
#endif

#ifndef PYPY_VERSION
PyObject *mod_decimal = PyImport_ImportModule("decimal");
if (mod_decimal) {
Expand Down