Use new transpose and transpose_over

rust-ndarray · Sep 1, 2022 · 0669391 · 0669391
1 parent 152e3d5
commit 0669391
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/lax/src/least_squares.rs b/lax/src/least_squares.rs
@@ -68,8 +68,9 @@ macro_rules! impl_least_squares {
                 let mut a_t = None;
                 let a_layout = match a_layout {
                     MatrixLayout::C { .. } => {
-                        a_t = Some(unsafe { vec_uninit( a.len()) });
-                        transpose(a_layout, a, a_t.as_mut().unwrap())
+                        let (layout, t) = transpose(a_layout, a);
+                        a_t = Some(t);
+                        layout
                     }
                     MatrixLayout::F { .. } => a_layout,
                 };
@@ -78,8 +79,9 @@ macro_rules! impl_least_squares {
                 let mut b_t = None;
                 let b_layout = match b_layout {
                     MatrixLayout::C { .. } => {
-                        b_t = Some(unsafe { vec_uninit( b.len()) });
-                        transpose(b_layout, b, b_t.as_mut().unwrap())
+                        let (layout, t) = transpose(b_layout, b);
+                        b_t = Some(t);
+                        layout
                     }
                     MatrixLayout::F { .. } => b_layout,
                 };
@@ -149,7 +151,7 @@ macro_rules! impl_least_squares {
                 // Skip a_t -> a transpose because A has been destroyed
                 // Re-transpose b
                 if let Some(b_t) = b_t {
-                    transpose(b_layout, &b_t, b);
+                    transpose_over(b_layout, &b_t, b);
                 }
 
                 Ok(LeastSquaresOutput {

diff --git a/lax/src/triangular.rs b/lax/src/triangular.rs
@@ -43,8 +43,9 @@ macro_rules! impl_triangular {
                 let mut a_t = None;
                 let a_layout = match a_layout {
                     MatrixLayout::C { .. } => {
-                        a_t = Some(unsafe { vec_uninit(a.len()) });
-                        transpose(a_layout, a, a_t.as_mut().unwrap())
+                        let (layout, t) = transpose(a_layout, a);
+                        a_t = Some(t);
+                        layout
                     }
                     MatrixLayout::F { .. } => a_layout,
                 };
@@ -53,8 +54,9 @@ macro_rules! impl_triangular {
                 let mut b_t = None;
                 let b_layout = match b_layout {
                     MatrixLayout::C { .. } => {
-                        b_t = Some(unsafe { vec_uninit(b.len()) });
-                        transpose(b_layout, b, b_t.as_mut().unwrap())
+                        let (layout, t) = transpose(b_layout, b);
+                        b_t = Some(t);
+                        layout
                     }
                     MatrixLayout::F { .. } => b_layout,
                 };
@@ -82,7 +84,7 @@ macro_rules! impl_triangular {
 
                 // Re-transpose b
                 if let Some(b_t) = b_t {
-                    transpose(b_layout, &b_t, b);
+                    transpose_over(b_layout, &b_t, b);
                 }
                 Ok(())
             }

diff --git a/lax/src/tridiagonal.rs b/lax/src/tridiagonal.rs
@@ -218,8 +218,9 @@ macro_rules! impl_tridiagonal {
                 let mut b_t = None;
                 let b_layout = match b_layout {
                     MatrixLayout::C { .. } => {
-                        b_t = Some(unsafe { vec_uninit( b.len()) });
-                        transpose(b_layout, b, b_t.as_mut().unwrap())
+                        let (layout, t) = transpose(b_layout, b);
+                        b_t = Some(t);
+                        layout
                     }
                     MatrixLayout::F { .. } => b_layout,
                 };
@@ -242,7 +243,7 @@ macro_rules! impl_tridiagonal {
                 }
                 info.as_lapack_result()?;
                 if let Some(b_t) = b_t {
-                    transpose(b_layout, &b_t, b);
+                    transpose_over(b_layout, &b_t, b);
                 }
                 Ok(())
             }