reorganize dependencies (#183)

* reorganize dependencies * revert thiserror * more fixing * faer to dev * update turbojpeg to 1.1.1 * undo imgproc an io
kornia · Dec 16, 2024 · b423d92 · b423d92
1 parent 15ecfb3
commit b423d92
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 53 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,14 +41,14 @@ kornia-3d = { path = "crates/kornia-3d", version = "0.1.8-rc.1" }
 kornia = { path = "crates/kornia", version = "0.1.8-rc.1" }
 
 # dev dependencies for workspace
-argh = "0.1.12"
-approx = "0.5.1"
-bincode = "1.3"
-criterion = "0.5.1"
-env_logger = "0.11.5"
-faer = { version = "0.19.4", features = ["rayon"] }
-log = "0.4.22"
-rand = "0.8.5"
+argh = "0.1"
+approx = "0.5"
+criterion = "0.5"
+env_logger = "0.11"
+log = "0.4"
+num-traits = "0.2"
+rand = "0.8"
 rerun = "^0.20"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
+serde = { version = "1", features = ["derive"] }
+tempfile = "3.10"
+thiserror = "2"
diff --git a/crates/kornia-3d/Cargo.toml b/crates/kornia-3d/Cargo.toml
@@ -13,14 +13,14 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-bincode = { workspace = true }
-faer = { workspace = true }
+bincode = "1.3"
 serde = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 approx = { workspace = true }
 criterion = { workspace = true }
+faer = "0.19.4"
 
 [[bench]]
 name = "bench_linalg"

diff --git a/crates/kornia-core-ops/Cargo.toml b/crates/kornia-core-ops/Cargo.toml
@@ -11,10 +11,6 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-
-# kornia
-kornia-core.workspace = true
-
-# external
-num-traits = "0.2"
-thiserror = "1"
+kornia-core = { workspace = true }
+num-traits = { workspace = true }
+thiserror = { workspace = true }
diff --git a/crates/kornia-core/Cargo.toml b/crates/kornia-core/Cargo.toml
@@ -11,6 +11,6 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-num-traits = "0.2"
-serde = { version = "1", features = ["derive"] }
-thiserror = "1"
+num-traits = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }
diff --git a/crates/kornia-icp/Cargo.toml b/crates/kornia-icp/Cargo.toml
@@ -13,7 +13,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-faer = { workspace = true }
+faer = "0.19.4"
 kiddo = "5.0.2"
 kornia-core = { workspace = true }
 kornia-3d = { workspace = true }

diff --git a/crates/kornia-image/Cargo.toml b/crates/kornia-image/Cargo.toml
@@ -11,8 +11,6 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-kornia-core.workspace = true
-
-# external
-num-traits = "0.2"
-thiserror = "1"
+kornia-core = { workspace = true }
+num-traits = { workspace = true }
+thiserror = { workspace = true }
diff --git a/crates/kornia-imgproc/Cargo.toml b/crates/kornia-imgproc/Cargo.toml
@@ -11,24 +11,17 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-
-# kornia
-kornia-core.workspace = true
-kornia-image.workspace = true
-
-# external
 fast_image_resize = "3.0.4"
-num-traits = "0.2"
+kornia-core = { workspace = true }
+kornia-image = { workspace = true }
+num-traits = { workspace = true }
 rayon = "1.10"
-thiserror = "1"
+thiserror = { workspace = true }
 
 [dev-dependencies]
-kornia-io.workspace = true
-
-criterion = "0.5"
-image = "0.25.1"
+criterion = { workspace = true }
+kornia-io = { workspace = true }
 ndarray = { version = "0.15", features = ["rayon"] }
-rayon = "1.10"
 
 [[bench]]
 name = "bench_color"

diff --git a/crates/kornia-io/Cargo.toml b/crates/kornia-io/Cargo.toml
@@ -14,14 +14,10 @@ version.workspace = true
 all-features = true
 
 [dependencies]
-
-# kornia
-kornia-image.workspace = true
-
-# external
-image = { version = "0.25" }
-log = "0.4"
-thiserror = "1"
+image = "0.25"
+kornia-image = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
 
 # optional dependencies
 gst = { version = "0.23.0", package = "gstreamer", optional = true }
@@ -30,8 +26,8 @@ memmap2 = "0.9.4"
 turbojpeg = { version = "1.0.0", optional = true }
 
 [dev-dependencies]
-criterion = "0.5"
-tempfile = "3.10"
+criterion = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
 gstreamer = ["gst", "gst-app"]

diff --git a/devel-x86_64.Dockerfile b/devel-x86_64.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.79
+FROM rust:1.81
 
 RUN rustup update stable
 

diff --git a/kornia-serve/Dockerfile b/kornia-serve/Dockerfile
@@ -1,5 +1,5 @@
 # Use an official Rust runtime as a parent image
-FROM rust:1.79-bullseye as builder
+FROM rust:1.81 as builder
 
 # Set the working directory in the image to /app
 WORKDIR /app