examples/parallel using toBlocks

1 files changed, 2 insertions, 17 deletions

diff --git a/examples/parallel.hs b/examples/parallel.hs
index 3c83c54..435e367 100644
--- a/examples/parallel.hs
+++ b/examples/parallel.hs
@@ -6,19 +6,16 @@ import Control.Parallel.Strategies
 import System.Time
 
 inParallel = parMap rwhnf id
---  rdeepseq (or older rnf) not needed in this case
+
 
 -- matrix product decomposed into p parallel subtasks
 parMul p x y = fromBlocks [ inParallel ( map (x <>) ys ) ]
-    where ys = splitColumns p y
-
--- x <||> y = fromColumns . inParallel . map (x <>) . toColumns $ y
+    where [ys] = toBlocksEvery (rows y) (cols y `div` p) y
 
 main = do
     n <- (read . head) `fmap` getArgs
     let m = ident n :: Matrix Double
     time $ print $ vectorMax $ takeDiag $ m <> m
---    time $ print $ vectorMax $ takeDiag $ m <||> m
     time $ print $ vectorMax $ takeDiag $ parMul 2 m m
     time $ print $ vectorMax $ takeDiag $ parMul 4 m m
     time $ print $ vectorMax $ takeDiag $ parMul 8 m m
@@ -28,15 +25,3 @@ time act = do
     act
     t1 <- getClockTime
     print $ tdSec $ normalizeTimeDiff $ diffClockTimes t1 t0
-
-splitColumns n m = splitColumns' (f n (cols m)) m
-    where
-    splitColumns' [] m = []
-    splitColumns' ((a,b):rest) m = subMatrix (0,a) (rows m, b-a+1) m : splitColumns' rest m
-
-    f :: Int -> Int -> [(Int,Int)]
-    f n c = zip ks (map pred $ tail ks)
-        where ks = map round $ toList $ linspace (fromIntegral n+1) (0,fromIntegral c)
-
-splitRowsAt p m    = (takeRows p m, dropRows p m)
-splitColumnsAt p m = (takeColumns p m, dropColumns p m)