Replace LinalgError::Lapack by lax::error::Error

Split Lapack error into InvalidValue and ComputationalFailure

Author: termoshtt

ndarray-linalg/src/error.rs

@@ -12,17 +12,9 @@ pub enum LinalgError {
     #[error("Not square: rows({}) != cols({})", rows, cols)]
     NotSquare { rows: i32, cols: i32 },
 
-    #[error(
-        "Invalid value for LAPACK subroutine {}-th argument",
-        -return_code
-    )]
-    LapackInvalidValue { return_code: i32 },
-
-    #[error(
-        "Comutational failure in LAPACK subroutine: return_code = {}",
-        return_code
-    )]
-    LapackComputationalFailure { return_code: i32 },
+    /// LAPACK subroutine returns non-zero code
+    #[error(transparent)]
+    Lapack(#[from] lapack::error::Error),
 
     /// Strides of the array is not supported
     #[error("invalid stride: s0={}, s1={}", s0, s1)]

ndarray-linalg/src/lobpcg/lobpcg.rs

@@ -337,7 +337,9 @@ pub fn lobpcg<
         // if this fails (or the algorithm was restarted), then just use span{R, X}
         let result = p_ap
             .as_ref()
-            .ok_or(LinalgError::LapackComputationalFailure { return_code: 1 })
+            .ok_or(LinalgError::Lapack(
+                lapack::error::Error::LapackComputationalFailure { return_code: 1 },
+            ))
             .and_then(|(active_p, active_ap)| {
                 let xap = x.t().dot(active_ap);
                 let rap = r.t().dot(active_ap);

ndarray-linalg/src/solve.rs

@@ -476,7 +476,8 @@ where
         self.ensure_square()?;
         match self.factorize() {
             Ok(fac) => fac.sln_det(),
-            Err(LinalgError::LapackComputationalFailure { .. }) => {
+            Err(LinalgError::Lapack(e)) if matches!(e, lapack::error::Error::LapackComputationalFailure {..}) =>
+            {
                 // The determinant is zero.
                 Ok((A::zero(), A::Real::neg_infinity()))
             }
@@ -494,7 +495,8 @@ where
         self.ensure_square()?;
         match self.factorize_into() {
             Ok(fac) => fac.sln_det_into(),
-            Err(LinalgError::LapackComputationalFailure { .. }) => {
+            Err(LinalgError::Lapack(e)) if matches!(e, lapack::error::Error::LapackComputationalFailure { .. }) =>
+            {
                 // The determinant is zero.
                 Ok((A::zero(), A::Real::neg_infinity()))
             }
@@ -538,11 +540,11 @@ where
 {
     fn rcond(&self) -> Result<A::Real> {
         unsafe {
-            A::rcond(
+            Ok(A::rcond(
                 self.a.layout()?,
                 self.a.as_allocated()?,
                 self.a.opnorm_one()?,
-            )
+            )?)
         }
     }
 }

ndarray-linalg/src/solveh.rs

@@ -423,7 +423,8 @@ where
     fn sln_deth(&self) -> Result<(A::Real, A::Real)> {
         match self.factorizeh() {
             Ok(fac) => Ok(fac.sln_deth()),
-            Err(LinalgError::LapackComputationalFailure { .. }) => {
+            Err(LinalgError::Lapack(e)) if matches!(e, lapack::error::Error::LapackComputationalFailure {..}) =>
+            {
                 // Determinant is zero.
                 Ok((A::Real::zero(), A::Real::neg_infinity()))
             }
@@ -447,7 +448,8 @@ where
     fn sln_deth_into(self) -> Result<(A::Real, A::Real)> {
         match self.factorizeh_into() {
             Ok(fac) => Ok(fac.sln_deth_into()),
-            Err(LinalgError::LapackComputationalFailure { .. }) => {
+            Err(LinalgError::Lapack(e)) if matches!(e, lapack::error::Error::LapackComputationalFailure {..}) =>
+            {
                 // Determinant is zero.
                 Ok((A::Real::zero(), A::Real::neg_infinity()))
             }