From abdb1192e191b22fabe7610de64298717f0373ec Mon Sep 17 00:00:00 2001 From: jvdd Date: Thu, 11 Apr 2024 10:32:38 +0200 Subject: [PATCH] chore: update dependencies --- Cargo.toml | 6 +++--- downsample_rs/Cargo.toml | 10 +++++----- downsample_rs/dev_utils/Cargo.toml | 3 +-- downsample_rs/dev_utils/src/utils.rs | 5 ++--- downsample_rs/src/m4.rs | 1 - downsample_rs/src/minmax.rs | 1 - downsample_rs/src/searchsorted.rs | 1 - 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 184e8c8..1192950 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,9 @@ license = "MIT" [dependencies] downsample_rs = { path = "downsample_rs", features = ["half"]} -pyo3 = { version = "0.20", features = ["extension-module"] } -numpy = { version = "0.20", features = ["half"] } -half = { version = "2.3.1", default-features = false } +pyo3 = { version = "0.21", features = ["extension-module"] } +numpy = { version = "0.21", features = ["half"] } +half = { version = "2.4", default-features = false } paste = { version = "1.0.14", default-features = false } [lib] diff --git a/downsample_rs/Cargo.toml b/downsample_rs/Cargo.toml index 107469b..e672fd5 100644 --- a/downsample_rs/Cargo.toml +++ b/downsample_rs/Cargo.toml @@ -8,14 +8,14 @@ license = "MIT" [dependencies] # TODO: perhaps use polars? -argminmax = { version = "0.6.1", features = ["half"] } -half = { version = "2.3.1", default-features = false , features=["num-traits"], optional = true} -num-traits = { version = "0.2.17", default-features = false } +argminmax = { version = "0.6.2", features = ["half"] } +half = { version = "2.4", default-features = false , features=["num-traits"], optional = true} +num-traits = { version = "0.2", default-features = false } once_cell = "1" -rayon = { version = "1.8.0", default-features = false } +rayon = { version = "1.10", default-features = false } [dev-dependencies] -rstest = { version = "0.18.2", default-features = false } +rstest = { version = "0.19", default-features = false } rstest_reuse = { version = "0.6", default-features = false } criterion = "0.5.1" dev_utils = { path = "dev_utils" } diff --git a/downsample_rs/dev_utils/Cargo.toml b/downsample_rs/dev_utils/Cargo.toml index 2ab2e6b..3325b0c 100644 --- a/downsample_rs/dev_utils/Cargo.toml +++ b/downsample_rs/dev_utils/Cargo.toml @@ -6,5 +6,4 @@ edition = "2021" description = "Shared utilities for development (tests & benchmarks)" [dependencies] -rand = { version = "0.7.2", default-features = false } -rand_distr = { version = "0.2.2", default-features = false } +rand = { version = "0.8.5" } diff --git a/downsample_rs/dev_utils/src/utils.rs b/downsample_rs/dev_utils/src/utils.rs index 975fa65..a96415e 100644 --- a/downsample_rs/dev_utils/src/utils.rs +++ b/downsample_rs/dev_utils/src/utils.rs @@ -1,7 +1,7 @@ use std::ops::{Add, Sub}; +use rand::distributions::Uniform; use rand::{thread_rng, Rng}; -use rand_distr::Uniform; // random array that samples between min and max of T pub fn get_random_array(n: usize, min_value: T, max_value: T) -> Vec @@ -10,8 +10,7 @@ where { let rng = thread_rng(); let uni = Uniform::new_inclusive(min_value, max_value); - let arr: Vec = rng.sample_iter(uni).take(n).collect(); - arr + rng.sample_iter(uni).take(n).collect() } // worst case array that alternates between increasing max and decreasing min values diff --git a/downsample_rs/src/m4.rs b/downsample_rs/src/m4.rs index 75ce224..527afe7 100644 --- a/downsample_rs/src/m4.rs +++ b/downsample_rs/src/m4.rs @@ -1,6 +1,5 @@ use argminmax::{ArgMinMax, NaNArgMinMax}; use num_traits::{AsPrimitive, FromPrimitive}; -use rayon::iter::IndexedParallelIterator; use rayon::prelude::*; use super::searchsorted::{ diff --git a/downsample_rs/src/minmax.rs b/downsample_rs/src/minmax.rs index 12553d2..1363c4f 100644 --- a/downsample_rs/src/minmax.rs +++ b/downsample_rs/src/minmax.rs @@ -1,4 +1,3 @@ -use rayon::iter::IndexedParallelIterator; use rayon::prelude::*; use argminmax::{ArgMinMax, NaNArgMinMax}; diff --git a/downsample_rs/src/searchsorted.rs b/downsample_rs/src/searchsorted.rs index c02a3e1..96522cd 100644 --- a/downsample_rs/src/searchsorted.rs +++ b/downsample_rs/src/searchsorted.rs @@ -1,4 +1,3 @@ -use rayon::iter::IndexedParallelIterator; use rayon::prelude::*; use super::types::Num;