diff --git a/Cargo.lock b/Cargo.lock index 061f51b..b327665 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -219,14 +219,14 @@ checksum = "7e1a39b963e261c58017edf2007e5b63425ad21538aaaf51fe23d1da41703701" dependencies = [ "accelerate-src", "byteorder", - "candle-kernels", - "candle-metal-kernels", + "candle-kernels 0.7.2", + "candle-metal-kernels 0.7.2", "cudarc", "gemm", "half", "libc", "memmap2", - "metal", + "metal 0.27.0", "num-traits", "num_cpus", "rand", @@ -238,6 +238,36 @@ dependencies = [ "zip", ] +[[package]] +name = "candle-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e306c8a4276ba57ce9fac76d823cc8c8a7fca14bf222ac20ad8b12c4273152" +dependencies = [ + "accelerate-src", + "byteorder", + "candle-kernels 0.8.1", + "candle-metal-kernels 0.8.1", + "cudarc", + "gemm", + "half", + "libc", + "memmap2", + "metal 0.27.0", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "ug", + "ug-cuda", + "ug-metal", + "yoke", + "zip", +] + [[package]] name = "candle-flash-attn" version = "0.7.2" @@ -246,7 +276,7 @@ checksum = "ad01ec40011de94c0dee88563c6c16eb12eb6d212d176adeff53315c141e0bd1" dependencies = [ "anyhow", "bindgen_cuda", - "candle-core", + "candle-core 0.7.2", "half", ] @@ -259,13 +289,34 @@ dependencies = [ "bindgen_cuda", ] +[[package]] +name = "candle-kernels" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd8ea6588f3c6286ea89a52dad3365f0536fd0b71e729fa998cc2347f1df3b6" +dependencies = [ + "bindgen_cuda", +] + [[package]] name = "candle-metal-kernels" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "166a92826d615d98b205e346e52128fa0439f2ab3302587403fdc558b4219e19" dependencies = [ - "metal", + "metal 0.27.0", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc6621c7e2202f4f129bcc3185c2c6d4fa2fc6b8f3f2b07eaf7c06042910c83" +dependencies = [ + "metal 0.27.0", "once_cell", "thiserror", "tracing", @@ -278,10 +329,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "898f8d21b8bdf559a1c8635e2db8386b2134015cd3003c18c1a30a22a67daec6" dependencies = [ "accelerate-src", - "candle-core", - "candle-metal-kernels", + "candle-core 0.7.2", + "candle-metal-kernels 0.7.2", + "half", + "metal 0.27.0", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-nn" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d417059c44d719fd03a0f711ccfe148d341469c9273d4b5731ebe965b2c97e" +dependencies = [ + "accelerate-src", + "candle-core 0.8.1", + "candle-metal-kernels 0.8.1", "half", - "metal", + "metal 0.27.0", "num-traits", "rayon", "safetensors", @@ -297,9 +366,9 @@ checksum = "06b8a130a8ac1d1e20696d89f7a52948902e037ad0eec085fceb77021007cfee" dependencies = [ "accelerate-src", "byteorder", - "candle-core", + "candle-core 0.7.2", "candle-flash-attn", - "candle-nn", + "candle-nn 0.7.2", "fancy-regex", "num-traits", "rand", @@ -1517,6 +1586,21 @@ dependencies = [ "paste", ] +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -1632,8 +1716,8 @@ name = "norma" version = "0.0.3" dependencies = [ "byteorder", - "candle-core", - "candle-nn", + "candle-core 0.7.2", + "candle-nn 0.8.1", "candle-transformers", "cpal", "dasp_frame", @@ -1655,6 +1739,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.6" @@ -1676,6 +1784,37 @@ dependencies = [ "syn", ] +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2726,6 +2865,48 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "ug" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4eef2ebfc18c67a6dbcacd9d8a4d85e0568cc58c82515552382312c2730ea13" +dependencies = [ + "half", + "num", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ug-cuda" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4dcab280ad0ef3957e153a82dcad608c954d02cf253b695322f502d1f8902e" +dependencies = [ + "cudarc", + "half", + "serde", + "serde_json", + "thiserror", + "ug", +] + +[[package]] +name = "ug-metal" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4ed1df2c20a1a138f993041f650cc84ff27aaefb4342b7f986e77d00e80799" +dependencies = [ + "half", + "metal 0.29.0", + "objc", + "serde", + "serde_json", + "thiserror", + "ug", +] + [[package]] name = "unicode-bidi" version = "0.3.17" diff --git a/Cargo.toml b/Cargo.toml index ced5b70..40d3bb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ jod-thread = "0.1.2" # Whisper candle-core = { version = "0.7.2", optional = true } -candle-nn = { version = "0.7.2", optional = true } +candle-nn = { version = "0.8.1", optional = true } candle-transformers = { version = "0.7.2", optional = true } tokenizers = { version = "0.20.0", optional = true } hf-hub = { version = "0.3.2", features = ["tokio"], optional = true }