diff --git a/Cargo.lock b/Cargo.lock index e0d4714cf8..5e4b38d0d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -622,9 +622,9 @@ dependencies = [ "anyhow", "base64 0.22.1", "bytes 1.10.0", - "candle-core 0.8.3", - "candle-nn 0.8.3", - "candle-transformers 0.8.2", + "candle-core", + "candle-nn", + "candle-transformers", "cudarc", "filesys", "hf-hub 0.3.2", @@ -1560,7 +1560,7 @@ dependencies = [ "accelerate-src", "anyhow", "byteorder", - "candle-kernels 0.8.3", + "candle-kernels", "candle-metal-kernels", "clap", "criterion", @@ -1585,38 +1585,13 @@ dependencies = [ "zip 1.1.4", ] -[[package]] -name = "candle-core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef79e00300acaaa6b0b33168e2ed5050f06125d1add87e7103c40a119083581" -dependencies = [ - "byteorder", - "candle-kernels 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cudarc", - "gemm 0.17.1", - "half", - "memmap2", - "num-traits", - "num_cpus", - "rand 0.8.5", - "rand_distr", - "rayon", - "safetensors", - "thiserror 1.0.63", - "ug", - "ug-cuda", - "yoke", - "zip 1.1.4", -] - [[package]] name = "candle-datasets" version = "0.0.0" dependencies = [ "byteorder", - "candle-core 0.0.0", - "candle-nn 0.0.0", + "candle-core", + "candle-nn", "hf-hub 0.4.1", "image", "intel-mkl-src", @@ -1633,8 +1608,8 @@ version = "0.8.3" dependencies = [ "anyhow", "bindgen_cuda", - "candle-core 0.0.0", - "candle-nn 0.0.0", + "candle-core", + "candle-nn", "half", ] @@ -1645,15 +1620,6 @@ dependencies = [ "bindgen_cuda", ] -[[package]] -name = "candle-kernels" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3134cc19a080a326f95bdcbe057ecaa9658598e5146e37ba1a8cd550c342a9b" -dependencies = [ - "bindgen_cuda", -] - [[package]] name = "candle-metal-kernels" version = "0.8.3" @@ -1675,7 +1641,7 @@ version = "0.0.0" dependencies = [ "accelerate-src", "anyhow", - "candle-core 0.0.0", + "candle-core", "candle-metal-kernels", "clap", "criterion", @@ -1691,28 +1657,13 @@ dependencies = [ "thiserror 1.0.63", ] -[[package]] -name = "candle-nn" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56763529af17e3483297e40fddeb2992117485498ec56a7c410c8a7825b7fee" -dependencies = [ - "candle-core 0.8.3", - "half", - "num-traits", - "rayon", - "safetensors", - "serde", - "thiserror 1.0.63", -] - [[package]] name = "candle-onnx" version = "0.8.3" dependencies = [ "anyhow", - "candle-core 0.0.0", - "candle-nn 0.0.0", + "candle-core", + "candle-nn", "clap", "prost", "prost-build", @@ -1723,8 +1674,8 @@ name = "candle-pyo3" version = "0.0.0" dependencies = [ "accelerate-src", - "candle-core 0.0.0", - "candle-nn 0.0.0", + "candle-core", + "candle-nn", "candle-onnx", "half", "intel-mkl-src", @@ -1738,9 +1689,9 @@ version = "0.0.0" dependencies = [ "accelerate-src", "byteorder", - "candle-core 0.0.0", + "candle-core", "candle-flash-attn", - "candle-nn 0.0.0", + "candle-nn", "fancy-regex", "intel-mkl-src", "num-traits", @@ -1752,25 +1703,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "candle-transformers" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4270cc692c4a3df2051c2e8c3c4da3a189746af7ca3a547b99ecd335582b92e1" -dependencies = [ - "byteorder", - "candle-core 0.8.3", - "candle-nn 0.8.3", - "fancy-regex", - "num-traits", - "rand 0.8.5", - "rayon", - "serde", - "serde_json", - "serde_plain", - "tracing", -] - [[package]] name = "cargo-platform" version = "0.1.9" @@ -11235,7 +11167,7 @@ name = "tensor-tools" version = "0.0.0" dependencies = [ "anyhow", - "candle-core 0.0.0", + "candle-core", "clap", "rayon", "safetensors", diff --git a/crates/desktop/src-tauri/Cargo.toml b/crates/desktop/src-tauri/Cargo.toml index 0ce71834e1..89b7156aaa 100644 --- a/crates/desktop/src-tauri/Cargo.toml +++ b/crates/desktop/src-tauri/Cargo.toml @@ -30,9 +30,9 @@ cudarc = "0.13.7" anyhow = "1.0" bytes = "1.10" base64 = "0.22.1" -candle-core = { version = "0.8.2", features = ["cuda"] } -candle-nn = { version = "0.8.2", features = ["cuda"] } -candle-transformers = { version = "0.8.2", features = ["cuda"] } +candle-core = { path = "../../vendor/candle/candle-core", features = ["cuda"] } +candle-nn = { path = "../../vendor/candle/candle-nn", features = ["cuda"] } +candle-transformers = { path = "../../vendor/candle/candle-transformers", features = ["cuda"] } hf-hub = "0.3.2" image = "0.25.5" serde_yaml = "0.9"