From 34f537078eeaa750982693a7c73741d721235993 Mon Sep 17 00:00:00 2001 From: Eric Buehler Date: Sat, 17 Aug 2024 11:29:02 -0400 Subject: [PATCH 1/4] Support GGUF bf16 tensors --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- mistralrs-core/Cargo.toml | 2 +- mistralrs-pyo3/Cargo_template.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71e5cb1bb..41d1f0f0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" +source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" dependencies = [ "accelerate-src", "byteorder", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "candle-flash-attn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" +source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" dependencies = [ "anyhow", "bindgen_cuda 0.1.5", @@ -506,7 +506,7 @@ dependencies = [ [[package]] name = "candle-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" +source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" dependencies = [ "bindgen_cuda 0.1.5", ] @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" +source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" dependencies = [ "metal", "once_cell", @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=2386e4e#2386e4e4683f31530ab6d02e7516dfffe683331a" +source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" dependencies = [ "accelerate-src", "candle-core", diff --git a/Cargo.toml b/Cargo.toml index c0c83c2aa..e708a75bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ license = "MIT" [workspace.dependencies] anyhow = "1.0.80" -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "2386e4e" } -candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "2386e4e" } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f" } +candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f" } serde = "1.0.197" serde_json = "1.0.114" indexmap = { version = "2.2.5", features = ["serde"] } diff --git a/mistralrs-core/Cargo.toml b/mistralrs-core/Cargo.toml index 35b2aaaf9..030a94c02 100644 --- a/mistralrs-core/Cargo.toml +++ b/mistralrs-core/Cargo.toml @@ -17,7 +17,7 @@ candle-core.workspace = true candle-nn.workspace = true serde.workspace = true serde_json.workspace = true -candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "2386e4e", optional = true } +candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f", optional = true } dirs = "5.0.1" hf-hub = "0.3.2" thiserror = "1.0.57" diff --git a/mistralrs-pyo3/Cargo_template.toml b/mistralrs-pyo3/Cargo_template.toml index 8f6da0d5d..74ed91d56 100644 --- a/mistralrs-pyo3/Cargo_template.toml +++ b/mistralrs-pyo3/Cargo_template.toml @@ -20,7 +20,7 @@ pyo3.workspace = true mistralrs-core = { version = "0.2.5", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } serde.workspace = true serde_json.workspace = true -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "2386e4e", features=["$feature_name"] } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f", features=["$feature_name"] } indexmap.workspace = true accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true } From 086d73fa0a4f8a1f8ccdd765e623a9a468df31de Mon Sep 17 00:00:00 2001 From: Eric Buehler Date: Tue, 20 Aug 2024 06:36:47 -0400 Subject: [PATCH 2/4] Fix loading of bf16 ggml tensor --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- mistralrs-core/Cargo.toml | 2 +- mistralrs-pyo3/Cargo_template.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41d1f0f0a..de91c2505 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" +source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" dependencies = [ "accelerate-src", "byteorder", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "candle-flash-attn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" +source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" dependencies = [ "anyhow", "bindgen_cuda 0.1.5", @@ -506,7 +506,7 @@ dependencies = [ [[package]] name = "candle-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" +source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" dependencies = [ "bindgen_cuda 0.1.5", ] @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" +source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" dependencies = [ "metal", "once_cell", @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=b5f038f#b5f038f67e940aa4c672a83d6eb3fd7bf1ff4aff" +source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" dependencies = [ "accelerate-src", "candle-core", diff --git a/Cargo.toml b/Cargo.toml index e708a75bb..695fd7198 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ license = "MIT" [workspace.dependencies] anyhow = "1.0.80" -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f" } -candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f" } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527" } +candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527" } serde = "1.0.197" serde_json = "1.0.114" indexmap = { version = "2.2.5", features = ["serde"] } diff --git a/mistralrs-core/Cargo.toml b/mistralrs-core/Cargo.toml index 030a94c02..b1136951c 100644 --- a/mistralrs-core/Cargo.toml +++ b/mistralrs-core/Cargo.toml @@ -17,7 +17,7 @@ candle-core.workspace = true candle-nn.workspace = true serde.workspace = true serde_json.workspace = true -candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f", optional = true } +candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527", optional = true } dirs = "5.0.1" hf-hub = "0.3.2" thiserror = "1.0.57" diff --git a/mistralrs-pyo3/Cargo_template.toml b/mistralrs-pyo3/Cargo_template.toml index 74ed91d56..f8aa5b3eb 100644 --- a/mistralrs-pyo3/Cargo_template.toml +++ b/mistralrs-pyo3/Cargo_template.toml @@ -20,7 +20,7 @@ pyo3.workspace = true mistralrs-core = { version = "0.2.5", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } serde.workspace = true serde_json.workspace = true -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "b5f038f", features=["$feature_name"] } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527", features=["$feature_name"] } indexmap.workspace = true accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true } From 4a8df853e680bf23fd277dc45aa8fb2963295156 Mon Sep 17 00:00:00 2001 From: Eric Buehler Date: Tue, 20 Aug 2024 19:25:54 -0400 Subject: [PATCH 3/4] Fix dequant of bf16 --- Cargo.lock | 250 +++++++++++++++++------------ Cargo.toml | 4 +- mistralrs-core/Cargo.toml | 2 +- mistralrs-pyo3/Cargo_template.toml | 2 +- 4 files changed, 148 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de91c2505..ab5e751da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,6 +33,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -161,9 +167,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "askama" @@ -193,7 +199,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -219,7 +225,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -299,7 +305,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -395,7 +401,7 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.74", + "syn 2.0.75", "thiserror", "try_match", ] @@ -408,22 +414,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -468,7 +474,7 @@ dependencies = [ [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" +source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" dependencies = [ "accelerate-src", "byteorder", @@ -495,7 +501,7 @@ dependencies = [ [[package]] name = "candle-flash-attn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" +source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" dependencies = [ "anyhow", "bindgen_cuda 0.1.5", @@ -506,7 +512,7 @@ dependencies = [ [[package]] name = "candle-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" +source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" dependencies = [ "bindgen_cuda 0.1.5", ] @@ -514,7 +520,7 @@ dependencies = [ [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" +source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" dependencies = [ "metal", "once_cell", @@ -525,7 +531,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=8790527#8790527125d6abbeadc4300ace7ab65cc63f1111" +source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" dependencies = [ "accelerate-src", "candle-core", @@ -542,9 +548,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", @@ -626,9 +632,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.15" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -655,7 +661,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -930,7 +936,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -952,7 +958,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -985,7 +991,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -996,7 +1002,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1017,7 +1023,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1027,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1038,7 +1044,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1090,7 +1096,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1154,7 +1160,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1202,7 +1208,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1247,12 +1253,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1297,7 +1303,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1377,7 +1383,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1595,9 +1601,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -2062,9 +2068,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -2276,6 +2282,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -2497,7 +2512,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2651,7 +2666,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2783,7 +2798,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2935,7 +2950,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2984,7 +2999,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2998,7 +3013,7 @@ dependencies = [ "dunce", "serde", "serde_json", - "zip 2.1.6", + "zip 2.2.0", ] [[package]] @@ -3011,7 +3026,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -3079,9 +3094,9 @@ dependencies = [ [[package]] name = "pulp" -version = "0.18.21" +version = "0.18.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" dependencies = [ "bytemuck", "libm", @@ -3149,7 +3164,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3162,7 +3177,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3353,9 +3368,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3408,9 +3423,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -3452,7 +3467,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] @@ -3490,7 +3505,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.74", + "syn 2.0.75", "walkdir", ] @@ -3506,9 +3521,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "num-traits", @@ -3651,7 +3666,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3697,22 +3712,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.207" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.207" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3723,14 +3738,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -3756,7 +3771,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3807,7 +3822,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3994,7 +4009,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4016,9 +4031,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -4036,6 +4051,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -4045,7 +4063,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4079,20 +4097,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4154,7 +4172,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4258,9 +4276,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.2" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -4282,7 +4300,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4449,7 +4467,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4514,14 +4532,14 @@ checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -4662,7 +4680,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4791,7 +4809,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -4825,7 +4843,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4911,6 +4929,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -5077,16 +5125,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "xattr" version = "1.3.1" @@ -5118,7 +5156,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "synstructure", ] @@ -5140,7 +5178,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5160,7 +5198,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "synstructure", ] @@ -5181,7 +5219,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5202,9 +5240,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "aes", "arbitrary", diff --git a/Cargo.toml b/Cargo.toml index 695fd7198..ece38d248 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ license = "MIT" [workspace.dependencies] anyhow = "1.0.80" -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527" } -candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527" } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980" } +candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980" } serde = "1.0.197" serde_json = "1.0.114" indexmap = { version = "2.2.5", features = ["serde"] } diff --git a/mistralrs-core/Cargo.toml b/mistralrs-core/Cargo.toml index b1136951c..f7dd5a845 100644 --- a/mistralrs-core/Cargo.toml +++ b/mistralrs-core/Cargo.toml @@ -17,7 +17,7 @@ candle-core.workspace = true candle-nn.workspace = true serde.workspace = true serde_json.workspace = true -candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527", optional = true } +candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980", optional = true } dirs = "5.0.1" hf-hub = "0.3.2" thiserror = "1.0.57" diff --git a/mistralrs-pyo3/Cargo_template.toml b/mistralrs-pyo3/Cargo_template.toml index f8aa5b3eb..8a72fdeae 100644 --- a/mistralrs-pyo3/Cargo_template.toml +++ b/mistralrs-pyo3/Cargo_template.toml @@ -20,7 +20,7 @@ pyo3.workspace = true mistralrs-core = { version = "0.2.5", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } serde.workspace = true serde_json.workspace = true -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "8790527", features=["$feature_name"] } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980", features=["$feature_name"] } indexmap.workspace = true accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true } From 2d63e07e1c1ddd37dad7ceaa2fb727bbcb8dd773 Mon Sep 17 00:00:00 2001 From: Eric Buehler Date: Wed, 21 Aug 2024 09:18:28 -0400 Subject: [PATCH 4/4] Use merged rev --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- mistralrs-core/Cargo.toml | 2 +- mistralrs-pyo3/Cargo_template.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab5e751da..1c26c4a55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,7 +474,7 @@ dependencies = [ [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" +source = "git+https://github.com/EricLBuehler/candle.git?rev=1b1974e#1b1974e0e7f8a89f3d00c01eb695edf9158d55b4" dependencies = [ "accelerate-src", "byteorder", @@ -501,7 +501,7 @@ dependencies = [ [[package]] name = "candle-flash-attn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" +source = "git+https://github.com/EricLBuehler/candle.git?rev=1b1974e#1b1974e0e7f8a89f3d00c01eb695edf9158d55b4" dependencies = [ "anyhow", "bindgen_cuda 0.1.5", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "candle-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" +source = "git+https://github.com/EricLBuehler/candle.git?rev=1b1974e#1b1974e0e7f8a89f3d00c01eb695edf9158d55b4" dependencies = [ "bindgen_cuda 0.1.5", ] @@ -520,7 +520,7 @@ dependencies = [ [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" +source = "git+https://github.com/EricLBuehler/candle.git?rev=1b1974e#1b1974e0e7f8a89f3d00c01eb695edf9158d55b4" dependencies = [ "metal", "once_cell", @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=5212980#5212980fa38d37daf8aeb53865d0cc2607d08e7c" +source = "git+https://github.com/EricLBuehler/candle.git?rev=1b1974e#1b1974e0e7f8a89f3d00c01eb695edf9158d55b4" dependencies = [ "accelerate-src", "candle-core", diff --git a/Cargo.toml b/Cargo.toml index ece38d248..6419bf91d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,8 @@ license = "MIT" [workspace.dependencies] anyhow = "1.0.80" -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980" } -candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980" } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "1b1974e" } +candle-nn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "1b1974e" } serde = "1.0.197" serde_json = "1.0.114" indexmap = { version = "2.2.5", features = ["serde"] } diff --git a/mistralrs-core/Cargo.toml b/mistralrs-core/Cargo.toml index f7dd5a845..9331fd583 100644 --- a/mistralrs-core/Cargo.toml +++ b/mistralrs-core/Cargo.toml @@ -17,7 +17,7 @@ candle-core.workspace = true candle-nn.workspace = true serde.workspace = true serde_json.workspace = true -candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980", optional = true } +candle-flash-attn = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "1b1974e", optional = true } dirs = "5.0.1" hf-hub = "0.3.2" thiserror = "1.0.57" diff --git a/mistralrs-pyo3/Cargo_template.toml b/mistralrs-pyo3/Cargo_template.toml index 8a72fdeae..dc41a0d17 100644 --- a/mistralrs-pyo3/Cargo_template.toml +++ b/mistralrs-pyo3/Cargo_template.toml @@ -20,7 +20,7 @@ pyo3.workspace = true mistralrs-core = { version = "0.2.5", path = "../mistralrs-core", features=["pyo3_macros","$feature_name"] } serde.workspace = true serde_json.workspace = true -candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "5212980", features=["$feature_name"] } +candle-core = { git = "https://github.com/EricLBuehler/candle.git", version = "0.6.0", rev = "1b1974e", features=["$feature_name"] } indexmap.workspace = true accelerate-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true }