Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
10 changes: 5 additions & 5 deletions downsample_rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
3 changes: 1 addition & 2 deletions downsample_rs/dev_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
5 changes: 2 additions & 3 deletions downsample_rs/dev_utils/src/utils.rs
Original file line number Diff line number Diff line change
@@ -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<T>(n: usize, min_value: T, max_value: T) -> Vec<T>
Expand All @@ -10,8 +10,7 @@ where
{
let rng = thread_rng();
let uni = Uniform::new_inclusive(min_value, max_value);
let arr: Vec<T> = 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
Expand Down
1 change: 0 additions & 1 deletion downsample_rs/src/m4.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use argminmax::{ArgMinMax, NaNArgMinMax};
use num_traits::{AsPrimitive, FromPrimitive};
use rayon::iter::IndexedParallelIterator;
use rayon::prelude::*;

use super::searchsorted::{
Expand Down
1 change: 0 additions & 1 deletion downsample_rs/src/minmax.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use rayon::iter::IndexedParallelIterator;
use rayon::prelude::*;

use argminmax::{ArgMinMax, NaNArgMinMax};
Expand Down
1 change: 0 additions & 1 deletion downsample_rs/src/searchsorted.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use rayon::iter::IndexedParallelIterator;
use rayon::prelude::*;

use super::types::Num;
Expand Down