From b4cb982e498fc121992e7c03d00d04755a66001f Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Sun, 7 Jan 2024 12:04:14 +0100 Subject: [PATCH] Simplifying our internal cargo dependencies. (#1529) --- Cargo.toml | 8 ++++++++ candle-book/Cargo.toml | 10 +++++----- candle-core/Cargo.toml | 4 ++-- candle-datasets/Cargo.toml | 4 ++-- candle-examples/Cargo.toml | 12 ++++++------ candle-nn/Cargo.toml | 4 ++-- candle-onnx/Cargo.toml | 1 - candle-pyo3/Cargo.toml | 6 +++--- candle-transformers/Cargo.toml | 6 +++--- candle-wasm-examples/bert/Cargo.toml | 6 +++--- candle-wasm-examples/blip/Cargo.toml | 6 +++--- candle-wasm-examples/llama2-c/Cargo.toml | 6 +++--- candle-wasm-examples/phi/Cargo.toml | 6 +++--- candle-wasm-examples/segment-anything/Cargo.toml | 6 +++--- candle-wasm-examples/t5/Cargo.toml | 6 +++--- candle-wasm-examples/whisper/Cargo.toml | 6 +++--- candle-wasm-examples/yolo/Cargo.toml | 4 ++-- candle-wasm-tests/Cargo.toml | 2 +- 18 files changed, 55 insertions(+), 48 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7d61cd74..3d66a02f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,14 @@ license = "MIT OR Apache-2.0" accelerate-src = { version = "0.3.2" } anyhow = { version = "1", features = ["backtrace"] } byteorder = "1.4.3" +candle = { path = "./candle-core", package = "candle-core" } +candle-datasets = { path = "./candle-datasets" } +candle-flash-attn = { path = "./candle-flash-attn" } +candle-kernels = { path = "./candle-kernels" } +candle-metal-kernels = { path = "./candle-metal-kernels" } +candle-nn = { path = "./candle-nn" } +candle-onnx = { path = "./candle-onnx" } +candle-transformers = { path = "./candle-transformers" } clap = { version = "4.2.4", features = ["derive"] } criterion = { version = "0.5.1", default-features=false } cudarc = { version = "0.9.14", features = ["f16"] } diff --git a/candle-book/Cargo.toml b/candle-book/Cargo.toml index e28e6623..5ccda31e 100644 --- a/candle-book/Cargo.toml +++ b/candle-book/Cargo.toml @@ -11,11 +11,11 @@ readme = "README.md" [dependencies] accelerate-src = { workspace = true, optional = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } -candle-datasets = { path = "../candle-datasets", version = "0.3.3" } -candle-nn = { path = "../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../candle-transformers", version = "0.3.3" } -candle-flash-attn = { path = "../candle-flash-attn", version = "0.3.3", optional = true } +candle = { workspace = true } +candle-datasets = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } +candle-flash-attn = { workspace = true, optional = true } safetensors = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/candle-core/Cargo.toml b/candle-core/Cargo.toml index 91655f57..97857a6b 100644 --- a/candle-core/Cargo.toml +++ b/candle-core/Cargo.toml @@ -12,8 +12,8 @@ readme = "README.md" [dependencies] accelerate-src = { workspace = true, optional = true } byteorder = { workspace = true } -candle-kernels = { path = "../candle-kernels", version = "0.3.3", optional = true } -candle-metal-kernels = { path = "../candle-metal-kernels", version = "0.3.3", optional = true } +candle-kernels = { workspace = true, optional = true } +candle-metal-kernels = { workspace = true, optional = true } metal = { workspace = true, optional = true} cudarc = { workspace = true, optional = true } gemm = { workspace = true } diff --git a/candle-datasets/Cargo.toml b/candle-datasets/Cargo.toml index 69438e0e..ccabf7ed 100644 --- a/candle-datasets/Cargo.toml +++ b/candle-datasets/Cargo.toml @@ -11,8 +11,8 @@ readme = "README.md" [dependencies] byteorder = { workspace = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../candle-nn", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } hf-hub = { workspace = true} intel-mkl-src = { workspace = true, optional = true } memmap2 = { workspace = true } diff --git a/candle-examples/Cargo.toml b/candle-examples/Cargo.toml index 7e081530..439116f8 100644 --- a/candle-examples/Cargo.toml +++ b/candle-examples/Cargo.toml @@ -11,12 +11,12 @@ readme = "README.md" [dependencies] accelerate-src = { workspace = true, optional = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } -candle-datasets = { path = "../candle-datasets", version = "0.3.3" } -candle-nn = { path = "../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../candle-transformers", version = "0.3.3" } -candle-flash-attn = { path = "../candle-flash-attn", version = "0.3.3", optional = true } -candle-onnx = { path = "../candle-onnx", version = "0.3.3", optional = true } +candle = { workspace = true } +candle-datasets = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } +candle-flash-attn = { workspace = true, optional = true } +candle-onnx = { workspace = true, optional = true } csv = "1.3.0" cudarc = { workspace = true, optional = true } diff --git a/candle-nn/Cargo.toml b/candle-nn/Cargo.toml index 5e0e5c2b..214e8a59 100644 --- a/candle-nn/Cargo.toml +++ b/candle-nn/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" [dependencies] accelerate-src = { workspace = true, optional = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } +candle = { workspace = true } half = { workspace = true } thiserror = { workspace = true } intel-mkl-src = { workspace = true, optional = true } @@ -20,7 +20,7 @@ rayon = { workspace = true } safetensors = { workspace = true } serde = { workspace = true } metal = { workspace = true, optional = true } -candle-metal-kernels = { path = "../candle-metal-kernels", version = "0.3.0", optional = true } +candle-metal-kernels = { workspace = true, optional = true } [dev-dependencies] anyhow = { workspace = true } diff --git a/candle-onnx/Cargo.toml b/candle-onnx/Cargo.toml index ba33b07a..cf7add01 100644 --- a/candle-onnx/Cargo.toml +++ b/candle-onnx/Cargo.toml @@ -20,4 +20,3 @@ prost-build = "0.12.1" [dev-dependencies] anyhow = { version = "1", features = ["backtrace"] } clap = { version = "4.2.4", features = ["derive"] } - diff --git a/candle-pyo3/Cargo.toml b/candle-pyo3/Cargo.toml index a03c7559..7c6fbd68 100644 --- a/candle-pyo3/Cargo.toml +++ b/candle-pyo3/Cargo.toml @@ -15,9 +15,9 @@ crate-type = ["cdylib"] [dependencies] accelerate-src = { workspace = true, optional = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../candle-nn", version = "0.3.3" } -candle-onnx = {path= "../candle-onnx", version = "0.3.3", optional = true} +candle = { workspace = true } +candle-nn = { workspace = true } +candle-onnx = { workspace = true, optional = true } half = { workspace = true } intel-mkl-src = { workspace = true, optional = true } pyo3 = { version = "0.20.0", features = ["extension-module", "abi3-py38"] } diff --git a/candle-transformers/Cargo.toml b/candle-transformers/Cargo.toml index 83bcff62..1a72c36a 100644 --- a/candle-transformers/Cargo.toml +++ b/candle-transformers/Cargo.toml @@ -12,9 +12,9 @@ readme = "README.md" [dependencies] accelerate-src = { workspace = true, optional = true } byteorder = { workspace = true } -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } -candle-flash-attn = { path = "../candle-flash-attn", version = "0.3.3", optional = true } -candle-nn = { path = "../candle-nn", version = "0.3.3" } +candle = { workspace = true } +candle-flash-attn = { workspace = true, optional = true } +candle-nn = { workspace = true } intel-mkl-src = { workspace = true, optional = true } num-traits = { workspace = true } rand = { workspace = true } diff --git a/candle-wasm-examples/bert/Cargo.toml b/candle-wasm-examples/bert/Cargo.toml index 59ce1be3..259a6102 100644 --- a/candle-wasm-examples/bert/Cargo.toml +++ b/candle-wasm-examples/bert/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } num-traits = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } diff --git a/candle-wasm-examples/blip/Cargo.toml b/candle-wasm-examples/blip/Cargo.toml index 904e90e6..f4de054e 100644 --- a/candle-wasm-examples/blip/Cargo.toml +++ b/candle-wasm-examples/blip/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } num-traits = { workspace = true } diff --git a/candle-wasm-examples/llama2-c/Cargo.toml b/candle-wasm-examples/llama2-c/Cargo.toml index 63f8a9c5..ac89a558 100644 --- a/candle-wasm-examples/llama2-c/Cargo.toml +++ b/candle-wasm-examples/llama2-c/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } num-traits = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } diff --git a/candle-wasm-examples/phi/Cargo.toml b/candle-wasm-examples/phi/Cargo.toml index c4950df9..e437a937 100644 --- a/candle-wasm-examples/phi/Cargo.toml +++ b/candle-wasm-examples/phi/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } num-traits = { workspace = true } diff --git a/candle-wasm-examples/segment-anything/Cargo.toml b/candle-wasm-examples/segment-anything/Cargo.toml index 4d886bc2..1840bb62 100644 --- a/candle-wasm-examples/segment-anything/Cargo.toml +++ b/candle-wasm-examples/segment-anything/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } num-traits = { workspace = true } # App crates. diff --git a/candle-wasm-examples/t5/Cargo.toml b/candle-wasm-examples/t5/Cargo.toml index 237f9e61..36cd9386 100644 --- a/candle-wasm-examples/t5/Cargo.toml +++ b/candle-wasm-examples/t5/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } num-traits = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } diff --git a/candle-wasm-examples/whisper/Cargo.toml b/candle-wasm-examples/whisper/Cargo.toml index 5d2b2a38..6c6857e4 100644 --- a/candle-wasm-examples/whisper/Cargo.toml +++ b/candle-wasm-examples/whisper/Cargo.toml @@ -9,9 +9,9 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } -candle-transformers = { path = "../../candle-transformers", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } +candle-transformers = { workspace = true } num-traits = { workspace = true } tokenizers = { workspace = true, features = ["unstable_wasm"] } diff --git a/candle-wasm-examples/yolo/Cargo.toml b/candle-wasm-examples/yolo/Cargo.toml index eb2c320b..0e5a91a8 100644 --- a/candle-wasm-examples/yolo/Cargo.toml +++ b/candle-wasm-examples/yolo/Cargo.toml @@ -9,8 +9,8 @@ categories.workspace = true license.workspace = true [dependencies] -candle = { path = "../../candle-core", version = "0.3.3", package = "candle-core" } -candle-nn = { path = "../../candle-nn", version = "0.3.3" } +candle = { workspace = true } +candle-nn = { workspace = true } num-traits = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/candle-wasm-tests/Cargo.toml b/candle-wasm-tests/Cargo.toml index a684f2ce..40c37acd 100644 --- a/candle-wasm-tests/Cargo.toml +++ b/candle-wasm-tests/Cargo.toml @@ -7,7 +7,7 @@ keywords.workspace = true categories.workspace = true [dependencies] -candle = { path = "../candle-core", version = "0.3.3", package = "candle-core" } +candle = { workspace = true } rand = { workspace = true } getrandom = { version = "0.2", features = ["js"] }