packages feed

hmatrix 0.13.0.0 → 0.13.1.0

raw patch · 6 files changed

+53/−83 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

+ Data.Packed.Development: at' :: Storable a => Vector a -> Int -> a
+ Data.Packed.Development: atM' :: Storable a => Matrix a -> Int -> Int -> a

Files

THANKS.md view
@@ -41,6 +41,8 @@   avoid the wrong NaNs produced by foreign functions.  - Reiner Pope added support for luSolve, based on (d|z)getrs.+  Made Matrix a product type and added changes to improve the code generated+  by hmatrix-syntax.  - Simon Beaumont reported the need of QuickCheck<2 and the invalid   asm("finit") on ppc. He also contributed the configuration options
hmatrix.cabal view
@@ -1,5 +1,5 @@ Name:               hmatrix-Version:            0.13.0.0+Version:            0.13.1.0 License:            GPL License-file:       LICENSE Author:             Alberto Ruiz@@ -70,14 +70,6 @@     description:    Compile the library with bound checking disabled.     default:        False -flag vector-    description:    Use Data.Vector.Storable type from "vector" package.-    default:        True--flag binary-    description:    Define Binary instances-    default:        True- flag finit     description:    Force FPU initialization in foreing calls     default:        False@@ -95,7 +87,9 @@     Build-Depends:      base >= 4 && < 5,                         array,                         storable-complex,-                        process+                        process,+                        vector >= 0.8,+                        binary      Extensions:         ForeignFunctionInterface,                         CPP@@ -138,13 +132,7 @@     C-sources:          lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c,                         lib/Numeric/GSL/gsl-aux.c -    if flag(vector)-       Build-Depends:   vector >= 0.8-       cpp-options:     -DVECTOR--    if flag(binary)-       Build-Depends:   binary-       cpp-options:     -DBINARY+    cpp-options:        -DVECTOR -DBINARY   -- ghc-prof-options:   -auto
lib/Data/Packed/Development.hs view
@@ -23,7 +23,8 @@     MatrixOrder(..), orderOf, cmat, fmat,     unsafeFromForeignPtr,     unsafeToForeignPtr,-    check, (//)+    check, (//),+    at', atM' ) where  import Data.Packed.Internal
lib/Data/Packed/Internal/Matrix.hs view
@@ -18,7 +18,7 @@ -- #hide  module Data.Packed.Internal.Matrix(-    Matrix(..), rows, cols,+    Matrix(..), rows, cols, cdat, fdat,     MatrixOrder(..), orderOf,     createMatrix, mat,     cmat, fmat,@@ -29,7 +29,7 @@     matrixFromVector,     subMatrix,     liftMatrix, liftMatrix2,-    (@@>),+    (@@>), atM',     saveMatrix,     singleton,     size, shSize, conformVs, conformMs, conformVTo, conformMTo@@ -82,21 +82,23 @@  data MatrixOrder = RowMajor | ColumnMajor deriving (Show,Eq) +transOrder RowMajor = ColumnMajor+transOrder ColumnMajor = RowMajor {- | Matrix representation suitable for GSL and LAPACK computations.  The elements are stored in a continuous memory array.  -}-data Matrix t = MC { irows :: {-# UNPACK #-} !Int-                   , icols :: {-# UNPACK #-} !Int-                   , cdat :: {-# UNPACK #-} !(Vector t) } -              | MF { irows :: {-# UNPACK #-} !Int-                   , icols :: {-# UNPACK #-} !Int-                   , fdat :: {-# UNPACK #-} !(Vector t) }+data Matrix t = Matrix { irows :: {-# UNPACK #-} !Int+                       , icols :: {-# UNPACK #-} !Int+                       , xdat :: {-# UNPACK #-} !(Vector t)+                       , order :: !MatrixOrder }+-- RowMajor: preferred by C, fdat may require a transposition+-- ColumnMajor: preferred by LAPACK, cdat may require a transposition --- MC: preferred by C, fdat may require a transposition--- MF: preferred by LAPACK, cdat may require a transposition+cdat = xdat+fdat = xdat  rows :: Matrix t -> Int rows = irows@@ -104,25 +106,21 @@ cols :: Matrix t -> Int cols = icols -xdat MC {cdat = d } = d-xdat MF {fdat = d } = d- orderOf :: Matrix t -> MatrixOrder-orderOf MF{} = ColumnMajor-orderOf MC{} = RowMajor+orderOf = order + -- | Matrix transpose. trans :: Matrix t -> Matrix t-trans MC {irows = r, icols = c, cdat = d } = MF {irows = c, icols = r, fdat = d }-trans MF {irows = r, icols = c, fdat = d } = MC {irows = c, icols = r, cdat = d }+trans Matrix {irows = r, icols = c, xdat = d, order = o } = Matrix { irows = c, icols = r, xdat = d, order = transOrder o}  cmat :: (Element t) => Matrix t -> Matrix t-cmat m@MC{} = m-cmat MF {irows = r, icols = c, fdat = d } = MC {irows = r, icols = c, cdat = transdata r d c}+cmat m@Matrix{order = RowMajor} = m+cmat Matrix {irows = r, icols = c, xdat = d, order = ColumnMajor } = Matrix { irows = r, icols = c, xdat = transdata r d c, order = RowMajor}  fmat :: (Element t) => Matrix t -> Matrix t-fmat m@MF{} = m-fmat MC {irows = r, icols = c, cdat = d } = MF {irows = r, icols = c, fdat = transdata c d r}+fmat m@Matrix{order = ColumnMajor} = m+fmat Matrix {irows = r, icols = c, xdat = d, order = RowMajor } = Matrix { irows = r, icols = c, xdat = transdata c d r, order = ColumnMajor}  -- C-Haskell matrix adapter -- mat :: Adapt (CInt -> CInt -> Ptr t -> r) (Matrix t) r@@ -140,7 +138,7 @@ 9 |> [1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0]@ -} flatten :: Element t => Matrix t -> Vector t-flatten = cdat . cmat+flatten = xdat . cmat  type Mt t s = Int -> Int -> Ptr t -> s -- not yet admitted by my haddock version@@ -182,45 +180,30 @@ -- | Reads a matrix position. (@@>) :: Storable t => Matrix t -> (Int,Int) -> t infixl 9 @@>---m@M {rows = r, cols = c} @@> (i,j)---    | i<0 || i>=r || j<0 || j>=c = error "matrix indexing out of range"---    | otherwise   = cdat m `at` (i*c+j)--MC {irows = r, icols = c, cdat = v} @@> (i,j)-    | safe      = if i<0 || i>=r || j<0 || j>=c-                    then error "matrix indexing out of range"-                    else v `at` (i*c+j)-    | otherwise = v `at` (i*c+j)--MF {irows = r, icols = c, fdat = v} @@> (i,j)+m@Matrix {irows = r, icols = c} @@> (i,j)     | safe      = if i<0 || i>=r || j<0 || j>=c                     then error "matrix indexing out of range"-                    else v `at` (j*r+i)-    | otherwise = v `at` (j*r+i)+                    else atM' m i j+    | otherwise = atM' m i j {-# INLINE (@@>) #-}  --  Unsafe matrix access without range checking-atM' MC {icols = c, cdat = v} i j = v `at'` (i*c+j)-atM' MF {irows = r, fdat = v} i j = v `at'` (j*r+i)+atM' Matrix {icols = c, xdat = v, order = RowMajor} i j = v `at'` (i*c+j)+atM' Matrix {irows = r, xdat = v, order = ColumnMajor} i j = v `at'` (j*r+i) {-# INLINE atM' #-}  ------------------------------------------------------------------ -matrixFromVector RowMajor c v = MC { irows = r, icols = c, cdat = v }-    where (d,m) = dim v `divMod` c-          r | m==0 = d-            | otherwise = error "matrixFromVector"--matrixFromVector ColumnMajor c v = MF { irows = r, icols = c, fdat = v }-    where (d,m) = dim v `divMod` c+matrixFromVector o c v = Matrix { irows = r, icols = c, xdat = v, order = o }+    where (d,m) = dim v `quotRem` c           r | m==0 = d             | otherwise = error "matrixFromVector"  -- allocates memory for a new matrix createMatrix :: (Storable a) => MatrixOrder -> Int -> Int -> IO (Matrix a)-createMatrix order r c = do+createMatrix ord r c = do     p <- createVector (r*c)-    return (matrixFromVector order c p)+    return (matrixFromVector ord c p)  {- | Creates a matrix from a vector by grouping the elements in rows with the desired number of columns. (GNU-Octave groups by columns. To do it you can define @reshapeF r = trans . reshape r@ where r is the desired number of rows.)@@ -239,16 +222,15 @@  -- | application of a vector function on the flattened matrix elements liftMatrix :: (Storable a, Storable b) => (Vector a -> Vector b) -> Matrix a -> Matrix b-liftMatrix f MC { icols = c, cdat = d } = matrixFromVector RowMajor    c (f d)-liftMatrix f MF { icols = c, fdat = d } = matrixFromVector ColumnMajor c (f d)+liftMatrix f Matrix { icols = c, xdat = d, order = o } = matrixFromVector o c (f d)  -- | application of a vector function on the flattened matrices elements liftMatrix2 :: (Element t, Element a, Element b) => (Vector a -> Vector b -> Vector t) -> Matrix a -> Matrix b -> Matrix t liftMatrix2 f m1 m2     | not (compat m1 m2) = error "nonconformant matrices in liftMatrix2"-    | otherwise = case m1 of-        MC {} -> matrixFromVector RowMajor    (cols m1) (f (cdat m1) (flatten m2))-        MF {} -> matrixFromVector ColumnMajor (cols m1) (f (fdat m1) ((fdat.fmat) m2))+    | otherwise = case orderOf m1 of+        RowMajor    -> matrixFromVector RowMajor    (cols m1) (f (xdat m1) (flatten m2))+        ColumnMajor -> matrixFromVector ColumnMajor (cols m1) (f (xdat m1) ((xdat.fmat) m2))   compat :: Matrix a -> Matrix b -> Bool@@ -427,7 +409,7 @@             go (rt-1) (ct-1)     return w -subMatrix' (r0,c0) (rt,ct) (MC _r c v) = MC rt ct $ subMatrix'' (r0,c0) (rt,ct) c v+subMatrix' (r0,c0) (rt,ct) (Matrix { icols = c, xdat = v, order = RowMajor}) = Matrix rt ct (subMatrix'' (r0,c0) (rt,ct) c v) RowMajor subMatrix' (r0,c0) (rt,ct) m = trans $ subMatrix' (c0,r0) (ct,rt) (trans m)  --------------------------------------------------------------------------
lib/Data/Packed/ST.hs view
@@ -98,7 +98,6 @@ writeVector :: Storable t => STVector s t -> Int -> t -> ST s () writeVector = safeIndexV unsafeWriteVector -{-# NOINLINE newUndefinedVector #-} newUndefinedVector :: Storable t => Int -> ST s (STVector s t) newUndefinedVector = unsafeIOToST . fmap STVector . createVector @@ -114,13 +113,13 @@  {-# INLINE ioReadM #-} ioReadM :: Storable t => Matrix t -> Int -> Int -> IO t-ioReadM (MC _ nc cv) r c = ioReadV cv (r*nc+c)-ioReadM (MF nr _ fv) r c = ioReadV fv (c*nr+r)+ioReadM (Matrix _ nc cv RowMajor) r c = ioReadV cv (r*nc+c)+ioReadM (Matrix nr _ fv ColumnMajor) r c = ioReadV fv (c*nr+r)  {-# INLINE ioWriteM #-} ioWriteM :: Storable t => Matrix t -> Int -> Int -> t -> IO ()-ioWriteM (MC _ nc cv) r c val = ioWriteV cv (r*nc+c) val-ioWriteM (MF nr _ fv) r c val = ioWriteV fv (c*nr+r) val+ioWriteM (Matrix _ nc cv RowMajor) r c val = ioWriteV cv (r*nc+c) val+ioWriteM (Matrix nr _ fv ColumnMajor) r c val = ioWriteV fv (c*nr+r) val  newtype STMatrix s t = STMatrix (Matrix t) @@ -154,8 +153,7 @@ freezeMatrix :: (Storable t) => STMatrix s1 t -> ST s2 (Matrix t) freezeMatrix m = liftSTMatrix id m -cloneMatrix (MC r c d) = cloneVector d >>= return . MC r c-cloneMatrix (MF r c d) = cloneVector d >>= return . MF r c+cloneMatrix (Matrix r c d o) = cloneVector d >>= return . (\d' -> Matrix r c d' o)  {-# INLINE safeIndexM #-} safeIndexM f (STMatrix m) r c@@ -172,9 +170,8 @@ writeMatrix :: Storable t => STMatrix s t -> Int -> Int -> t -> ST s () writeMatrix = safeIndexM unsafeWriteMatrix -{-# NOINLINE newUndefinedMatrix #-} newUndefinedMatrix :: Storable t => MatrixOrder -> Int -> Int -> ST s (STMatrix s t)-newUndefinedMatrix order r c = unsafeIOToST $ fmap STMatrix $ createMatrix order r c+newUndefinedMatrix ord r c = unsafeIOToST $ fmap STMatrix $ createMatrix ord r c  {-# NOINLINE newMatrix #-} newMatrix :: Storable t => t -> Int -> Int -> ST s (STMatrix s t)
lib/Numeric/LinearAlgebra/LAPACK.hs view
@@ -58,11 +58,11 @@ foreign import ccall "multiplyF" sgemmc :: CInt -> CInt -> TFMFMFM foreign import ccall "multiplyQ" cgemmc :: CInt -> CInt -> TQMQMQM -isT MF{} = 0-isT MC{} = 1+isT Matrix{order = ColumnMajor} = 0+isT Matrix{order = RowMajor} = 1 -tt x@MF{} = x-tt x@MC{} = trans x+tt x@Matrix{order = ColumnMajor} = x+tt x@Matrix{order = RowMajor} = trans x  multiplyAux f st a b = unsafePerformIO $ do     when (cols a /= rows b) $ error $ "inconsistent dimensions in matrix product "++