diff --git a/Cargo.lock b/Cargo.lock index 19f68381b1..95eb3118cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2602,7 +2602,7 @@ dependencies = [ "as-any", "async-trait", "base64 0.22.1", - "bindgen_cuda 0.1.5", + "bindgen_cuda 0.1.7", "bm25", "bytemuck", "bytemuck_derive", @@ -2723,7 +2723,7 @@ dependencies = [ name = "mistralrs-quant" version = "0.6.0" dependencies = [ - "bindgen_cuda 0.1.5", + "bindgen_cuda 0.1.7", "byteorder", "candle-core", "candle-nn", @@ -2788,7 +2788,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tower-http 0.5.2", + "tower-http 0.6.4", "tracing", "url", "utoipa", diff --git a/Cargo.toml b/Cargo.toml index 47c7e9c7ca..2c13b5661a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,6 +92,80 @@ hf-hub = { version = "0.4.1", default-features = false, features = [ ] } itertools = "0.13.0" +rand = "0.9.0" +cli-table = "0.4.7" +dirs = "5.0.1" +thiserror = "1" +tokenizers = { version = "0.21.0", default-features = false } +tqdm = "0.7.0" +chrono = "0.4.34" +minijinja = { version = "2.0.2", features = ["builtins", "json"] } +minijinja-contrib = { version = "2.0.2", features = ["pycompat"] } +regex-automata = { version = "0.4.6", features = ["meta"] } +rustc-hash = "2.0.0" +vob = "3.0.3" +cfgrammar = "0.13.3" +lrtable = "0.13.3" +galil-seiferas = "0.1.5" +radix_trie = "0.2.1" +bytemuck = "1.15.0" +tokio-rayon = "2.1.0" +rand_isaac = "0.4.0" +indicatif = { version = "0.17.8", features = ["rayon"] } +async-trait = "0.1.80" +strum = { version = "0.26", features = ["derive"] } +derive_more = { version = "0.99.17", default-features = false, features = ["from"] } +akin = "0.4.0" +variantly = "0.4.0" +derive-new = "0.7.0" +sysinfo = "0.30.12" +csv = "1.3.0" +bytemuck_derive = "1.7.0" +uuid = "1.17.0" +schemars = "0.8.21" +serde_yaml = "0.9.34" +serde_plain = "1.0.2" +as-any = "0.3.1" +llguidance = { version = "0.7.20", default-features = false, features = ["lark"] } +toktrie_hf_tokenizers = "0.7.20" +objc = { version = "0.2.7" } +serde-big-array = "0.5.1" +interprocess = "2.2.2" +urlencoding = "2.1.3" +scraper = "0.23.1" +html2text = "0.14.2" +ordered-float = "5.0.0" +hashbrown = "0.15.3" +parking_lot = "0.12.3" +ahash = "0.8.12" +num-traits = "0.2.19" +libc = "0.2.172" +bm25 = "2.2.1" +lazy_static = "1.4" +paste = "1.0.15" +byteorder = "1.5.0" +yoke = "0.7.5" +memmap2 = "0.9.5" +pyo3-build-config = "0.22" +ctrlc = "3.4.4" +directories = "6.0.0" +rustyline = { version = "15.0.0", default-features = false, features = ["with-file-history"] } +tower-http = "0.6.4" +utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] } +futures-util = "0.3.31" +axum_static = "1.7.1" +mime_guess = "2.0.5" +include_dir = "0.7.4" +http = "1.3.1" +hyper = "1.6.0" +bindgen_cuda = { git = "https://github.com/guoqingbao/bindgen_cuda.git", version = "0.1.6" } +mistralrs-core = { path = "mistralrs-core" } +mistralrs-paged-attn = { path = "mistralrs-paged-attn" } +mistralrs-quant = { path = "mistralrs-quant" } +mistralrs-vision = { path = "mistralrs-vision" } +mistralrs-server-core = { path = "mistralrs-server-core" } +mistralrs = { path = "mistralrs" } + [profile.release-with-debug] inherits = "release" debug = true diff --git a/mistralrs-bench/Cargo.toml b/mistralrs-bench/Cargo.toml index 12b6284e1b..85da414133 100644 --- a/mistralrs-bench/Cargo.toml +++ b/mistralrs-bench/Cargo.toml @@ -18,10 +18,10 @@ candle-core.workspace = true serde.workspace = true serde_json.workspace = true clap.workspace = true -mistralrs-core = { version = "0.6.0", path = "../mistralrs-core" } +mistralrs-core.workspace = true tracing.workspace = true tokio.workspace = true -cli-table = "0.4.7" +cli-table.workspace = true [features] cuda = ["mistralrs-core/cuda"] diff --git a/mistralrs-core/Cargo.toml b/mistralrs-core/Cargo.toml index ca76f18c25..1a64ec03ed 100644 --- a/mistralrs-core/Cargo.toml +++ b/mistralrs-core/Cargo.toml @@ -18,84 +18,84 @@ candle-nn.workspace = true serde.workspace = true serde_json.workspace = true candle-flash-attn = { workspace = true, optional = true } -dirs = "5.0.1" +dirs.workspace = true hf-hub.workspace = true -thiserror = "1.0.57" -tokenizers = { version = "0.21.0", default-features = false } -tqdm = "0.7.0" -chrono = "0.4.34" -minijinja = { version = "2.0.2", features = ["builtins", "json"] } -minijinja-contrib = { version = "2.0.2", features = ["pycompat"] } +thiserror.workspace = true +tokenizers.workspace = true +tqdm.workspace = true +chrono.workspace = true +minijinja.workspace = true +minijinja-contrib.workspace = true either.workspace = true indexmap.workspace = true half.workspace = true accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true } tracing.workspace = true -rand = "0.9.0" -regex-automata = { version = "0.4.6", features = ["meta"] } -rustc-hash = "2.0.0" -vob = "3.0.3" -cfgrammar = "0.13.3" -lrtable = "0.13.3" -galil-seiferas = "0.1.5" +rand.workspace = true +regex-automata.workspace = true +rustc-hash.workspace = true +vob.workspace = true +cfgrammar.workspace = true +lrtable.workspace = true +galil-seiferas.workspace = true clap.workspace = true -radix_trie = "0.2.1" -bytemuck = "1.15.0" +radix_trie.workspace = true +bytemuck.workspace = true rayon.workspace = true tokio.workspace = true -tokio-rayon = "2.1.0" -rand_isaac = "0.4.0" +tokio-rayon.workspace = true +rand_isaac.workspace = true futures.workspace = true pyo3 = { workspace = true, optional = true } -indicatif = { version = "0.17.8", features = ["rayon"] } -async-trait = "0.1.80" +indicatif.workspace = true +async-trait.workspace = true once_cell.workspace = true toml.workspace = true -strum = { version = "0.26", features = ["derive"] } +strum.workspace = true image.workspace = true derive_more = { version = "0.99.17", default-features = false, features = [ "from", ] } -akin = "0.4.0" -variantly = "0.4.0" +akin.workspace = true +variantly.workspace = true tracing-subscriber.workspace = true -derive-new = "0.7.0" +derive-new.workspace = true itertools.workspace = true -sysinfo = "0.30.12" -mistralrs-vision = { version = "0.6.0", path = "../mistralrs-vision" } -csv = "1.3.0" +sysinfo.workspace = true +mistralrs-vision.workspace = true +csv.workspace = true reqwest.workspace = true base64.workspace = true -bytemuck_derive = "1.7.0" -mistralrs-paged-attn = { version = "0.6.0", path = "../mistralrs-paged-attn", optional = true } -mistralrs-quant = { version = "0.6.0", path = "../mistralrs-quant" } -uuid = { version = "1.10.0", features = ["v4"] } +bytemuck_derive.workspace = true +mistralrs-paged-attn = { workspace = true, optional = true } +mistralrs-quant.workspace = true +uuid = { workspace = true, features = ["v4"] } utoipa = { workspace = true, optional = true } -schemars = "0.8.21" -serde_yaml = "0.9.34" +schemars.workspace = true +serde_yaml.workspace = true regex.workspace = true -serde_plain = "1.0.2" -as-any = "0.3.1" +serde_plain.workspace = true +as-any.workspace = true float8.workspace = true -llguidance = { version = "0.7.20", default-features = false, features = ["lark"] } -toktrie_hf_tokenizers = "0.7.20" -objc = { version = "0.2.7", optional = true } +llguidance.workspace = true +toktrie_hf_tokenizers.workspace = true +objc = { workspace = true, optional = true } metal = { workspace = true, optional = true } candle-flash-attn-v3 = { workspace = true, optional = true } safetensors.workspace = true -serde-big-array = "0.5.1" -interprocess = "2.2.2" -urlencoding = "2.1.3" -scraper = "0.23.1" -html2text = "0.14.2" -ordered-float = "5.0.0" -hashbrown = "0.15.3" -parking_lot = "0.12.3" -ahash = "0.8.12" -num-traits = "0.2.19" -libc = "0.2.172" -bm25 = "2.2.1" +serde-big-array.workspace = true +interprocess.workspace = true +urlencoding.workspace = true +scraper.workspace = true +html2text.workspace = true +ordered-float.workspace = true +hashbrown.workspace = true +parking_lot.workspace = true +ahash.workspace = true +num-traits.workspace = true +libc.workspace = true +bm25.workspace = true [features] pyo3_macros = ["pyo3"] @@ -127,4 +127,4 @@ utoipa = ["dep:utoipa"] ring = ["mistralrs-quant/ring"] [build-dependencies] -bindgen_cuda = { version = "0.1.5", optional = true } +bindgen_cuda = { workspace = true, optional = true } diff --git a/mistralrs-paged-attn/Cargo.toml b/mistralrs-paged-attn/Cargo.toml index 0e9baa5a34..7b33848f97 100644 --- a/mistralrs-paged-attn/Cargo.toml +++ b/mistralrs-paged-attn/Cargo.toml @@ -16,11 +16,11 @@ candle-core.workspace = true half.workspace = true float8.workspace = true metal = { workspace = true, optional = true } -thiserror = "1" -once_cell = "1.20.2" +thiserror.workspace = true +once_cell.workspace = true [build-dependencies] -bindgen_cuda = {git = "https://github.com/guoqingbao/bindgen_cuda.git", version = "0.1.6", optional = true} +bindgen_cuda = { workspace = true, optional = true } anyhow.workspace = true [features] diff --git a/mistralrs-pyo3/Cargo.toml b/mistralrs-pyo3/Cargo.toml index d54becbb38..ca755aec28 100644 --- a/mistralrs-pyo3/Cargo.toml +++ b/mistralrs-pyo3/Cargo.toml @@ -17,7 +17,7 @@ doc = false [dependencies] pyo3.workspace = true -mistralrs-core = { version = "0.6.0", path = "../mistralrs-core", features = ["pyo3_macros"] } +mistralrs-core = { workspace = true, features = ["pyo3_macros"] } serde.workspace = true serde_json.workspace = true candle-core.workspace = true @@ -36,7 +36,7 @@ anyhow.workspace = true itertools.workspace = true [build-dependencies] -pyo3-build-config = "0.22" +pyo3-build-config.workspace = true [features] cuda = ["candle-core/cuda", "mistralrs-core/cuda"] diff --git a/mistralrs-quant/Cargo.toml b/mistralrs-quant/Cargo.toml index b6bc0fc7fa..379f1b6082 100644 --- a/mistralrs-quant/Cargo.toml +++ b/mistralrs-quant/Cargo.toml @@ -17,17 +17,17 @@ candle-nn.workspace = true half.workspace = true serde.workspace = true serde_json.workspace = true -lazy_static = "1.4" -paste = "1.0.15" +lazy_static.workspace = true +paste.workspace = true tracing.workspace = true rayon.workspace = true -byteorder = "1.5.0" +byteorder.workspace = true float8.workspace = true once_cell.workspace = true metal = { workspace = true, optional = true } -thiserror = "1" -yoke = "0.7.5" -memmap2 = "0.9.5" +thiserror.workspace = true +yoke.workspace = true +memmap2.workspace = true safetensors.workspace = true regex.workspace = true hf-hub.workspace = true @@ -45,4 +45,4 @@ accelerate = ["candle-core/accelerate", "candle-nn/accelerate"] ring = [] [build-dependencies] -bindgen_cuda = { version = "0.1.5", optional = true } +bindgen_cuda = { workspace = true, optional = true } diff --git a/mistralrs-server-core/Cargo.toml b/mistralrs-server-core/Cargo.toml index c797bfa0cc..3838cd9a81 100644 --- a/mistralrs-server-core/Cargo.toml +++ b/mistralrs-server-core/Cargo.toml @@ -21,18 +21,18 @@ futures.workspace = true image.workspace = true indexmap.workspace = true itertools.workspace = true -mistralrs-core = { version = "0.6.0", path = "../mistralrs-core", features = [ +mistralrs-core = { workspace = true, features = [ "utoipa", ] } reqwest.workspace = true serde.workspace = true serde_json.workspace = true tokio.workspace = true -tower-http = { version = "0.5.1", features = ["cors"] } +tower-http = { workspace = true, features = ["cors"] } tracing.workspace = true url.workspace = true utoipa = { workspace = true, features = ["axum_extras"] } -utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] } +utoipa-swagger-ui = { workspace = true, features = ["axum"] } accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true } diff --git a/mistralrs-server/Cargo.toml b/mistralrs-server/Cargo.toml index c7005fa4dd..8c4eab8527 100644 --- a/mistralrs-server/Cargo.toml +++ b/mistralrs-server/Cargo.toml @@ -16,12 +16,12 @@ default-run = "mistralrs-server" anyhow.workspace = true axum = { workspace = true, features = ["tokio"] } clap.workspace = true -ctrlc = "3.4.4" -directories = "6.0.0" +ctrlc.workspace = true +directories.workspace = true either.workspace = true indexmap.workspace = true -mistralrs-core = { version = "0.6.0", path = "../mistralrs-core" } -mistralrs-server-core = { version = "0.6.0", path = "../mistralrs-server-core" } +mistralrs-core.workspace = true +mistralrs-server-core.workspace = true once_cell.workspace = true regex.workspace = true rustyline = { version = "15.0.0", default-features = false, features = [ diff --git a/mistralrs-web-chat/Cargo.toml b/mistralrs-web-chat/Cargo.toml index 69b494e95f..4401579a34 100644 --- a/mistralrs-web-chat/Cargo.toml +++ b/mistralrs-web-chat/Cargo.toml @@ -5,35 +5,35 @@ edition = "2021" [dependencies] # async runtime + macros -tokio = { version = "1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } # web framework + WebSocket extractor -axum = { version = "0.7", features = ["ws", "multipart"] } +axum = { workspace = true, features = ["ws", "multipart"] } # structured logging (optional but handy) -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] } +tracing.workspace = true +tracing-subscriber = { workspace = true, features = ["fmt", "env-filter"] } # JSON helpers -serde = { version = "1", features = ["derive"] } -serde_json = "1" +serde = { workspace = true, features = ["derive"] } +serde_json.workspace = true -anyhow = "1" +anyhow.workspace = true -mistralrs = { path = "../mistralrs" } -futures-util = "0.3.31" -axum_static = "1.7.1" -tower-http = { version = "0.6.4", features = ["fs"] } -uuid = "1.17.0" +mistralrs.workspace = true +futures-util.workspace = true +axum_static.workspace = true +tower-http = { workspace = true, features = ["fs"] } +uuid.workspace = true image.workspace = true clap = { workspace = true, features = ["derive"] } indexmap.workspace = true -chrono = "0.4.41" +chrono.workspace = true base64.workspace = true -mime_guess = "2.0.5" -include_dir = "0.7.4" -http = "1.3.1" -hyper = "1.6.0" +mime_guess.workspace = true +include_dir.workspace = true +http.workspace = true +hyper.workspace = true [features] cuda = ["mistralrs/cuda"] diff --git a/mistralrs/Cargo.toml b/mistralrs/Cargo.toml index d684fda8f6..c5c57c41f5 100644 --- a/mistralrs/Cargo.toml +++ b/mistralrs/Cargo.toml @@ -12,7 +12,7 @@ license.workspace = true homepage.workspace = true [dependencies] -mistralrs-core = { version = "0.6.0", path = "../mistralrs-core" } +mistralrs-core.workspace = true anyhow.workspace = true tokio.workspace = true candle-core.workspace = true @@ -24,7 +24,7 @@ indexmap.workspace = true either.workspace = true futures.workspace = true reqwest.workspace = true -rand = "0.9.0" +rand.workspace = true clap.workspace = true walkdir.workspace = true