Merge branch 'main' into pytorch-2.7.0

Author: LaurentMazare

examples/python-extension/Cargo.toml

@@ -17,7 +17,7 @@ name = "tch_ext"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.21", features = ["extension-module"] }
+pyo3 = { version = "0.24", features = ["extension-module"] }
 pyo3-tch = { path = "../../pyo3-tch", version = "0.20.0" }
 tch = { path = "../..", features = ["python-extension"], version = "0.20.0" }
-torch-sys = { path = "../../torch-sys", features = ["python-extension"], version = "0.20.0" }
+torch-sys = { path = "../../torch-sys", features = ["python-extension"], version = "0.20.0" }

examples/python-extension/README.md

@@ -11,7 +11,7 @@ Python environment that has torch installed from the root of the github repo.
 
 ```bash
 LIBTORCH_USE_PYTORCH=1 cargo build -p tch-ext && cp -f target/debug/libtch_ext.so tch_ext.so
-python examples/python-extension/main.py
+PYTHONPATH=. python examples/python-extension/test.py
 ```
 
 It is recommended to run the build with `LIBTORCH_USE_PYTORCH` set, this will

examples/python-extension/src/lib.rs

@@ -11,7 +11,7 @@ fn add_one(tensor: PyTensor) -> PyResult<PyTensor> {
 /// objects.
 #[pymodule]
 fn tch_ext(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    py.import_bound("torch")?;
+    py.import("torch")?;
     m.add_function(wrap_pyfunction!(add_one, m)?)?;
     Ok(())
 }

pyo3-tch/Cargo.toml

@@ -14,4 +14,4 @@ license = "MIT/Apache-2.0"
 [dependencies]
 tch = { path = "..", features = ["python-extension"], version = "0.20.0" }
 torch-sys = { path = "../torch-sys", features = ["python-extension"], version = "0.20.0" }
-pyo3 = { version = "0.21", features = ["extension-module"] }
+pyo3 = { version = "0.24", features = ["extension-module"] }

pyo3-tch/src/lib.rs

@@ -18,7 +18,7 @@ pub fn wrap_tch_err(err: tch::TchError) -> PyErr {
 }
 
 impl<'source> FromPyObject<'source> for PyTensor {
-    fn extract(ob: &'source PyAny) -> PyResult<Self> {
+    fn extract_bound(ob: &Bound<'source, PyAny>) -> PyResult<Self> {
         let ptr = ob.as_ptr() as *mut tch::python::CPyObject;
         let tensor = unsafe { tch::Tensor::pyobject_unpack(ptr) };
         tensor
@@ -31,13 +31,18 @@ impl<'source> FromPyObject<'source> for PyTensor {
     }
 }
 
-impl IntoPy<PyObject> for PyTensor {
-    fn into_py(self, py: Python<'_>) -> PyObject {
+impl<'py> IntoPyObject<'py> for PyTensor {
+    type Output = Bound<'py, Self::Target>;
+    type Target = PyAny;
+    type Error = PyErr;
+
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
         // There is no fallible alternative to ToPyObject/IntoPy at the moment so we return
         // None on errors. https://github.com/PyO3/pyo3/issues/1813
-        self.0.pyobject_wrap().map_or_else(
+        let v = self.0.pyobject_wrap().map_or_else(
             |_| py.None(),
             |ptr| unsafe { PyObject::from_owned_ptr(py, ptr as *mut pyo3::ffi::PyObject) },
-        )
+        );
+        Ok(v.into_pyobject(py)?)
     }
 }