Merge pull request #972 from LaurentMazare/pytorch-2.8.0

Update for pytorch 2.8.

Author: LaurentMazare

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Changed
 
+## v0.21.0
+### Changed
+- PyTorch v2.8 support
+
 ## v0.20.0
 ### Changed
 - PyTorch v2.7 support

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tch"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["Laurent Mazare <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -22,7 +22,7 @@ libc = "0.2.0"
 ndarray = "0.16.1"
 rand = "0.8"
 thiserror = "1"
-torch-sys = { version = "0.20.0", path = "torch-sys" }
+torch-sys = { version = "0.21.0", path = "torch-sys" }
 zip = "0.6"
 half = "2"
 safetensors = "0.3.0"

README.md

@@ -18,7 +18,7 @@ The code generation part for the C api on top of libtorch comes from
 
 ## Getting Started
 
-This crate requires the C++ PyTorch library (libtorch) in version *v2.7.0* to be available on
+This crate requires the C++ PyTorch library (libtorch) in version *v2.8.0* to be available on
 your system. You can either:
 
 - Use the system-wide libtorch installation (default).
@@ -85,7 +85,7 @@ seem to include `libtorch.a` by default so this would have to be compiled
 manually, e.g. via the following:
 
 ```bash
-git clone -b v2.7.0 --recurse-submodule https://github.com/pytorch/pytorch.git pytorch-static --depth 1
+git clone -b v2.8.0 --recurse-submodule https://github.com/pytorch/pytorch.git pytorch-static --depth 1
 cd pytorch-static
 USE_CUDA=OFF BUILD_SHARED_LIBS=OFF python setup.py build
 # export LIBTORCH to point at the build directory in pytorch-static.

examples/python-extension/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tch-ext"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["Laurent Mazare <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -18,6 +18,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 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" }
+pyo3-tch = { path = "../../pyo3-tch", version = "0.21.0" }
+tch = { path = "../..", features = ["python-extension"], version = "0.21.0" }
+torch-sys = { path = "../../torch-sys", features = ["python-extension"], version = "0.21.0" }

examples/yolo/darknet.rs

@@ -241,7 +241,7 @@ impl Darknet {
         Ok(image_width)
     }
 
-    pub fn build_model(&self, vs: &nn::Path) -> Result<FuncT> {
+    pub fn build_model(&self, vs: &nn::Path) -> Result<FuncT<'_>> {
         let mut blocks: Vec<(i64, Bl)> = vec![];
         let mut prev_channels: i64 = 3;
         for (index, block) in self.blocks.iter().enumerate() {

gen/gen.ml

@@ -883,7 +883,7 @@ let run
 
 let () =
   run
-    ~yaml_filename:"third_party/pytorch/Declarations-v2.7.0.yaml"
+    ~yaml_filename:"third_party/pytorch/Declarations-v2.8.0.yaml"
     ~cpp_filename:"torch-sys/libtch/torch_api_generated"
     ~ffi_filename:"torch-sys/src/c_generated.rs"
     ~wrapper_filename:"src/wrappers/tensor_generated.rs"

pyo3-tch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyo3-tch"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["Laurent Mazare <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -12,6 +12,6 @@ categories = ["science"]
 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.24", features = ["extension-module"] }
+tch = { path = "..", features = ["python-extension"], version = "0.21.0" }
+torch-sys = { path = "../torch-sys", features = ["python-extension"], version = "0.21.0" }
+pyo3 = { version = "0.24", features = ["extension-module"] }

src/nn/var_store.rs

@@ -149,7 +149,7 @@ impl VarStore {
     /// Variables are named and organized using paths. This function returns
     /// the top level path for the var store and can be combined with '/'
     /// to create sub-paths.
-    pub fn root(&self) -> Path {
+    pub fn root(&self) -> Path<'_> {
         Path { path: vec![], group: 0, var_store: self }
     }
 

src/tensor/safetensors.rs

@@ -91,7 +91,7 @@ impl View for SafeView<'_> {
         &self.shape
     }
 
-    fn data(&self) -> std::borrow::Cow<[u8]> {
+    fn data(&self) -> std::borrow::Cow<'_, [u8]> {
         let mut data = vec![0; self.data_len()];
         let numel = self.tensor.numel();
         self.tensor.f_copy_data_u8(&mut data, numel).unwrap();