diff --git a/.github/workflows/beta-and-nightly.yml b/.github/workflows/beta-and-nightly.yml index 16a0a5d9c3..83666b61d9 100644 --- a/.github/workflows/beta-and-nightly.yml +++ b/.github/workflows/beta-and-nightly.yml @@ -97,7 +97,7 @@ jobs: run: rustup update - name: Install cargo-deny run: | - curl -L https://github.com/EmbarkStudios/cargo-deny/releases/download/0.14.19/cargo-deny-0.14.19-x86_64-unknown-linux-musl.tar.gz \ - | tar -zx --strip-components=1 "cargo-deny-0.14.19-x86_64-unknown-linux-musl/cargo-deny" + curl -L https://github.com/EmbarkStudios/cargo-deny/releases/download/0.14.24/cargo-deny-0.14.24-x86_64-unknown-linux-musl.tar.gz \ + | tar -zx --strip-components=1 "cargo-deny-0.14.24-x86_64-unknown-linux-musl/cargo-deny" - name: Run cargo-deny run: .travis/cargo-deny-check.sh diff --git a/Cargo.toml b/Cargo.toml index 127f0593aa..e4811582f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,6 @@ anstyle-query = "1.0.0" anstyle = "1.0.2" anyhow = "1.0.43" approx = "0.5" -atty = "0.2.14" bit-set= "0.5.2" blis-src = { version = "0.2", features = ["static", "pthreads"] } boow = "0.1.3" @@ -71,7 +70,7 @@ cblas = "0.4" cc = "1.0.69" clap = { version = "~3.1", features = [ "cargo" ] } colorous = "1.0.5" -criterion = "0.4" +criterion = "0.5.1" derive-new = "0.5.9" dinghy-test = "0.6" downcast-rs = "1.2.0" @@ -87,7 +86,7 @@ half = { version="2.4", features = [ "std", "num-traits" ] } image = "0.24.1" itertools = "0.12.1" home = "0.5.5" -lazy_static = "1.4.0" +lazy_static = "1.5.0" liquid = "0.26" liquid-core = "0.26" log = "0.4.14" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bde58c246c..2ea012077f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -15,7 +15,6 @@ include = [ "Cargo.toml", "src/**/*.rs", "LICENSE*" ] maintenance = { status = "actively-developed" } [dependencies] -atty.workspace = true box_drawing.workspace = true clap.workspace = true criterion.workspace = true diff --git a/core/Cargo.toml b/core/Cargo.toml index 0ab6545888..d007b8bd1f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -57,6 +57,6 @@ proptest.workspace = true [target.'cfg(target_family = "wasm")'.dev-dependencies] # Wasm doesn't support the `rayon` feature of criterion -criterion = { version = "0.4", default-features = false, features = ["plotters", "cargo_bench_support"] } +criterion = { version = "0.5", default-features = false, features = ["plotters", "cargo_bench_support"] } # Wasm doesn't support the `fork` feature of proptest. proptest = { version = "1.0.0", default-features = false, features = ["std", "bit-set"] } diff --git a/core/src/ops/change_axes.rs b/core/src/ops/change_axes.rs index d390a7933e..6a91225b2c 100644 --- a/core/src/ops/change_axes.rs +++ b/core/src/ops/change_axes.rs @@ -526,7 +526,7 @@ pub fn wire_with_rank_broadcast( ) -> TractResult> { let prefix = prefix.as_ref(); let wires = wire_rank_broadcast(prefix, target, inputs)?; - target.wire_node(prefix, &op.into(), &wires) + target.wire_node(prefix, op.into(), &wires) } #[derive(Clone, Debug, PartialEq, Eq, Hash)] diff --git a/data/Cargo.toml b/data/Cargo.toml index 14faec0328..8d5cfdd37b 100644 --- a/data/Cargo.toml +++ b/data/Cargo.toml @@ -38,7 +38,7 @@ proptest.workspace = true [target.'cfg(target_family = "wasm")'.dev-dependencies] # Wasm doesn't support the `rayon` feature of criterion -criterion = { version = "0.4", default-features = false, features = ["plotters", "cargo_bench_support"] } +criterion = { version = "0.5", default-features = false, features = ["plotters", "cargo_bench_support"] } # Wasm doesn't support the `fork` feature of proptest. proptest = { version = "1.0.0", default-features = false, features = ["std", "bit-set"] } diff --git a/data/src/dim/sym.rs b/data/src/dim/sym.rs index 5e9195fb5f..52c22ecd1d 100644 --- a/data/src/dim/sym.rs +++ b/data/src/dim/sym.rs @@ -74,6 +74,7 @@ impl SymbolScope { Ok(()) } + #[allow(clippy::mutable_key_type)] pub fn prove_positive(&self, t: &TDim) -> bool { if let TDim::Val(v) = t { return *v >= 0; diff --git a/data/src/dim/tree.rs b/data/src/dim/tree.rs index d6021a8e4a..d3d16e1535 100644 --- a/data/src/dim/tree.rs +++ b/data/src/dim/tree.rs @@ -530,7 +530,6 @@ impl TDim { pub fn gcd(&self) -> u64 { use self::TDim::*; - use num_integer::Integer; match self { Val(v) => v.unsigned_abs(), Sym(_) => 1, @@ -555,7 +554,6 @@ impl TDim { fn div(&self, d: u64) -> TDim { use self::TDim::*; - use num_integer::Integer; if d == 1 { return self.clone(); } @@ -638,7 +636,6 @@ impl TDim { } pub(super) fn reduce_ratio(mut p: i64, mut q: i64) -> (i64, u64) { - use num_integer::Integer; let gcd = p.abs().gcd(&q.abs()); if gcd > 1 { p /= gcd; diff --git a/deny.toml b/deny.toml index 7c9d1a353a..aa7ed169cc 100644 --- a/deny.toml +++ b/deny.toml @@ -18,12 +18,9 @@ targets = [ ] [advisories] -version = 2 git-fetch-with-cli = true yanked = "deny" ignore = [ - "RUSTSEC-2021-0145", # in atty, only impacts benches (through criterion) or pytorch example - "RUSTSEC-2023-0080", # transpose has an unsafe method, but rustfst uses it a safe predictable manner ] [bans] @@ -35,7 +32,7 @@ deny = [ # Skip some multiple-versions checks, until they can be fixed. skip = [ - { name = "itertools", version="<0.12.1" }, + { name = "itertools", version="<=0.12.1" }, { name = "regex-syntax", version="<8" }, { name = "syn", version="<2" }, ] diff --git a/examples/pytorch-albert-v2/Cargo.toml b/examples/pytorch-albert-v2/Cargo.toml index 406e565b16..c75735fcb8 100644 --- a/examples/pytorch-albert-v2/Cargo.toml +++ b/examples/pytorch-albert-v2/Cargo.toml @@ -12,5 +12,5 @@ anstyle-query.workspace = true ndarray.workspace = true tokenizers.workspace = true clap_builder = { version = "4.4" } -clap_lex = { version = "0.6" } +clap_lex = { version = "0.7" } tract-onnx = { path = "../../onnx", version = "=0.21.7-pre" } diff --git a/examples/pytorch-resnet/requirements.txt b/examples/pytorch-resnet/requirements.txt index 257c3b79af..284ad3b15b 100644 --- a/examples/pytorch-resnet/requirements.txt +++ b/examples/pytorch-resnet/requirements.txt @@ -1,2 +1,2 @@ -torch==1.13.1 +torch==2.2 torchvision==0.4.2 diff --git a/linalg/Cargo.toml b/linalg/Cargo.toml index defed88346..7663469b86 100644 --- a/linalg/Cargo.toml +++ b/linalg/Cargo.toml @@ -48,7 +48,7 @@ proptest.workspace = true [target.'cfg(target_family = "wasm")'.dev-dependencies] # Wasm doesn't support the `rayon` feature of criterion -criterion = { version = "0.4", default-features = false, features = ["plotters", "cargo_bench_support"] } +criterion = { version = "0.5", default-features = false, features = ["plotters", "cargo_bench_support"] } # Wasm doesn't support the `fork` feature of proptest. proptest = { version = "1.0.0", default-features = false, features = ["std", "bit-set"] } diff --git a/linalg/src/lib.rs b/linalg/src/lib.rs index 1e6652cd13..46a0e3e74d 100644 --- a/linalg/src/lib.rs +++ b/linalg/src/lib.rs @@ -4,6 +4,7 @@ #![allow(clippy::excessive_precision)] #![allow(clippy::approx_constant)] #![allow(unexpected_cfgs)] +#![allow(unused_macros)] #[macro_use] extern crate derive_new; extern crate lazy_static;