From 5d644aa656e1f0a7b28a0f4e439be3236719c9e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 03:59:46 +0000 Subject: [PATCH] build(deps): bump tract-onnx from 0.18.5 to 0.20.7 Bumps [tract-onnx](https://github.com/snipsco/tract) from 0.18.5 to 0.20.7. - [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.7) --- updated-dependencies: - dependency-name: tract-onnx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 141 ++++++++++++++++++++++++++++-------------------- jcss/Cargo.toml | 2 +- 2 files changed, 85 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edcc90d..2685c97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -754,18 +754,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" @@ -781,20 +769,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" @@ -1081,6 +1055,9 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1602,17 +1579,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" @@ -1851,6 +1817,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" @@ -1961,6 +1936,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" @@ -2068,6 +2053,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.37.20" @@ -2248,6 +2248,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" @@ -2488,22 +2505,23 @@ dependencies = [ [[package]] name = "tract-core" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea181f44fa0f02e234e52ff010f40eaadf96aff76566bcac2685c476adabfbe1" +checksum = "1d1518c2b81258326ade7659d9c71d3747fee884cb792afdd09977fd4693cf1d" 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", @@ -2511,41 +2529,40 @@ dependencies = [ [[package]] name = "tract-data" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b83088c06a20933275ee79b98288ef8e3af8f87688a78b7523d427e6f6861de" +checksum = "68315af15998e0cf06c29f017905c083d4f964b3114d8436ef6887b11fa39f56" dependencies = [ "anyhow", - "educe", "half 2.0.0", "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.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276a8a313f44a54f65efeb3a7179921b6f1a853958c373198030d84edf13293" +checksum = "be070982d0310dc8f9164251cef6e67514bd64c844066d853adfe45d65f2622a" dependencies = [ "derive-new", - "educe", "log", "tract-core", ] [[package]] name = "tract-linalg" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55be8006b7b8f5ac85d51f4994edcfc0edf3c6df952dad594ab7c8faa74d93ed" +checksum = "f4332a4be4cb2c12c317d0e092dcf5b09479314be18b906333113429ec258d36" dependencies = [ "cc", "derive-new", @@ -2567,9 +2584,9 @@ dependencies = [ [[package]] name = "tract-nnef" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfd2f5ed54894e7adc33ac541d3436a95ab51b5f87df6ce26c140a541d07fbc" +checksum = "dcb872e9c8c156a8b5194f27ebaff5867f2b2edbc22a6f47dc7fcf2bb8b52473" dependencies = [ "byteorder", "flate2", @@ -2582,13 +2599,12 @@ dependencies = [ [[package]] name = "tract-onnx" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6974d2450e3b918ab2733eeba8f6222da36927d6175a801ee50b16c5c1cd764a" +checksum = "ec4ba4a71a7eb6ab440bd0e525ea582fc339d938ff1cee91dbf38e0a59af277e" dependencies = [ "bytes", "derive-new", - "educe", "log", "memmap2", "num-integer", @@ -2601,17 +2617,28 @@ dependencies = [ [[package]] name = "tract-onnx-opl" -version = "0.18.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6186ba851df659ee1e43e5fa94b023c3b5dd0cb26d99cee85f22c3580eb4055" +checksum = "d5efd9ae10b507905ae6d1df7ec48f4dab77ab9605b1bd86275bb19997882267" 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