diff --git a/Cargo.lock b/Cargo.lock index 2127caf..86f645c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1020,6 +1020,9 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1798,6 +1801,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" @@ -1908,6 +1920,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" @@ -2006,6 +2028,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.36.4" @@ -2186,6 +2223,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" @@ -2434,9 +2488,9 @@ dependencies = [ [[package]] name = "tract-core" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea181f44fa0f02e234e52ff010f40eaadf96aff76566bcac2685c476adabfbe1" +checksum = "3e3aec11d67d94e24feef8012837eed1a16f8ce2c0192ddebb7bda91802974c3" dependencies = [ "anyhow", "bit-set", @@ -2450,6 +2504,7 @@ dependencies = [ "ndarray", "num-integer", "num-traits", + "rustfft", "smallvec", "tract-data", "tract-linalg", @@ -2457,9 +2512,9 @@ dependencies = [ [[package]] name = "tract-data" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b83088c06a20933275ee79b98288ef8e3af8f87688a78b7523d427e6f6861de" +checksum = "958b9926a2bb8d1452a2bd76a0ffbed4b9610662fb0e6246a7ae79d2f3d64b99" dependencies = [ "anyhow", "educe", @@ -2468,18 +2523,20 @@ dependencies = [ "lazy_static", "maplit", "ndarray", + "nom", "num-complex", "num-integer", "num-traits", "scan_fmt", "smallvec", + "string-interner", ] [[package]] name = "tract-hir" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276a8a313f44a54f65efeb3a7179921b6f1a853958c373198030d84edf13293" +checksum = "f96b3dd12058ce570a0a71a4f52e4dbd3162e940d52e2f777d93a9180f6cfd73" dependencies = [ "derive-new", "educe", @@ -2489,9 +2546,9 @@ dependencies = [ [[package]] name = "tract-linalg" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55be8006b7b8f5ac85d51f4994edcfc0edf3c6df952dad594ab7c8faa74d93ed" +checksum = "0d69685669fcc867b1ef3e6fe4d40173ce6e812c12b5d30555654db9b233daaa" dependencies = [ "cc", "derive-new", @@ -2513,9 +2570,9 @@ dependencies = [ [[package]] name = "tract-nnef" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfd2f5ed54894e7adc33ac541d3436a95ab51b5f87df6ce26c140a541d07fbc" +checksum = "8432084c081b2c40d55281aa2c8317e69e3c7094f2bd0bfe52e956cc48508302" dependencies = [ "byteorder", "flate2", @@ -2528,9 +2585,9 @@ dependencies = [ [[package]] name = "tract-onnx" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6974d2450e3b918ab2733eeba8f6222da36927d6175a801ee50b16c5c1cd764a" +checksum = "ecc1275a01376bcf10977c280cafa57b53cc94fbe931ddf9efe725f21dab8e81" dependencies = [ "bytes", "derive-new", @@ -2547,17 +2604,29 @@ dependencies = [ [[package]] name = "tract-onnx-opl" -version = "0.18.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6186ba851df659ee1e43e5fa94b023c3b5dd0cb26d99cee85f22c3580eb4055" +checksum = "19d42144433bf16b0f440d3a96151f1917817a027ae0feefed74ef2ec2a77abb" 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..bd35ca5 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.19" [dev-dependencies] rstest = "0.17" \ No newline at end of file