Skip to content

Fix infinite recursion and off-by-one error in triu/tril #1418

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
akern40 merged 6 commits into from
Aug 11, 2024
Merged

Fix infinite recursion and off-by-one error in triu/tril #1418

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72ad534
Fixes infinite recursion and off-by-one error
akern40 Aug 7, 2024
4dbbca1
Avoids overflow using saturating arithmetic
akern40 Aug 7, 2024
1b29d17
Removes unused import
akern40 Aug 7, 2024
44d6bb1
Fixes bug for isize::MAX for triu
akern40 Aug 7, 2024
9e1491f
Fix formatting
akern40 Aug 8, 2024
5e5f551
Uses broadcast indices to remove D::Smaller: Copy trait bound
akern40 Aug 8, 2024
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
Uses broadcast indices to remove D::Smaller: Copy trait bound
  • Loading branch information
@akern40 @bluss
akern40 authored and bluss committed Aug 9, 2024
commit 5e5f551b04ca8443e9e9dfd248f4fbc353b22cd9
19 changes: 11 additions & 8 deletions src/tri.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use crate::{
Axis,
Data,
Dimension,
IntoDimension,
Zip,
};

Expand All @@ -26,7 +25,6 @@ where
S: Data<Elem = A>,
D: Dimension,
A: Clone + Zero,
D::Smaller: Copy,
{
/// Upper triangular of an array.
///
Expand Down Expand Up @@ -74,10 +72,12 @@ where

let mut res = Array::zeros(self.raw_dim());
let ncols = self.len_of(Axis(n - 1));
Zip::indexed(self.rows())
let nrows = self.len_of(Axis(n - 2));
let indices = Array::from_iter(0..nrows);
Zip::from(self.rows())
.and(res.rows_mut())
.for_each(|i, src, mut dst| {
let row_num = i.into_dimension().last_elem();
.and_broadcast(&indices)
.for_each(|src, mut dst, row_num| {
let mut lower = match k >= 0 {
true => row_num.saturating_add(k as usize), // Avoid overflow
false => row_num.saturating_sub(k.unsigned_abs()), // Avoid underflow, go to 0
Expand Down Expand Up @@ -135,10 +135,13 @@ where

let mut res = Array::zeros(self.raw_dim());
let ncols = self.len_of(Axis(n - 1));
Zip::indexed(self.rows())
let nrows = self.len_of(Axis(n - 2));
let indices = Array::from_iter(0..nrows);
Zip::from(self.rows())
.and(res.rows_mut())
.for_each(|i, src, mut dst| {
let row_num = i.into_dimension().last_elem();
.and_broadcast(&indices)
.for_each(|src, mut dst, row_num| {
// let row_num = i.into_dimension().last_elem();
let mut upper = match k >= 0 {
true => row_num.saturating_add(k as usize).saturating_add(1), // Avoid overflow
false => row_num.saturating_sub((k + 1).unsigned_abs()), // Avoid underflow
Expand Down