Skip to content

Uninitialize working memory #243

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 3 commits into from
Aug 2, 2020
Merged

Uninitialize working memory #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61692a7
vec_uninit
termoshtt Jul 31, 2020
11e7207
Rewrite using vec_uninit
termoshtt Aug 1, 2020
dc2ab7d
Merge branch 'master' into vec_uninit
termoshtt Aug 2, 2020
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
24 changes: 12 additions & 12 deletions lax/src/eig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Eigenvalue decomposition for general matrices

use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand Down Expand Up @@ -33,16 +33,16 @@ macro_rules! impl_eig_complex {
} else {
(b'N', b'N')
};
let mut eigs = vec![Self::Complex::zero(); n as usize];
let mut rwork = vec![Self::Real::zero(); 2 * n as usize];
let mut eigs = unsafe { vec_uninit(n as usize) };
let mut rwork = unsafe { vec_uninit(2 * n as usize) };

let mut vl = if jobvl == b'V' {
Some(vec![Self::Complex::zero(); (n * n) as usize])
Some(unsafe { vec_uninit((n * n) as usize) })
} else {
None
};
let mut vr = if jobvr == b'V' {
Some(vec![Self::Complex::zero(); (n * n) as usize])
Some(unsafe { vec_uninit((n * n) as usize) })
} else {
None
};
Expand Down Expand Up @@ -72,7 +72,7 @@ macro_rules! impl_eig_complex {

// actal ev
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$ev(
jobvl,
Expand Down Expand Up @@ -128,16 +128,16 @@ macro_rules! impl_eig_real {
} else {
(b'N', b'N')
};
let mut eig_re = vec![Self::zero(); n as usize];
let mut eig_im = vec![Self::zero(); n as usize];
let mut eig_re = unsafe { vec_uninit(n as usize) };
let mut eig_im = unsafe { vec_uninit(n as usize) };

let mut vl = if jobvl == b'V' {
Some(vec![Self::zero(); (n * n) as usize])
Some(unsafe { vec_uninit((n * n) as usize) })
} else {
None
};
let mut vr = if jobvr == b'V' {
Some(vec![Self::zero(); (n * n) as usize])
Some(unsafe { vec_uninit((n * n) as usize) })
} else {
None
};
Expand Down Expand Up @@ -167,7 +167,7 @@ macro_rules! impl_eig_real {

// actual ev
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$ev(
jobvl,
Expand Down Expand Up @@ -219,7 +219,7 @@ macro_rules! impl_eig_real {
// ```
let n = n as usize;
let v = vr.or(vl).unwrap();
let mut eigvecs = vec![Self::Complex::zero(); n * n];
let mut eigvecs = unsafe { vec_uninit(n * n) };
let mut is_conjugate_pair = false; // flag for check `j` is complex conjugate
for j in 0..n {
if eig_im[j] == 0.0 {
Expand Down
12 changes: 6 additions & 6 deletions lax/src/eigh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ macro_rules! impl_eigh {
assert_eq!(layout.len(), layout.lda());
let n = layout.len();
let jobz = if calc_v { b'V' } else { b'N' };
let mut eigs = vec![Self::Real::zero(); n as usize];
let mut eigs = unsafe { vec_uninit(n as usize) };

$(
let mut $rwork_ident = vec![Self::Real::zero(); 3 * n as usize - 2];
let mut $rwork_ident = unsafe { vec_uninit(3 * n as usize - 2 as usize) };
)*

// calc work size
Expand All @@ -69,7 +69,7 @@ macro_rules! impl_eigh {

// actual ev
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$ev(
jobz,
Expand Down Expand Up @@ -98,10 +98,10 @@ macro_rules! impl_eigh {
assert_eq!(layout.len(), layout.lda());
let n = layout.len();
let jobz = if calc_v { b'V' } else { b'N' };
let mut eigs = vec![Self::Real::zero(); n as usize];
let mut eigs = unsafe { vec_uninit(n as usize) };

$(
let mut $rwork_ident = vec![Self::Real::zero(); 3 * n as usize - 2];
let mut $rwork_ident = unsafe { vec_uninit(3 * n as usize - 2) };
)*

// calc work size
Expand All @@ -128,7 +128,7 @@ macro_rules! impl_eigh {

// actual evg
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$evg(
&[1],
Expand Down
14 changes: 7 additions & 7 deletions lax/src/least_squares.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Least squares

use crate::{error::*, layout::*};
use crate::{error::*, layout::*, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand Down Expand Up @@ -68,7 +68,7 @@ macro_rules! impl_least_squares {
let mut a_t = None;
let a_layout = match a_layout {
MatrixLayout::C { .. } => {
a_t = Some(vec![Self::zero(); a.len()]);
a_t = Some(unsafe { vec_uninit( a.len()) });
transpose(a_layout, a, a_t.as_mut().unwrap())
}
MatrixLayout::F { .. } => a_layout,
Expand All @@ -78,14 +78,14 @@ macro_rules! impl_least_squares {
let mut b_t = None;
let b_layout = match b_layout {
MatrixLayout::C { .. } => {
b_t = Some(vec![Self::zero(); b.len()]);
b_t = Some(unsafe { vec_uninit( b.len()) });
transpose(b_layout, b, b_t.as_mut().unwrap())
}
MatrixLayout::F { .. } => b_layout,
};

let rcond: Self::Real = -1.;
let mut singular_values: Vec<Self::Real> = vec![Self::Real::zero(); k as usize];
let mut singular_values: Vec<Self::Real> = unsafe { vec_uninit( k as usize) };
let mut rank: i32 = 0;

// eval work size
Expand Down Expand Up @@ -118,12 +118,12 @@ macro_rules! impl_least_squares {

// calc
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit( lwork) };
let liwork = iwork_size[0].to_usize().unwrap();
let mut iwork = vec![0; liwork];
let mut iwork = unsafe { vec_uninit( liwork) };
$(
let lrwork = $rwork[0].to_usize().unwrap();
let mut $rwork = vec![Self::Real::zero(); lrwork];
let mut $rwork = unsafe { vec_uninit( lrwork) };
)*
unsafe {
$gelsd(
Expand Down
12 changes: 12 additions & 0 deletions lax/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,15 @@ impl NormType {
}
}
}

/// Create a vector without initialization
///
/// Safety
/// ------
/// - Memory is not initialized. Do not read the memory before write.
///
unsafe fn vec_uninit<T: Sized>(n: usize) -> Vec<T> {
let mut v = Vec::with_capacity(n);
v.set_len(n);
v
}
5 changes: 2 additions & 3 deletions lax/src/opnorm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
//! Operator norms of matrices

use super::NormType;
use crate::layout::MatrixLayout;
use crate::{layout::MatrixLayout, *};
use cauchy::*;
use num_traits::Zero;

pub trait OperatorNorm_: Scalar {
fn opnorm(t: NormType, l: MatrixLayout, a: &[Self]) -> Self::Real;
Expand All @@ -20,7 +19,7 @@ macro_rules! impl_opnorm {
MatrixLayout::C { .. } => t.transpose(),
};
let mut work = if matches!(t, NormType::Infinity) {
vec![Self::Real::zero(); m as usize]
unsafe { vec_uninit(m as usize) }
} else {
Vec::new()
};
Expand Down
8 changes: 4 additions & 4 deletions lax/src/qr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! QR decomposition

use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand All @@ -25,7 +25,7 @@ macro_rules! impl_qr {
let m = l.lda();
let n = l.len();
let k = m.min(n);
let mut tau = vec![Self::zero(); k as usize];
let mut tau = unsafe { vec_uninit(k as usize) };

// eval work size
let mut info = 0;
Expand All @@ -44,7 +44,7 @@ macro_rules! impl_qr {

// calc
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
match l {
MatrixLayout::F { .. } => {
Expand Down Expand Up @@ -100,7 +100,7 @@ macro_rules! impl_qr {

// calc
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
match l {
MatrixLayout::F { .. } => {
Expand Down
11 changes: 5 additions & 6 deletions lax/src/rcond.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use super::*;
use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::Zero;

Expand All @@ -18,8 +17,8 @@ macro_rules! impl_rcond_real {
let mut rcond = Self::Real::zero();
let mut info = 0;

let mut work = vec![Self::zero(); 4 * n as usize];
let mut iwork = vec![0; n as usize];
let mut work = unsafe { vec_uninit(4 * n as usize) };
let mut iwork = unsafe { vec_uninit(n as usize) };
let norm_type = match l {
MatrixLayout::C { .. } => NormType::Infinity,
MatrixLayout::F { .. } => NormType::One,
Expand Down Expand Up @@ -55,8 +54,8 @@ macro_rules! impl_rcond_complex {
let (n, _) = l.size();
let mut rcond = Self::Real::zero();
let mut info = 0;
let mut work = vec![Self::zero(); 2 * n as usize];
let mut rwork = vec![Self::Real::zero(); 2 * n as usize];
let mut work = unsafe { vec_uninit(2 * n as usize) };
let mut rwork = unsafe { vec_uninit(2 * n as usize) };
let norm_type = match l {
MatrixLayout::C { .. } => NormType::Infinity,
MatrixLayout::F { .. } => NormType::One,
Expand Down
7 changes: 3 additions & 4 deletions lax/src/solve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Solve linear problem using LU decomposition

use super::*;
use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand Down Expand Up @@ -34,7 +33,7 @@ macro_rules! impl_solve {
return Ok(Vec::new());
}
let k = ::std::cmp::min(row, col);
let mut ipiv = vec![0; k as usize];
let mut ipiv = unsafe { vec_uninit(k as usize) };
let mut info = 0;
unsafe { $getrf(l.lda(), l.len(), a, l.lda(), &mut ipiv, &mut info) };
info.as_lapack_result()?;
Expand All @@ -52,7 +51,7 @@ macro_rules! impl_solve {

// actual
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$getri(
l.len(),
Expand Down
9 changes: 4 additions & 5 deletions lax/src/solveh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
//!
//! See also [the manual of dsytrf](http://www.netlib.org/lapack/lapack-3.1.1/html/dsytrf.f.html)

use super::*;
use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand All @@ -21,7 +20,7 @@ macro_rules! impl_solveh {
impl Solveh_ for $scalar {
fn bk(l: MatrixLayout, uplo: UPLO, a: &mut [Self]) -> Result<Pivot> {
let (n, _) = l.size();
let mut ipiv = vec![0; n as usize];
let mut ipiv = unsafe { vec_uninit(n as usize) };
if n == 0 {
return Ok(Vec::new());
}
Expand All @@ -45,7 +44,7 @@ macro_rules! impl_solveh {

// actual
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit(lwork) };
unsafe {
$trf(
uplo as u8,
Expand All @@ -65,7 +64,7 @@ macro_rules! impl_solveh {
fn invh(l: MatrixLayout, uplo: UPLO, a: &mut [Self], ipiv: &Pivot) -> Result<()> {
let (n, _) = l.size();
let mut info = 0;
let mut work = vec![Self::zero(); n as usize];
let mut work = unsafe { vec_uninit(n as usize) };
unsafe { $tri(uplo as u8, n, a, l.lda(), ipiv, &mut work, &mut info) };
info.as_lapack_result()?;
Ok(())
Expand Down
12 changes: 6 additions & 6 deletions lax/src/svd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Singular-value decomposition

use crate::{error::*, layout::MatrixLayout};
use crate::{error::*, layout::MatrixLayout, *};
use cauchy::*;
use num_traits::{ToPrimitive, Zero};

Expand Down Expand Up @@ -61,21 +61,21 @@ macro_rules! impl_svd {

let m = l.lda();
let mut u = match ju {
FlagSVD::All => Some(vec![Self::zero(); (m * m) as usize]),
FlagSVD::All => Some(unsafe { vec_uninit( (m * m) as usize) }),
FlagSVD::No => None,
};

let n = l.len();
let mut vt = match jvt {
FlagSVD::All => Some(vec![Self::zero(); (n * n) as usize]),
FlagSVD::All => Some(unsafe { vec_uninit( (n * n) as usize) }),
FlagSVD::No => None,
};

let k = std::cmp::min(m, n);
let mut s = vec![Self::Real::zero(); k as usize];
let mut s = unsafe { vec_uninit( k as usize) };

$(
let mut $rwork_ident = vec![Self::Real::zero(); 5 * k as usize];
let mut $rwork_ident = unsafe { vec_uninit( 5 * k as usize) };
)*

// eval work size
Expand Down Expand Up @@ -104,7 +104,7 @@ macro_rules! impl_svd {

// calc
let lwork = work_size[0].to_usize().unwrap();
let mut work = vec![Self::zero(); lwork];
let mut work = unsafe { vec_uninit( lwork) };
unsafe {
$gesvd(
ju as u8,
Expand Down
Loading