Removed the Element class.tower

1 files changed, 11 insertions, 8 deletions

diff --git a/packages/base/src/Internal/LAPACK.hs b/packages/base/src/Internal/LAPACK.hs
index 27d1f95..d88ff6b 100644
--- a/packages/base/src/Internal/LAPACK.hs
+++ b/packages/base/src/Internal/LAPACK.hs
@@ -22,9 +22,12 @@ import Data.Bifunctor (first)
 
 import Internal.Devel
 import Internal.Vector
+import Internal.Vectorized (constantAux)
 import Internal.Matrix hiding ((#), (#!))
 import Internal.Conversion
 import Internal.Element
+import Internal.ST (setRect)
+import Data.Int
 import Foreign.Ptr(nullPtr)
 import Foreign.C.Types
 import Control.Monad(when)
@@ -46,10 +49,10 @@ type TMMM t = t ::> t ::> t ::> Ok
 type F = Float
 type Q = Complex Float
 
-foreign import ccall unsafe "multiplyR" dgemmc :: CInt -> CInt -> TMMM R
-foreign import ccall unsafe "multiplyC" zgemmc :: CInt -> CInt -> TMMM C
-foreign import ccall unsafe "multiplyF" sgemmc :: CInt -> CInt -> TMMM F
-foreign import ccall unsafe "multiplyQ" cgemmc :: CInt -> CInt -> TMMM Q
+foreign import ccall unsafe "multiplyR" dgemmc :: Int32 -> Int32 -> TMMM R
+foreign import ccall unsafe "multiplyC" zgemmc :: Int32 -> Int32 -> TMMM C
+foreign import ccall unsafe "multiplyF" sgemmc :: Int32 -> Int32 -> TMMM F
+foreign import ccall unsafe "multiplyQ" cgemmc :: Int32 -> Int32 -> TMMM Q
 foreign import ccall unsafe "multiplyI" c_multiplyI :: I -> TMMM I
 foreign import ccall unsafe "multiplyL" c_multiplyL :: Z -> TMMM Z
 
@@ -82,7 +85,7 @@ multiplyF a b = multiplyAux sgemmc "sgemmc" a b
 multiplyQ :: Matrix (Complex Float) -> Matrix (Complex Float) -> Matrix (Complex Float)
 multiplyQ a b = multiplyAux cgemmc "cgemmc" a b
 
-multiplyI :: I -> Matrix CInt -> Matrix CInt -> Matrix CInt
+multiplyI :: I -> Matrix Int32 -> Matrix Int32 -> Matrix Int32
 multiplyI m a b = unsafePerformIO $ do
     when (cols a /= rows b) $ error $
         "inconsistent dimensions in matrix product "++ shSize a ++ " x " ++ shSize b
@@ -239,8 +242,8 @@ foreign import ccall unsafe "eig_l_R" dgeev :: R ::> R ::> C :> R ::> Ok
 foreign import ccall unsafe "eig_l_G" dggev :: R ::> R ::> C :> R :> R ::> R ::> Ok
 foreign import ccall unsafe "eig_l_C" zgeev :: C ::> C ::> C :> C ::> Ok
 foreign import ccall unsafe "eig_l_GC" zggev :: C ::> C ::> C :> C :> C ::> C ::> Ok
-foreign import ccall unsafe "eig_l_S" dsyev :: CInt -> R :> R ::> Ok
-foreign import ccall unsafe "eig_l_H" zheev :: CInt -> R :> C ::> Ok
+foreign import ccall unsafe "eig_l_S" dsyev :: Int32 -> R :> R ::> Ok
+foreign import ccall unsafe "eig_l_H" zheev :: Int32 -> R :> C ::> Ok
 
 eigAux f st m = unsafePerformIO $ do
     a <- copy ColumnMajor m
@@ -636,7 +639,7 @@ qrgrAux f st n (a, tau) = unsafePerformIO $ do
     ((subVector 0 n tau') #! res) f #| st
     return res
   where
-    tau' = vjoin [tau, constantD 0 n]
+    tau' = vjoin [tau, constantAux 0 n]
 
 -----------------------------------------------------------------------------------
 foreign import ccall unsafe "hess_l_R" dgehrd :: R :> R ::> Ok