Skip to content

Added stride support to Windows #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 11, 2023
Merged

Added stride support to Windows #1249

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c0ae32
added stride support to windows
LazaroHurtado Dec 29, 2022
61d55cd
updated Window::new to use new_with_stride with unit stride
LazaroHurtado Jun 8, 2023
0449bae
formatted test file
LazaroHurtado Jun 9, 2023
c357f0d
updated windows method doc description to reference windows_with_stride
LazaroHurtado Jun 10, 2023
1b00771
refactored unit stride logic
LazaroHurtado Jun 10, 2023
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
Prev Previous commit
Next Next commit
formatted test file
  • Loading branch information
@LazaroHurtado
LazaroHurtado committed Jun 9, 2023
commit 0449baee6d1a989e12065198e8d7dc27bf3a9b66
10 changes: 5 additions & 5 deletions tests/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fn windows_iterator_3d() {
#[should_panic]
fn windows_iterator_stride_axis_zero() {
let a = Array::from_iter(10..37).into_shape((3, 3, 3)).unwrap();
a.windows_with_stride(Dim((2, 2, 2)), Dim((0,2,2)));
a.windows_with_stride((2, 2, 2), (0, 2, 2));
}

/// Test that verifies that only first window is yielded when stride is oversized on every axis.
Expand All @@ -110,7 +110,7 @@ fn windows_iterator_only_one_valid_window_for_oversized_stride() {
let mut iter = a.windows_with_stride((2, 2, 2), (8, 8, 8)).into_iter(); // (4,3,2) doesn't fit into (3,3,3) => oversized!
itertools::assert_equal(
iter.next(),
Some(arr3(&[[[10, 11], [15, 16]],[[35, 36], [40, 41]]]))
Some(arr3(&[[[10, 11], [15, 16]], [[35, 36], [40, 41]]])),
);
}

Expand All @@ -119,7 +119,7 @@ fn windows_iterator_only_one_valid_window_for_oversized_stride() {
fn windows_iterator_1d_with_stride() {
let a = Array::from_iter(10..20).into_shape(10).unwrap();
itertools::assert_equal(
a.windows_with_stride(Dim(4), Dim(2)),
a.windows_with_stride(4, 2),
vec![
arr1(&[10, 11, 12, 13]),
arr1(&[12, 13, 14, 15]),
Expand All @@ -134,7 +134,7 @@ fn windows_iterator_1d_with_stride() {
fn windows_iterator_2d_with_stride() {
let a = Array::from_iter(10..30).into_shape((5, 4)).unwrap();
itertools::assert_equal(
a.windows_with_stride(Dim((3, 2)), Dim((2,1))),
a.windows_with_stride((3, 2), (2, 1)),
vec![
arr2(&[[10, 11], [14, 15], [18, 19]]),
arr2(&[[11, 12], [15, 16], [19, 20]]),
Expand All @@ -151,7 +151,7 @@ fn windows_iterator_2d_with_stride() {
fn windows_iterator_3d_with_stride() {
let a = Array::from_iter(10..74).into_shape((4, 4, 4)).unwrap();
itertools::assert_equal(
a.windows_with_stride(Dim((2, 2, 2)), Dim((2,2,2))),
a.windows_with_stride((2, 2, 2), (2, 2, 2)),
vec![
arr3(&[[[10, 11], [14, 15]], [[26, 27], [30, 31]]]),
arr3(&[[[12, 13], [16, 17]], [[28, 29], [32, 33]]]),
Expand Down