Replace FlagSVD by UVTFlag

Author: termoshtt

lax/src/flags.rs

@@ -90,29 +90,6 @@ impl JobEv {
     }
 }
 
-#[repr(u8)]
-#[derive(Debug, Copy, Clone)]
-pub enum FlagSVD {
-    All = b'A',
-    // OverWrite = b'O',
-    // Separately = b'S',
-    No = b'N',
-}
-
-impl FlagSVD {
-    pub fn from_bool(calc_uv: bool) -> Self {
-        if calc_uv {
-            FlagSVD::All
-        } else {
-            FlagSVD::No
-        }
-    }
-
-    pub fn as_ptr(&self) -> *const i8 {
-        self as *const FlagSVD as *const i8
-    }
-}
-
 /// Specifies how many of the columns of *U* and rows of *V*ᵀ are computed and returned.
 ///
 /// For an input array of shape *m*×*n*, the following are computed:
@@ -128,6 +105,14 @@ pub enum UVTFlag {
 }
 
 impl UVTFlag {
+    pub fn from_bool(calc_uv: bool) -> Self {
+        if calc_uv {
+            UVTFlag::Full
+        } else {
+            UVTFlag::None
+        }
+    }
+
     pub fn as_ptr(&self) -> *const i8 {
         self as *const UVTFlag as *const i8
     }

lax/src/svd.rs

@@ -32,24 +32,26 @@ macro_rules! impl_svd {
         impl SVD_ for $scalar {
             fn svd(l: MatrixLayout, calc_u: bool, calc_vt: bool, a: &mut [Self],) -> Result<SVDOutput<Self>> {
                 let ju = match l {
-                    MatrixLayout::F { .. } => FlagSVD::from_bool(calc_u),
-                    MatrixLayout::C { .. } => FlagSVD::from_bool(calc_vt),
+                    MatrixLayout::F { .. } => UVTFlag::from_bool(calc_u),
+                    MatrixLayout::C { .. } => UVTFlag::from_bool(calc_vt),
                 };
                 let jvt = match l {
-                    MatrixLayout::F { .. } => FlagSVD::from_bool(calc_vt),
-                    MatrixLayout::C { .. } => FlagSVD::from_bool(calc_u),
+                    MatrixLayout::F { .. } => UVTFlag::from_bool(calc_vt),
+                    MatrixLayout::C { .. } => UVTFlag::from_bool(calc_u),
                 };
 
                 let m = l.lda();
                 let mut u = match ju {
-                    FlagSVD::All => Some(unsafe { vec_uninit( (m * m) as usize) }),
-                    FlagSVD::No => None,
+                    UVTFlag::Full => Some(unsafe { vec_uninit( (m * m) as usize) }),
+                    UVTFlag::None => None,
+                    _ => unimplemented!("SVD with partial vector output is not supported yet")
                 };
 
                 let n = l.len();
                 let mut vt = match jvt {
-                    FlagSVD::All => Some(unsafe { vec_uninit( (n * n) as usize) }),
-                    FlagSVD::No => None,
+                    UVTFlag::Full => Some(unsafe { vec_uninit( (n * n) as usize) }),
+                    UVTFlag::None => None,
+                    _ => unimplemented!("SVD with partial vector output is not supported yet")
                 };
 
                 let k = std::cmp::min(m, n);