From f3ee145f65d5f81d41322c71f259a3d9d59f32e6 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 4 Mar 2025 19:18:18 -0500 Subject: [PATCH] vendor in candle-examples --- Cargo.lock | 906 +++++++++++++++++- Cargo.toml | 1 + .../vendor/candle/candle-examples/Cargo.toml | 67 +- 3 files changed, 884 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29fefc7bad..820da85465 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,22 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "ab_glyph" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + [[package]] name = "accelerate-src" version = "0.3.2" @@ -486,6 +502,28 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +[[package]] +name = "alsa" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +dependencies = [ + "alsa-sys", + "bitflags 2.5.0", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "analytics-job" version = "0.0.1" @@ -643,6 +681,15 @@ dependencies = [ "tokenizers 0.15.2", ] +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arbitrary" version = "1.3.2" @@ -792,6 +839,12 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" +[[package]] +name = "assert_float_eq" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d2119f741b79fe9907f5396d19bffcb46568cfcc315e78677d731972ac7085" + [[package]] name = "async-channel" version = "1.9.0" @@ -1155,6 +1208,24 @@ dependencies = [ "utoipa", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.87", +] + [[package]] name = "bindgen_cuda" version = "0.1.5" @@ -1406,6 +1477,12 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" + [[package]] name = "byte-unit" version = "5.1.6" @@ -1603,6 +1680,50 @@ dependencies = [ "tokenizers 0.19.1", ] +[[package]] +name = "candle-examples" +version = "0.0.0" +dependencies = [ + "ab_glyph", + "accelerate-src", + "anyhow", + "bindgen_cuda", + "byteorder", + "candle-core", + "candle-datasets", + "candle-flash-attn", + "candle-nn", + "candle-onnx", + "candle-transformers", + "clap", + "cpal", + "csv", + "cudarc", + "enterpolation", + "half", + "hf-hub 0.4.1", + "image", + "imageproc", + "intel-mkl-src", + "memmap2", + "num-traits", + "palette", + "pdf2image", + "pyo3", + "rand 0.8.5", + "rayon", + "rubato", + "safetensors", + "serde", + "serde_json", + "symphonia 0.5.4", + "tokenizers 0.19.1", + "tokio", + "tracing", + "tracing-chrome", + "tracing-subscriber", +] + [[package]] name = "candle-flash-attn" version = "0.8.3" @@ -1769,6 +1890,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfb" version = "0.7.3" @@ -1892,6 +2022,17 @@ dependencies = [ "inout", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading 0.8.6", +] + [[package]] name = "clap" version = "4.4.8" @@ -2160,6 +2301,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "conv" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" +dependencies = [ + "custom_derive", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -2259,6 +2409,49 @@ dependencies = [ "libc", ] +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk 0.8.0", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -2528,6 +2721,12 @@ dependencies = [ "libloading 0.8.6", ] +[[package]] +name = "custom_derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" + [[package]] name = "darling" version = "0.13.4" @@ -2646,6 +2845,12 @@ dependencies = [ "parking_lot_core 0.9.10", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + [[package]] name = "data-encoding" version = "2.5.0" @@ -3462,6 +3667,18 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "enterpolation" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fadf5c8cbf7c6765ff05ccbd8811cd7bc3a763e4671755204552bf8740d042a" +dependencies = [ + "assert_float_eq", + "num-traits", + "serde", + "topology-traits", +] + [[package]] name = "enum-as-inner" version = "0.6.1" @@ -3635,6 +3852,12 @@ dependencies = [ "zune-inflate", ] +[[package]] +name = "extended" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" + [[package]] name = "fancy-regex" version = "0.13.0" @@ -3646,6 +3869,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -5192,6 +5421,24 @@ dependencies = [ "quick-error", ] +[[package]] +name = "imageproc" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a0d7770f428b4615960cc8602775d1f04c75d41b0ccdef862e889ebaae9bbf" +dependencies = [ + "ab_glyph", + "approx", + "conv", + "getrandom 0.2.14", + "image", + "itertools 0.12.1", + "nalgebra", + "num", + "rand 0.8.5", + "rand_distr", +] + [[package]] name = "images" version = "0.0.1" @@ -5847,9 +6094,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.170" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" [[package]] name = "libfuzzer-sys" @@ -6053,6 +6300,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "macro_rules_attribute" version = "0.2.0" @@ -6138,6 +6394,16 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + [[package]] name = "maybe-async" version = "0.2.7" @@ -6199,7 +6465,7 @@ dependencies = [ "errors", "log", "my-workspace-hack", - "symphonia", + "symphonia 0.5.0", ] [[package]] @@ -6689,6 +6955,21 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "nalgebra" +version = "0.32.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4" +dependencies = [ + "approx", + "matrixmultiply", + "num-complex", + "num-rational", + "num-traits", + "simba", + "typenum", +] + [[package]] name = "native-tls" version = "0.2.14" @@ -6706,6 +6987,20 @@ dependencies = [ "tempfile", ] +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror 1.0.63", +] + [[package]] name = "ndk" version = "0.9.0" @@ -6715,7 +7010,7 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror 1.0.63", @@ -6727,6 +7022,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "ndk-sys" version = "0.6.0+11769913" @@ -6794,6 +7098,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.4.3" @@ -7196,6 +7510,29 @@ dependencies = [ "memchr", ] +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk 0.8.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + [[package]] name = "oci-spec" version = "0.6.7" @@ -7432,6 +7769,21 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" +dependencies = [ + "ttf-parser", +] + [[package]] name = "p256" version = "0.13.2" @@ -7456,6 +7808,30 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "palette" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf 0.11.2", +] + +[[package]] +name = "palette_derive" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" +dependencies = [ + "by_address", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "pango" version = "0.18.3" @@ -7622,6 +7998,18 @@ dependencies = [ "hmac 0.12.1", ] +[[package]] +name = "pdf2image" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81faf78c5913b018802dec31a604ce551724d89014a27e063a6e186771f92dea" +dependencies = [ + "derive_builder 0.20.2", + "image", + "rayon", + "thiserror 1.0.63", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -7926,6 +8314,15 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "primal-check" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" +dependencies = [ + "num-integer", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -8317,7 +8714,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 2.0.0", "rustls 0.23.13", "socket2", "thiserror 1.0.63", @@ -8334,7 +8731,7 @@ dependencies = [ "bytes 1.10.0", "rand 0.8.5", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls 0.23.13", "slab", "thiserror 1.0.63", @@ -8590,6 +8987,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + [[package]] name = "rayon" version = "1.10.0" @@ -8630,6 +9033,15 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "realfft" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390252372b7f2aac8360fc5e72eba10136b166d6faeed97e6d0c8324eb99b2b1" +dependencies = [ + "rustfft", +] + [[package]] name = "reborrow" version = "0.5.5" @@ -9011,6 +9423,18 @@ dependencies = [ "quick-xml 0.30.0", ] +[[package]] +name = "rubato" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d18b486e7d29a408ef3f825bc1327d8f87af091c987ca2f5b734625940e234" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "realfft", +] + [[package]] name = "rust-embed" version = "8.0.0" @@ -9112,6 +9536,12 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc-hash" version = "2.0.0" @@ -9136,6 +9566,21 @@ dependencies = [ "semver 1.0.23", ] +[[package]] +name = "rustfft" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + [[package]] name = "rustix" version = "0.38.34" @@ -9252,6 +9697,15 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "safe_arch" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323" +dependencies = [ + "bytemuck", +] + [[package]] name = "safetensors" version = "0.4.5" @@ -9801,6 +10255,21 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "sieve-cache" version = "0.2.1" @@ -9826,6 +10295,19 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simba" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +dependencies = [ + "approx", + "num-complex", + "num-traits", + "paste", + "wide", +] + [[package]] name = "simd-adler32" version = "0.3.7" @@ -10363,7 +10845,7 @@ dependencies = [ "sqlx", "strum", "strum_macros", - "symphonia", + "symphonia 0.5.0", "tempdir", "tempfile", "testing", @@ -10392,6 +10874,12 @@ dependencies = [ "serial_test", ] +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + [[package]] name = "string_cache" version = "0.8.7" @@ -10521,19 +11009,42 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "lazy_static", - "symphonia-bundle-flac", - "symphonia-bundle-mp3", - "symphonia-codec-aac", - "symphonia-codec-alac", + "symphonia-bundle-flac 0.5.0", + "symphonia-bundle-mp3 0.5.0", + "symphonia-codec-aac 0.5.0", + "symphonia-codec-alac 0.5.0", "symphonia-codec-opus", - "symphonia-codec-pcm", - "symphonia-codec-vorbis", - "symphonia-core", - "symphonia-format-isomp4", - "symphonia-format-mkv", - "symphonia-format-ogg", + "symphonia-codec-pcm 0.5.0", + "symphonia-codec-vorbis 0.5.0", + "symphonia-core 0.5.0", + "symphonia-format-isomp4 0.5.0", + "symphonia-format-mkv 0.5.0", + "symphonia-format-ogg 0.5.0", "symphonia-format-wav", - "symphonia-metadata", + "symphonia-metadata 0.5.0", +] + +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-flac 0.5.4", + "symphonia-bundle-mp3 0.5.4", + "symphonia-codec-aac 0.5.4", + "symphonia-codec-adpcm", + "symphonia-codec-alac 0.5.4", + "symphonia-codec-pcm 0.5.4", + "symphonia-codec-vorbis 0.5.4", + "symphonia-core 0.5.4", + "symphonia-format-caf", + "symphonia-format-isomp4 0.5.4", + "symphonia-format-mkv 0.5.4", + "symphonia-format-ogg 0.5.4", + "symphonia-format-riff", + "symphonia-metadata 0.5.4", ] [[package]] @@ -10542,9 +11053,21 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", - "symphonia-metadata", - "symphonia-utils-xiph", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", + "symphonia-utils-xiph 0.5.0", +] + +[[package]] +name = "symphonia-bundle-flac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97" +dependencies = [ + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", + "symphonia-utils-xiph 0.5.4", ] [[package]] @@ -10555,8 +11078,20 @@ dependencies = [ "bitflags 1.3.2", "lazy_static", "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" +dependencies = [ + "lazy_static", + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", ] [[package]] @@ -10566,7 +11101,28 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "lazy_static", "log", - "symphonia-core", + "symphonia-core 0.5.0", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70" +dependencies = [ + "lazy_static", + "log", + "symphonia-core 0.5.4", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94e1feac3327cd616e973d5be69ad36b3945f16b06f19c6773fc3ac0b426a0f" +dependencies = [ + "log", + "symphonia-core 0.5.4", ] [[package]] @@ -10575,7 +11131,17 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.0", +] + +[[package]] +name = "symphonia-codec-alac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d8a6666649a08412906476a8b0efd9b9733e241180189e9f92b09c08d0e38f3" +dependencies = [ + "log", + "symphonia-core 0.5.4", ] [[package]] @@ -10584,7 +11150,7 @@ version = "0.0.1" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.0", ] [[package]] @@ -10593,7 +11159,17 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.0", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b" +dependencies = [ + "log", + "symphonia-core 0.5.4", ] [[package]] @@ -10602,8 +11178,19 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", - "symphonia-utils-xiph", + "symphonia-core 0.5.0", + "symphonia-utils-xiph 0.5.0", +] + +[[package]] +name = "symphonia-codec-vorbis" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" +dependencies = [ + "log", + "symphonia-core 0.5.4", + "symphonia-utils-xiph 0.5.4", ] [[package]] @@ -10618,6 +11205,30 @@ dependencies = [ "log", ] +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-format-caf" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e43c99c696a388295a29fe71b133079f5d8b18041cf734c5459c35ad9097af50" +dependencies = [ + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", +] + [[package]] name = "symphonia-format-isomp4" version = "0.5.0" @@ -10625,9 +11236,22 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "encoding_rs", "log", - "symphonia-core", - "symphonia-metadata", - "symphonia-utils-xiph", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", + "symphonia-utils-xiph 0.5.0", +] + +[[package]] +name = "symphonia-format-isomp4" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844" +dependencies = [ + "encoding_rs", + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", + "symphonia-utils-xiph 0.5.4", ] [[package]] @@ -10637,9 +11261,22 @@ source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1d dependencies = [ "lazy_static", "log", - "symphonia-core", - "symphonia-metadata", - "symphonia-utils-xiph", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", + "symphonia-utils-xiph 0.5.0", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb43471a100f7882dc9937395bd5ebee8329298e766250b15b3875652fe3d6f" +dependencies = [ + "lazy_static", + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", + "symphonia-utils-xiph 0.5.4", ] [[package]] @@ -10648,9 +11285,33 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", - "symphonia-metadata", - "symphonia-utils-xiph", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", + "symphonia-utils-xiph 0.5.0", +] + +[[package]] +name = "symphonia-format-ogg" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" +dependencies = [ + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", + "symphonia-utils-xiph 0.5.4", +] + +[[package]] +name = "symphonia-format-riff" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50" +dependencies = [ + "extended", + "log", + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", ] [[package]] @@ -10659,8 +11320,8 @@ version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", ] [[package]] @@ -10671,7 +11332,19 @@ dependencies = [ "encoding_rs", "lazy_static", "log", - "symphonia-core", + "symphonia-core 0.5.0", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core 0.5.4", ] [[package]] @@ -10679,8 +11352,18 @@ name = "symphonia-utils-xiph" version = "0.5.0" source = "git+https://github.com/pdeljanov/Symphonia.git?rev=e1a70095c4409478c1ded499fb8dd4afa540fb90#e1a70095c4409478c1ded499fb8dd4afa540fb90" dependencies = [ - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.0", + "symphonia-metadata 0.5.0", +] + +[[package]] +name = "symphonia-utils-xiph" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" +dependencies = [ + "symphonia-core 0.5.4", + "symphonia-metadata 0.5.4", ] [[package]] @@ -10835,9 +11518,9 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "objc", "once_cell", "parking_lot 0.12.2", @@ -11234,6 +11917,16 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + [[package]] name = "thrift" version = "0.17.0" @@ -11429,9 +12122,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes 1.10.0", @@ -11489,9 +12182,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -11712,6 +12405,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "topology-traits" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0c8dab428531e30115d3bfd6e3092b55256a4a7b4f87cb3abe37a000b1f4032" +dependencies = [ + "num-traits", +] + [[package]] name = "tower" version = "0.4.13" @@ -11767,6 +12469,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "tracing-chrome" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "tracing-core" version = "0.1.32" @@ -11774,6 +12487,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec 1.13.2", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "transpose" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" +dependencies = [ + "num-integer", + "strength_reduce", ] [[package]] @@ -11809,6 +12558,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "ttf-parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" + [[package]] name = "tts-download-job" version = "0.0.1" @@ -12254,6 +13009,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + [[package]] name = "value-bag" version = "1.10.0" @@ -12674,6 +13435,16 @@ dependencies = [ "wasite", ] +[[package]] +name = "wide" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b5576b9a81633f3e8df296ce0063042a73507636cbe956c61133dd7034ab22" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "winapi" version = "0.2.8" @@ -12741,6 +13512,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.58.0" @@ -12769,6 +13550,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.58.0" @@ -12777,7 +13568,7 @@ checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ "windows-implement", "windows-interface", - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] @@ -12810,11 +13601,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -12830,7 +13630,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] @@ -13179,7 +13979,7 @@ dependencies = [ "jni", "kuchikiki", "libc", - "ndk", + "ndk 0.9.0", "objc2", "objc2-app-kit", "objc2-foundation", diff --git a/Cargo.toml b/Cargo.toml index 40be2ec141..ba5ddaee9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,6 +98,7 @@ members = [ # Vendored code "crates/vendor/candle/candle-core", "crates/vendor/candle/candle-datasets", + "crates/vendor/candle/candle-examples", "crates/vendor/candle/candle-flash-attn", "crates/vendor/candle/candle-kernels", "crates/vendor/candle/candle-metal-kernels", diff --git a/crates/vendor/candle/candle-examples/Cargo.toml b/crates/vendor/candle/candle-examples/Cargo.toml index 4ee6e0b876..e2f8b6c8c3 100644 --- a/crates/vendor/candle/candle-examples/Cargo.toml +++ b/crates/vendor/candle/candle-examples/Cargo.toml @@ -1,59 +1,52 @@ [package] name = "candle-examples" -version.workspace = true -edition.workspace = true -description.workspace = true -repository.workspace = true -keywords.workspace = true -categories.workspace = true -license.workspace = true -readme = "README.md" +edition = "2021" [dependencies] -accelerate-src = { workspace = true, optional = true } -candle = { workspace = true } -candle-datasets = { workspace = true, optional = true } -candle-nn = { workspace = true } -candle-transformers = { workspace = true } -candle-flash-attn = { workspace = true, optional = true } -candle-onnx = { workspace = true, optional = true } +accelerate-src = { version = "0.3.2", optional = true } +candle = { path = "../candle-core", package = "candle-core" } +candle-datasets = { path = "../candle-datasets", optional = true } +candle-nn = { path = "../candle-nn", package = "candle-nn" } +candle-transformers = { path = "../candle-transformers" } +candle-flash-attn = { path = "../candle-flash-attn", optional = true } +candle-onnx = { path = "../candle-onnx", optional = true } csv = "1.3.0" -cudarc = { workspace = true, optional = true } -half = { workspace = true, optional = true } -hf-hub = { workspace = true, features = ["tokio"] } -image = { workspace = true } -intel-mkl-src = { workspace = true, optional = true } -num-traits = { workspace = true } +cudarc = { version = "0.13.5", features = ["std", "cublas", "cublaslt", "curand", "driver", "nvrtc", "f16", "cuda-version-from-build-system", "dynamic-linking"], default-features=false, optional = true } +half = { version = "2.3.1", features = ["num-traits", "use-intrinsics", "rand_distr"], optional = true } +hf-hub = { version = "0.4.1", features = ["tokio"] } +image = { version = "0.25.2", default-features = false, features = ["jpeg", "png"] } +intel-mkl-src = { version = "0.8.1", features = ["mkl-static-lp64-iomp"], optional = true } +num-traits = "0.2.15" palette = { version = "0.7.6", optional = true } enterpolation = { version = "0.2.1", optional = true} pyo3 = { version = "0.22.0", features = ["auto-initialize", "abi3-py311"], optional = true } -rayon = { workspace = true } +rayon = "1.7.0" rubato = { version = "0.15.0", optional = true } -safetensors = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } +safetensors = "0.4.1" +serde = { version = "1.0.171", features = ["derive"] } +serde_json = "1.0.99" symphonia = { version = "0.5.3", features = ["all"], optional = true } -tokenizers = { workspace = true, features = ["onig"] } +tokenizers = { version = "0.19.1", default-features = false, features = ["onig"] } cpal = { version = "0.15.2", optional = true } pdf2image = { version = "0.1.2" , optional = true} [dev-dependencies] -anyhow = { workspace = true } -byteorder = { workspace = true } -clap = { workspace = true } -imageproc = { workspace = true } -memmap2 = { workspace = true } -rand = { workspace = true } -ab_glyph = { workspace = true } -tracing = { workspace = true } -tracing-chrome = { workspace = true } -tracing-subscriber = { workspace = true } +anyhow = { version = "1", features = ["backtrace"] } +byteorder = "1.4.3" +clap = { version = "4.2.4", features = ["derive"] } +imageproc = { version = "0.24.0", default-features = false } +memmap2 = { version = "0.9.3", features = ["stable_deref_trait"] } +rand = "0.8.5" +ab_glyph = "0.2.23" +tracing = "0.1.37" +tracing-chrome = "0.7.1" +tracing-subscriber = "0.3.7" # Necessary to disambiguate with tokio in wasm examples which are 1.28.1 tokio = "1.43.0" [build-dependencies] -anyhow = { workspace = true } +anyhow = { version = "1", features = ["backtrace"] } bindgen_cuda = { version = "0.1.1", optional = true } [features]