Merge remote-tracking branch 'origin/master'

2 files changed, 15 insertions, 65 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index b8ed18d..255009c 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -47,6 +47,7 @@ import Data.Complex(Complex)
 import Foreign.C.Types
 import Foreign.C.String(newCString)
 import System.IO.Unsafe(unsafePerformIO)
+import Control.DeepSeq
 
 -----------------------------------------------------------------
 
@@ -131,12 +132,10 @@ mat a f =
         let m g = do
             g (fi (rows a)) (fi (cols a)) p
         f m
-
-{- | Creates a vector by concatenation of rows
-
-@\> flatten ('ident' 3)
-9 |> [1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0]@
--}
+-- | Creates a vector by concatenation of rows. If the matrix is ColumnMajor, this operation requires a transpose.
+--
+-- @\> flatten ('ident' 3)
+-- 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 = xdat . cmat
 
@@ -459,3 +458,13 @@ size m = (rows m, cols m)
 
 shSize m = "(" ++ show (rows m) ++"><"++ show (cols m)++")"
 
+----------------------------------------------------------------------
+
+instance (Storable t, NFData t) => NFData (Matrix t)
+  where
+    rnf m | d > 0     = rnf (v @> 0)
+          | otherwise = ()
+      where
+        d = dim v
+        v = xdat m
+
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index d3b80ff..5892e67 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -55,48 +55,17 @@ import GHC.Base
 import GHC.IOBase hiding (liftIO)
 #endif
 
-#ifdef VECTOR
 import qualified Data.Vector.Storable as Vector
 import Data.Vector.Storable(Vector,
                             unsafeToForeignPtr,
                             unsafeFromForeignPtr,
                             unsafeWith)
-#else
-import Foreign.ForeignPtr(withForeignPtr)
-#endif
 
-#ifdef VECTOR
 
 -- | Number of elements
 dim :: (Storable t) => Vector t -> Int
 dim = Vector.length
 
-#else
-
--- | One-dimensional array of objects stored in a contiguous memory block.
-data Vector t =
-    V { ioff :: {-# UNPACK #-} !Int              -- ^ offset of first element
-      , idim :: {-# UNPACK #-} !Int              -- ^ number of elements
-      , fptr :: {-# UNPACK #-} !(ForeignPtr t)   -- ^ foreign pointer to the memory block
-      }
-
-unsafeToForeignPtr :: Storable a => Vector a -> (ForeignPtr a, Int, Int)
-unsafeToForeignPtr v = (fptr v, ioff v, idim v)
-
--- | Same convention as in Roman Leshchinskiy's vector package.
-unsafeFromForeignPtr :: Storable a => ForeignPtr a -> Int -> Int -> Vector a
-unsafeFromForeignPtr fp i n | n > 0 = V {ioff = i, idim = n, fptr = fp}
-                            | otherwise = error "unsafeFromForeignPtr with dim < 1"
-
-unsafeWith (V i _ fp) m = withForeignPtr fp $ \p -> m (p `advancePtr` i)
-{-# INLINE unsafeWith #-}
-
--- | Number of elements
-dim :: (Storable t) => Vector t -> Int
-dim = idim
-
-#endif
-
 
 -- C-Haskell vector adapter
 -- vec :: Adapt (CInt -> Ptr t -> r) (Vector t) r
@@ -204,36 +173,8 @@ subVector :: Storable t => Int       -- ^ index of the starting element
                         -> Int       -- ^ number of elements to extract
                         -> Vector t  -- ^ source
                         -> Vector t  -- ^ result
-
-#ifdef VECTOR
-
 subVector = Vector.slice
 
-{-
-subVector k l v
-    | k<0 || k >= n || k+l > n || l < 0 = error "subVector out of range"
-    | otherwise = unsafeFromForeignPtr fp (i+k) l
-  where
-    (fp, i, n) = unsafeToForeignPtr v
--}
-
-#else
-
-subVector k l v@V{idim = n, ioff = i}
-    | k<0 || k >= n || k+l > n || l < 0 = error "subVector out of range"
-    | otherwise = v {idim = l, ioff = i+k}
-
-{-
-subVectorCopy k l (v@V {idim=n})
-    | k<0 || k >= n || k+l > n || l < 0 = error "subVector out of range"
-    | otherwise = unsafePerformIO $ do
-        r <- createVector l
-        let f _ s _ d = copyArray d (advancePtr s k) l >> return 0
-        app2 f vec v vec r "subVector"
-        return r
--}
-
-#endif
 
 {- | Reads a vector position: