extract using omat

2 files changed, 14 insertions, 33 deletions

diff --git a/packages/base/src/C/lapack-aux.c b/packages/base/src/C/lapack-aux.c
index ac03120..1402050 100644
--- a/packages/base/src/C/lapack-aux.c
+++ b/packages/base/src/C/lapack-aux.c
@@ -1621,12 +1621,7 @@ int chooseQ(KIVEC(cond),KQVEC(lt),KQVEC(eq),KQVEC(gt),QVEC(r)) {
 //////////////////////// extract /////////////////////////////////
 
 #define EXTRACT_IMP                        \
-    int i,j,si,sj,ni,nj,ai,aj;             \
-    if (tm==0) {                           \
-        ai=mc; aj=1;                       \
-    } else {                               \
-        ai=1, aj=mc;                       \
-    }                                      \
+    int i,j,si,sj,ni,nj;                   \
     ni = modei ? in : ip[1]-ip[0]+1;       \
     nj = modej ? jn : jp[1]-jp[0]+1;       \
                                            \
@@ -1636,28 +1631,28 @@ int chooseQ(KIVEC(cond),KQVEC(lt),KQVEC(eq),KQVEC(gt),QVEC(r)) {
         for (j=0; j<nj; j++) {             \
             sj = modej ? jp[j] : j+jp[0];  \
                                            \
-            rp[rc*i+j] = mp[ai*si+aj*sj];  \
+            AT(r,i,j) = AT(m,si,sj);       \
         }                                  \
     }                                      \
     OK
 
-int extractD(int modei, int modej, int tm, KIVEC(i), KIVEC(j), KDMAT(m), DMAT(r)) {
+int extractD(int modei, int modej, KIVEC(i), KIVEC(j), KODMAT(m), ODMAT(r)) {
     EXTRACT_IMP
 }
 
-int extractF(int modei, int modej, int tm, KIVEC(i), KIVEC(j), KFMAT(m), FMAT(r)) {
+int extractF(int modei, int modej, KIVEC(i), KIVEC(j), KOFMAT(m), OFMAT(r)) {
     EXTRACT_IMP
 }
 
-int extractC(int modei, int modej, int tm, KIVEC(i), KIVEC(j), KCMAT(m), CMAT(r)) {
+int extractC(int modei, int modej, KIVEC(i), KIVEC(j), KOCMAT(m), OCMAT(r)) {
     EXTRACT_IMP
 }
 
-int extractQ(int modei, int modej, int tm, KIVEC(i), KIVEC(j), KQMAT(m), QMAT(r)) {
+int extractQ(int modei, int modej, KIVEC(i), KIVEC(j), KOQMAT(m), OQMAT(r)) {
     EXTRACT_IMP
 }
 
-int extractI(int modei, int modej, int tm, KIVEC(i), KIVEC(j), KIMAT(m), IMAT(r)) {
+int extractI(int modei, int modej, KIVEC(i), KIVEC(j), KOIMAT(m), OIMAT(r)) {
     EXTRACT_IMP
 }
 
diff --git a/packages/base/src/Data/Packed/Internal/Matrix.hs b/packages/base/src/Data/Packed/Internal/Matrix.hs
index ddeddae..9f446b2 100644
--- a/packages/base/src/Data/Packed/Internal/Matrix.hs
+++ b/packages/base/src/Data/Packed/Internal/Matrix.hs
@@ -485,34 +485,20 @@ instance (Storable t, NFData t) => NFData (Matrix t)
 
 ---------------------------------------------------------------
 
-isT Matrix{order = ColumnMajor} = 1
-isT Matrix{order = RowMajor} = 0
-
-tt x@Matrix{order = ColumnMajor} = trans x
-tt x@Matrix{order = RowMajor} = x
-
-
 extractAux f m moder vr modec vc = unsafePerformIO $ do
     let nr = if moder == 0 then fromIntegral $ vr@>1 - vr@>0 + 1 else dim vr
         nc = if modec == 0 then fromIntegral $ vc@>1 - vc@>0 + 1 else dim vc
     r <- createMatrix RowMajor nr nc
-    app4 (f moder modec (isT m)) vec vr vec vc mat (tt m) mat r "extractAux"
+    app4 (f moder modec) vec vr vec vc omat m omat r "extractAux"
     return r
 
-foreign import ccall unsafe "extractD" c_extractD
-    :: CInt -> CInt -> CInt -> CIdxs (CIdxs (CM Double (CM Double (IO CInt))))
-
-foreign import ccall unsafe "extractF" c_extractF
-    :: CInt -> CInt -> CInt -> CIdxs (CIdxs (CM Float (CM Float (IO CInt))))
-
-foreign import ccall unsafe "extractC" c_extractC
-    :: CInt -> CInt -> CInt -> CIdxs (CIdxs (CM (Complex Double) (CM (Complex Double) (IO CInt))))
-
-foreign import ccall unsafe "extractQ" c_extractQ
-    :: CInt -> CInt -> CInt -> CIdxs (CIdxs (CM (Complex Float) (CM (Complex Float) (IO CInt))))
+type Extr x = CInt -> CInt -> CIdxs (CIdxs (OM x (OM x (IO CInt))))
 
-foreign import ccall unsafe "extractI" c_extractI
-    :: CInt -> CInt -> CInt -> CIdxs (CIdxs (CM CInt (CM CInt (IO CInt))))
+foreign import ccall unsafe "extractD" c_extractD :: Extr Double
+foreign import ccall unsafe "extractF" c_extractF :: Extr Float
+foreign import ccall unsafe "extractC" c_extractC :: Extr (Complex Double)
+foreign import ccall unsafe "extractQ" c_extractQ :: Extr (Complex Float)
+foreign import ccall unsafe "extractI" c_extractI :: Extr CInt
 
 --------------------------------------------------------------------------------