NFData instances

3 files changed, 22 insertions, 6 deletions

diff --git a/examples/parallel.hs b/examples/parallel.hs
index dfbfd88..8653bc3 100644
--- a/examples/parallel.hs
+++ b/examples/parallel.hs
@@ -1,14 +1,17 @@
+-- $ runhaskell parallel.hs 2000
+
 import System(getArgs)
 import Numeric.LinearAlgebra
 import Control.Parallel.Strategies
 import System.Time
 
-inParallel = parMap rwhnf id
+inParallel = parMap rnf id
+-- rwhnf also works in this case
 
+-- matrix product decomposed into p parallel subtasks
 parMul p x y = fromBlocks [ inParallel ( map (x <>) ys ) ]
     where ys = splitColumns p y
 
-
 main = do
     n <- (read . head) `fmap` getArgs
     let m = ident n :: Matrix Double
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 44fdd95..c99d3cb 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix
-Version:            0.5.2.3
+Version:            0.6.0.0
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -64,11 +64,16 @@ flag unsafe
 
 library
     if flag(splitBase)
-      build-depends:    base >= 3 && < 5, array, QuickCheck, HUnit, storable-complex, process
+      build-depends:    base >= 3 && < 5, array
     else
-      build-depends:    base < 3, QuickCheck, HUnit, storable-complex, process
+      build-depends:    base < 3
+
+    Build-Depends:      haskell98,
+                        QuickCheck, HUnit,
+                        storable-complex,
+                        process,
+                        parallel
 
-    Build-Depends:      haskell98
     Extensions:         ForeignFunctionInterface,
                         CPP
 
diff --git a/lib/Numeric/LinearAlgebra/Instances.hs b/lib/Numeric/LinearAlgebra/Instances.hs
index 79a8990..3122a3d 100644
--- a/lib/Numeric/LinearAlgebra/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Instances.hs
@@ -27,6 +27,7 @@ import Data.List(transpose,intersperse)
 import Foreign(Storable)
 import Data.Monoid
 import Data.Packed.Internal.Vector
+import Control.Parallel.Strategies
 
 ------------------------------------------------------------------
 
@@ -196,3 +197,10 @@ instance (Storable a) => Monoid (Vector a) where
         where j [] = mempty
               j l  = join l
 
+---------------------------------------------------------------
+
+instance (NFData a, Storable a) => NFData (Vector a) where
+    rnf = rnf . (@>0)
+
+instance (NFData a, Element a) => NFData (Matrix a) where
+    rnf = rnf . flatten