From 4e867588ecca43490fbd281941d7b9e561712827 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 03:25:01 +0000 Subject: [PATCH] build(deps): bump tract-onnx from 0.18.5 to 0.20.19 Bumps [tract-onnx](https://github.com/snipsco/tract) from 0.18.5 to 0.20.19. - [Release notes](https://github.com/snipsco/tract/releases) - [Changelog](https://github.com/sonos/tract/blob/main/CHANGELOG.md) - [Commits](https://github.com/snipsco/tract/compare/0.18.5...0.20.19) --- updated-dependencies: - dependency-name: tract-onnx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 202 +++++++++++++++++++++++++++++------------------- jcss/Cargo.toml | 2 +- 2 files changed, 125 insertions(+), 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fceb314..e34248f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ "actix-rt", "actix-service", "actix-utils", - "ahash", + "ahash 0.8.3", "base64", "bitflags 2.3.3", "brotli", @@ -184,7 +184,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash", + "ahash 0.8.3", "bytes", "bytestring", "cfg-if", @@ -227,6 +227,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.8.3" @@ -646,6 +657,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.3" @@ -758,18 +775,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" -[[package]] -name = "educe" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07b7cc9cd8c08d10db74fca3b20949b9b6199725c04a0cce6d543496098fcac" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.104", -] - [[package]] name = "either" version = "1.6.1" @@ -785,20 +790,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-ordinalize" -version = "3.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2170fc0efee383079a8bdd05d6ea2a184d2a0f07a1c1dcabdb2fd5e9f24bc36c" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.104", -] - [[package]] name = "errno" version = "0.3.1" @@ -1070,10 +1061,11 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "half" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c207b0ee023c7fce79daf01828163aaf53a1ddd0be8b1ef9541da7d41f6fa63a" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" dependencies = [ + "crunchy", "num-traits", ] @@ -1082,6 +1074,9 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.6", +] [[package]] name = "heck" @@ -1565,17 +1560,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-complex" version = "0.4.0" @@ -1626,15 +1610,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" -dependencies = [ - "libc", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -1815,6 +1790,15 @@ dependencies = [ "termtree", ] +[[package]] +name = "primal-check" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +dependencies = [ + "num-integer", +] + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -1925,6 +1909,16 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -2032,6 +2026,21 @@ dependencies = [ "semver", ] +[[package]] +name = "rustfft" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + [[package]] name = "rustix" version = "0.38.4" @@ -2221,6 +2230,23 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "string-interner" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648" +dependencies = [ + "cfg-if", + "hashbrown", + "serde", +] + [[package]] name = "strsim" version = "0.10.0" @@ -2310,21 +2336,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.7" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", - "libc", - "num_threads", + "serde", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + [[package]] name = "time-macros" -version = "0.2.3" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] [[package]] name = "tinyvec" @@ -2446,22 +2481,23 @@ dependencies = [ [[package]] name = "tract-core" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea181f44fa0f02e234e52ff010f40eaadf96aff76566bcac2685c476adabfbe1" +checksum = "41d1e6454002cebba16355b658fa9d523ce65eb9ab4d77cda405cbe22d6cc249" dependencies = [ "anyhow", "bit-set", "derive-new", "downcast-rs", "dyn-clone", - "educe", "lazy_static", "log", "maplit", "ndarray", + "num-complex", "num-integer", "num-traits", + "rustfft", "smallvec", "tract-data", "tract-linalg", @@ -2469,47 +2505,46 @@ dependencies = [ [[package]] name = "tract-data" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b83088c06a20933275ee79b98288ef8e3af8f87688a78b7523d427e6f6861de" +checksum = "89cb8fb238455ecd2c7f81ca642031fcbe15886462d051ffc2f60afa5ef8e136" dependencies = [ "anyhow", - "educe", - "half 2.0.0", + "half 2.2.1", "itertools", "lazy_static", "maplit", "ndarray", - "num-complex", + "nom", "num-integer", "num-traits", "scan_fmt", "smallvec", + "string-interner", ] [[package]] name = "tract-hir" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276a8a313f44a54f65efeb3a7179921b6f1a853958c373198030d84edf13293" +checksum = "7c8f70d015e231367e4d6c8ace46bfde4bd454645926e181aaae0b7db18ed149" dependencies = [ "derive-new", - "educe", "log", "tract-core", ] [[package]] name = "tract-linalg" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55be8006b7b8f5ac85d51f4994edcfc0edf3c6df952dad594ab7c8faa74d93ed" +checksum = "0ff0275786fbe2ce8e09da477827e11b5448901391c3944351b5483a3aef9239" dependencies = [ "cc", "derive-new", "downcast-rs", "dyn-clone", - "half 2.0.0", + "half 2.2.1", "lazy_static", "liquid", "liquid-core", @@ -2518,6 +2553,7 @@ dependencies = [ "paste", "scan_fmt", "smallvec", + "time", "tract-data", "unicode-normalization", "walkdir", @@ -2525,9 +2561,9 @@ dependencies = [ [[package]] name = "tract-nnef" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfd2f5ed54894e7adc33ac541d3436a95ab51b5f87df6ce26c140a541d07fbc" +checksum = "be0de4f960974995a627197acde39d23039f5364e6334fb08b7197098f48baf2" dependencies = [ "byteorder", "flate2", @@ -2540,13 +2576,12 @@ dependencies = [ [[package]] name = "tract-onnx" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6974d2450e3b918ab2733eeba8f6222da36927d6175a801ee50b16c5c1cd764a" +checksum = "e0e7752c6657c1109b4fc09c60455e84d67527c33895f1e890c6abf1b00c0628" dependencies = [ "bytes", "derive-new", - "educe", "log", "memmap2", "num-integer", @@ -2559,17 +2594,28 @@ dependencies = [ [[package]] name = "tract-onnx-opl" -version = "0.18.5" +version = "0.20.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6186ba851df659ee1e43e5fa94b023c3b5dd0cb26d99cee85f22c3580eb4055" +checksum = "a4424802f1e0c9b39b4c776f65dee3d8a9f411c5eabb743fadbf35de6f3db702" dependencies = [ - "educe", "getrandom", "log", "rand", + "rand_distr", + "rustfft", "tract-nnef", ] +[[package]] +name = "transpose" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +dependencies = [ + "num-integer", + "strength_reduce", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/jcss/Cargo.toml b/jcss/Cargo.toml index d9690fe..6b2d4c7 100644 --- a/jcss/Cargo.toml +++ b/jcss/Cargo.toml @@ -9,7 +9,7 @@ image = "0.24" ndarray = "0.15" nshare = { version = "0.9", default-features = false, features = ["ndarray", "image"] } tracing = "0.1" -tract-onnx = "0.18" +tract-onnx = "0.20" [dev-dependencies] rstest = "0.17" \ No newline at end of file