Commit ad19250

authored

Merge pull request #348 from rust-ndarray/lax-trianglar

Merge `Triangular_` into `Lapack`

2 parents 120fb07 + 27c7fa1 commit ad19250Copy full SHA for ad19250

File tree

2 files changed

+40

-12

lines changed

lax/src
- lib.rs
- triangular.rs

2 files changed

+40

-12

lines changed

`‎lax/src/lib.rs‎`

Lines changed: 23 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,17 +100,16 @@ pub mod solve;`
`100`	`100`	`pub mod solveh;`
`101`	`101`	`pub mod svd;`
`102`	`102`	`pub mod svddc;`
	`103`	`+pub mod triangular;`
`103`	`104`
`104`	`105`	`mod alloc;`
`105`		`-mod triangular;`
`106`	`106`	`mod tridiagonal;`
`107`	`107`
`108`	`108`	`pub use self::cholesky::*;`
`109`	`109`	`pub use self::flags::*;`
`110`	`110`	`pub use self::least_squares::LeastSquaresOwned;`
`111`	`111`	`pub use self::opnorm::*;`
`112`	`112`	`pub use self::svd::{SvdOwned, SvdRef};`
`113`		`-pub use self::triangular::*;`
`114`	`113`	`pub use self::tridiagonal::*;`
`115`	`114`
`116`	`115`	`use self::{alloc::, error::, layout::*};`
`@@ -121,7 +120,7 @@ pub type Pivot = Vec<i32>;`
`121`	`120`
`122`	`121`	`#[cfg_attr(doc, katexit::katexit)]`
`123`	`122`	`/// Trait for primitive types which implements LAPACK subroutines`
`124`		`-pub trait Lapack: Triangular_ + Tridiagonal_ {`
	`123`	`+pub trait Lapack: Tridiagonal_ {`
`125`	`124`	`/// Compute right eigenvalue and eigenvectors for a general matrix`
`126`	`125`	`fn eig(`
`127`	`126`	`calc_v: bool,`
`@@ -298,6 +297,15 @@ pub trait Lapack: Triangular_ + Tridiagonal_ {`
`298`	`297`	`/// $$`
`299`	`298`	`///`
`300`	`299`	`fn opnorm(t: NormType, l: MatrixLayout, a: &[Self]) -> Self::Real;`
	`300`	`+`
	`301`	`+ fn solve_triangular(`
	`302`	`+ al: MatrixLayout,`
	`303`	`+ bl: MatrixLayout,`
	`304`	`+ uplo: UPLO,`
	`305`	`+ d: Diag,`
	`306`	`+ a: &[Self],`
	`307`	`+ b: &mut [Self],`
	`308`	`+ ) -> Result<()>;`
`301`	`309`	`}`
`302`	`310`
`303`	`311`	`macro_rules! impl_lapack {`
`@@ -471,6 +479,18 @@ macro_rules! impl_lapack {`
`471`	`479`	`let mut work = OperatorNormWork::<$s>::new(t, l);`
`472`	`480`	`work.calc(a)`
`473`	`481`	`}`
	`482`	`+`
	`483`	`+ fn solve_triangular(`
	`484`	`+ al: MatrixLayout,`
	`485`	`+ bl: MatrixLayout,`
	`486`	`+ uplo: UPLO,`
	`487`	`+ d: Diag,`
	`488`	`+ a: &[Self],`
	`489`	`+ b: &mut [Self],`
	`490`	`+ ) -> Result<()> {`
	`491`	`+ use triangular::*;`
	`492`	`+ SolveTriangularImpl::solve_triangular(al, bl, uplo, d, a, b)`
	`493`	`+ }`
`474`	`494`	`}`
`475`	`495`	`};`
`476`	`496`	`}`

`‎lax/src/triangular.rs‎`

Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,18 @@`
`1`		`-//! Implement linear solver and inverse matrix`
	`1`	`+//! Linear problem for triangular matrices`
`2`	`2`
`3`	`3`	`use crate::{error::, layout::, *};`
`4`	`4`	`use cauchy::*;`
`5`	`5`
`6`		-/// Wraps `trtri` and `trtrs`
`7`		`-pub trait Triangular_: Scalar {`
	`6`	`+/// Solve linear problem for triangular matrices`
	`7`	`+///`
	`8`	`+/// LAPACK correspondance`
	`9`	`+/// ----------------------`
	`10`	`+///`
	`11`	`+/// \| f32 \| f64 \| c32 \| c64 \|`
	`12`	`+/// \|:-------\|:-------\|:-------\|:-------\|`
	`13`	`+/// \| strtrs \| dtrtrs \| ctrtrs \| ztrtrs \|`
	`14`	`+///`
	`15`	`+pub trait SolveTriangularImpl: Scalar {`
`8`	`16`	`fn solve_triangular(`
`9`	`17`	`al: MatrixLayout,`
`10`	`18`	`bl: MatrixLayout,`
`@@ -16,8 +24,8 @@ pub trait Triangular_: Scalar {`
`16`	`24`	`}`
`17`	`25`
`18`	`26`	`macro_rules! impl_triangular {`
`19`		`- ($scalar:ty, $trtri:path, $trtrs:path) => {`
`20`		`- impl Triangular_ for $scalar {`
	`27`	`+ ($scalar:ty, $trtrs:path) => {`
	`28`	`+ impl SolveTriangularImpl for $scalar {`
`21`	`29`	`fn solve_triangular(`
`22`	`30`	`a_layout: MatrixLayout,`
`23`	`31`	`b_layout: MatrixLayout,`
`@@ -79,7 +87,7 @@ macro_rules! impl_triangular {`
`79`	`87`	`};`
`80`	`88`	`} // impl_triangular!`
`81`	`89`
`82`		`-impl_triangular!(f64, lapack_sys::dtrtri_, lapack_sys::dtrtrs_);`
`83`		`-impl_triangular!(f32, lapack_sys::strtri_, lapack_sys::strtrs_);`
`84`		`-impl_triangular!(c64, lapack_sys::ztrtri_, lapack_sys::ztrtrs_);`
`85`		`-impl_triangular!(c32, lapack_sys::ctrtri_, lapack_sys::ctrtrs_);`
	`90`	`+impl_triangular!(f64, lapack_sys::dtrtrs_);`
	`91`	`+impl_triangular!(f32, lapack_sys::strtrs_);`
	`92`	`+impl_triangular!(c64, lapack_sys::ztrtrs_);`
	`93`	`+impl_triangular!(c32, lapack_sys::ctrtrs_);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ad19250

File tree

2 files changed

2 files changed

`‎lax/src/lib.rs‎`

`‎lax/src/triangular.rs‎`

0 commit comments