diff --git a/guide/src/building_and_distribution.md b/guide/src/building_and_distribution.md index 0aee432c..8cb675f4 100644 --- a/guide/src/building_and_distribution.md +++ b/guide/src/building_and_distribution.md @@ -276,7 +276,7 @@ If you encounter these or other complications when linking the interpreter stati ### Import your module when embedding the Python interpreter -When you run your Rust binary with an embedded interpreter, any `#[pymodule]` created modules won't be accessible to import unless added to a table called `PyImport_Inittab` before the embedded interpreter is initialized. This will cause Python statements in your embedded interpreter such as `import your_new_module` to fail. You can call the macro [`append_to_inittab`]({{#PYO3_DOCS_URL}}/pyo3/macro.append_to_inittab.html) with your module before initializing the Python interpreter to add the module function into that table. (The Python interpreter will be initialized by calling `prepare_freethreaded_python`, `with_embedded_interpreter`, or `Python::with_gil` with the [`auto-initialize`](features.md#auto-initialize) feature enabled.) +When you run your Rust binary with an embedded interpreter, any `#[pymodule]` created modules won't be accessible to import unless added to a table called `PyImport_Inittab` before the embedded interpreter is initialized. This will cause Python statements in your embedded interpreter such as `import your_new_module` to fail. You can call the macro [`append_to_inittab`]({{#PYO3_DOCS_URL}}/pyo3/macro.append_to_inittab.html) with your module before initializing the Python interpreter to add the module function into that table. (The Python interpreter will be initialized by calling `prepare_freethreaded_python`, `with_embedded_python_interpreter`, or `Python::with_gil` with the [`auto-initialize`](features.md#auto-initialize) feature enabled.) ## Cross Compiling diff --git a/newsfragments/3446.changed.md b/newsfragments/3446.changed.md new file mode 100644 index 00000000..a258fb4a --- /dev/null +++ b/newsfragments/3446.changed.md @@ -0,0 +1 @@ +`#[pymodule]` will now return the same module object on repeated import by the same Python interpreter, on Python 3.9 and up. diff --git a/pytests/tests/test_misc.py b/pytests/tests/test_misc.py index 8dfd06ba..9cc0cebc 100644 --- a/pytests/tests/test_misc.py +++ b/pytests/tests/test_misc.py @@ -1,5 +1,6 @@ import importlib import platform +import sys import pyo3_pytests.misc import pytest @@ -10,15 +11,40 @@ def test_issue_219(): pyo3_pytests.misc.issue_219() -@pytest.mark.skipif( - platform.python_implementation() == "PyPy", - reason="PyPy does not reinitialize the module (appears to be some internal caching)", +@pytest.mark.xfail( + platform.python_implementation() == "CPython" and sys.version_info < (3, 9), + reason="Cannot identify subinterpreters on Python older than 3.9", ) -def test_second_module_import_fails(): +def test_multiple_imports_same_interpreter_ok(): spec = importlib.util.find_spec("pyo3_pytests.pyo3_pytests") + module = importlib.util.module_from_spec(spec) + assert dir(module) == dir(pyo3_pytests.pyo3_pytests) + + +@pytest.mark.xfail( + platform.python_implementation() == "CPython" and sys.version_info < (3, 9), + reason="Cannot identify subinterpreters on Python older than 3.9", +) +@pytest.mark.skipif( + platform.python_implementation() == "PyPy", + reason="PyPy does not support subinterpreters", +) +def test_import_in_subinterpreter_forbidden(): + import _xxsubinterpreters + + if sys.version_info < (3, 12): + expected_error = "PyO3 modules do not yet support subinterpreters, see https://github.com/PyO3/pyo3/issues/576" + else: + expected_error = "module pyo3_pytests.pyo3_pytests does not support loading in subinterpreters" + + sub_interpreter = _xxsubinterpreters.create() with pytest.raises( - ImportError, - match="PyO3 modules may only be initialized once per interpreter process", + _xxsubinterpreters.RunFailedError, + match=expected_error, ): - importlib.util.module_from_spec(spec) + _xxsubinterpreters.run_string( + sub_interpreter, "import pyo3_pytests.pyo3_pytests" + ) + + _xxsubinterpreters.destroy(sub_interpreter) diff --git a/src/impl_/pymodule.rs b/src/impl_/pymodule.rs index 2572d431..8ec96345 100644 --- a/src/impl_/pymodule.rs +++ b/src/impl_/pymodule.rs @@ -1,18 +1,24 @@ //! Implementation details of `#[pymodule]` which need to be accessible from proc-macro generated code. -use std::{ - cell::UnsafeCell, - sync::atomic::{self, AtomicBool}, -}; +use std::cell::UnsafeCell; -use crate::{exceptions::PyImportError, ffi, types::PyModule, Py, PyResult, Python}; +#[cfg(all(not(PyPy), Py_3_9, not(all(windows, Py_LIMITED_API, not(Py_3_10)))))] +use std::sync::atomic::{AtomicI64, Ordering}; + +#[cfg(not(PyPy))] +use crate::exceptions::PyImportError; +use crate::{ffi, sync::GILOnceCell, types::PyModule, Py, PyResult, Python}; /// `Sync` wrapper of `ffi::PyModuleDef`. pub struct ModuleDef { // wrapped in UnsafeCell so that Rust compiler treats this as interior mutability ffi_def: UnsafeCell, initializer: ModuleInitializer, - initialized: AtomicBool, + /// Interpreter ID where module was initialized (not applicable on PyPy). + #[cfg(all(not(PyPy), Py_3_9, not(all(windows, Py_LIMITED_API, not(Py_3_10)))))] + interpreter: AtomicI64, + /// Initialized module object, cached to avoid reinitialization. + module: GILOnceCell>, } /// Wrapper to enable initializer to be used in const fns. @@ -51,7 +57,10 @@ impl ModuleDef { ModuleDef { ffi_def, initializer, - initialized: AtomicBool::new(false), + // -1 is never expected to be a valid interpreter ID + #[cfg(all(not(PyPy), Py_3_9, not(all(windows, Py_LIMITED_API, not(Py_3_10)))))] + interpreter: AtomicI64::new(-1), + module: GILOnceCell::new(), } } /// Builds a module using user given initializer. Used for [`#[pymodule]`][crate::pymodule]. @@ -71,16 +80,55 @@ impl ModuleDef { ))?; } } - let module = unsafe { - Py::::from_owned_ptr_or_err(py, ffi::PyModule_Create(self.ffi_def.get()))? - }; - if self.initialized.swap(true, atomic::Ordering::SeqCst) { - return Err(PyImportError::new_err( - "PyO3 modules may only be initialized once per interpreter process", - )); + // Check the interpreter ID has not changed, since we currently have no way to guarantee + // that static data is not reused across interpreters. + // + // PyPy does not have subinterpreters, so no need to check interpreter ID. + #[cfg(not(PyPy))] + { + // PyInterpreterState_Get is only available on 3.9 and later, but is missing + // from python3.dll for Windows stable API on 3.9 + #[cfg(all(Py_3_9, not(all(windows, Py_LIMITED_API, not(Py_3_10)))))] + { + let current_interpreter = + unsafe { ffi::PyInterpreterState_GetID(ffi::PyInterpreterState_Get()) }; + crate::err::error_on_minusone(py, current_interpreter)?; + if let Err(initialized_interpreter) = self.interpreter.compare_exchange( + -1, + current_interpreter, + Ordering::SeqCst, + Ordering::SeqCst, + ) { + if initialized_interpreter != current_interpreter { + return Err(PyImportError::new_err( + "PyO3 modules do not yet support subinterpreters, see https://github.com/PyO3/pyo3/issues/576", + )); + } + } + } + #[cfg(not(all(Py_3_9, not(all(windows, Py_LIMITED_API, not(Py_3_10))))))] + { + // CPython before 3.9 does not have APIs to check the interpreter ID, so best that can be + // done to guard against subinterpreters is fail if the module is initialized twice + if self.module.get(py).is_some() { + return Err(PyImportError::new_err( + "PyO3 modules compiled for CPython 3.8 or older may only be initialized once per interpreter process" + )); + } + } } - (self.initializer.0)(py, module.as_ref(py))?; - Ok(module) + self.module + .get_or_try_init(py, || { + let module = unsafe { + Py::::from_owned_ptr_or_err( + py, + ffi::PyModule_Create(self.ffi_def.get()), + )? + }; + (self.initializer.0)(py, module.as_ref(py))?; + Ok(module) + }) + .map(|py_module| py_module.clone_ref(py)) } }