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

Split Lapack error into InvalidValue and ComputationalFailure

Author: termoshtt

lax/src/error.rs

@@ -4,18 +4,23 @@ pub type Result<T> = ::std::result::Result<T, Error>;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("LAPACK call failed with {return_code}")]
-    Lapack { return_code: i32 },
+    #[error("LAPACK call with invalid value {return_code}")]
+    LapackInvalidValue { return_code: i32 },
+
+    #[error("Computational failure in LAPACK routine: {return_code}")]
+    LapackComputationalFailure { return_code: i32 },
 
     /// Strides of the array is not supported
     #[error("Invalid shape")]
     InvalidShape,
 }
 
 pub fn into_result<T>(return_code: i32, val: T) -> Result<T> {
-    if return_code == 0 {
-        Ok(val)
-    } else {
-        Err(Error::Lapack { return_code })
+    if return_code > 0 {
+        return Err(Error::LapackComputationalFailure { return_code });
+    }
+    if return_code < 0 {
+        return Err(Error::LapackInvalidValue { return_code });
     }
+    Ok(val)
 }

ndarray-linalg/src/error.rs

@@ -13,8 +13,8 @@ pub enum LinalgError {
     NotSquare { rows: i32, cols: i32 },
 
     /// LAPACK subroutine returns non-zero code
-    #[error("LAPACK: return_code = {}", return_code)]
-    Lapack { return_code: i32 },
+    #[error(transparent)]
+    Lapack(#[from] lapack::error::Error),
 
     /// Strides of the array is not supported
     #[error("invalid stride: s0={}, s1={}", s0, s1)]

ndarray-linalg/src/solve.rs

@@ -476,7 +476,8 @@ where
         self.ensure_square()?;
         match self.factorize() {
             Ok(fac) => fac.sln_det(),
-            Err(LinalgError::Lapack { return_code }) if return_code > 0 => {
+            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::Lapack { return_code }) if return_code > 0 => {
+            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()?,
-            )
+            )?)
         }
     }
 }