added examples/benchmarks.hs

5 files changed, 46 insertions, 51 deletions

diff --git a/examples/benchmarks.hs b/examples/benchmarks.hs
new file mode 100644
index 0000000..7fea3ed
--- /dev/null
+++ b/examples/benchmarks.hs
@@ -0,0 +1,44 @@
+{-# OPTIONS -fbang-patterns #-}
+
+-- compile as:
+-- ghc --make -O2 -optc-O2 -fvia-C  benchmarks.hs -o benchmarks
+
+import Numeric.LinearAlgebra
+import System.Time
+import System.CPUTime
+import Text.Printf
+
+
+time act = do
+    t0 <- getCPUTime
+    act
+    t1 <- getCPUTime
+    putStrLn $ show ((t1-t0) `div` 10^10) ++ " cs"
+
+time' act = do
+    t0 <- getClockTime
+    act
+    t1 <- getClockTime
+    putStrLn $ timeDiffToString $ normalizeTimeDiff $ diffClockTimes t1 t0
+
+--------------------------------------------------------------------------------
+
+main = sequence_ [bench1]
+
+bench1 = do
+    putStrLn "sum of a vector with 30 million doubles:"
+    time $ printf "     BLAS: %.2f: " $ sumV sumVB 30000000
+    time $ printf "  Haskell: %.2f: " $ sumV sumVH 30000000
+    time $ printf "     BLAS: %.2f: " $ sumV sumVB 30000000
+    time $ printf "  Haskell: %.2f: " $ sumV sumVH 30000000
+
+sumV f n = f (constant (1::Double) n)
+
+sumVB v = constant 1 (dim v) <.> v
+
+sumVH v = go (d - 1) 0
+     where
+       d = dim v
+       go :: Int -> Double -> Double
+       go 0 s = s + (v @> 0)
+       go !j !s = go (j - 1) (s + (v @> j))
diff --git a/lib/Data/Packed/Internal.hs b/lib/Data/Packed/Internal.hs
index e5028d3..0bf9f8c 100644
--- a/lib/Data/Packed/Internal.hs
+++ b/lib/Data/Packed/Internal.hs
@@ -21,4 +21,4 @@ module Data.Packed.Internal (
 
 import Data.Packed.Internal.Common
 import Data.Packed.Internal.Vector
-import Data.Packed.Internal.Matrix
\ No newline at end of file
+import Data.Packed.Internal.Matrix
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 7a35a61..caf3699 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -394,30 +394,3 @@ fromFile filename (r,c) = do
     --free charname  -- TO DO: free the auxiliary CString
     return res
 foreign import ccall "auxi.h matrix_fscanf" c_gslReadMatrix:: Ptr CChar -> TM
-
-----------------------------------------------------------------------------
-
-{- | creates a new matrix with the given position updated with a modification function
-
-@> updateMatrix (0,2) (const 57) (ident 3 :: Matrix Double)
-(3><3)
- [ 1.0, 0.0, 57.0
- , 0.0, 1.0,  0.0
- , 0.0, 0.0,  1.0 ]@
-
--}
-updateMatrix :: Storable t
-             => (Int,Int) -- ^ position (row,column)
-             -> (t -> t)  -- ^ modification function
-             -> Matrix t  -- ^ source matrix
-             -> Matrix t  -- ^ result
-
-updateMatrix (i,j) f (m@MC {rows = r, cols = c, cdat = v})
-    | i<0 || i>=r || j<0 || j>=c = error $ "updateMatrix out of range(size="++show (r,c)++", pos="++show (i,j)++")"
-    | otherwise                  = let pos = i*c+j
-                                    in m { cdat = updateVector pos f v }
-
-updateMatrix (i,j) f (m@MF {rows = r, cols = c, fdat = v})
-    | i<0 || i>=r || j<0 || j>=c = error $ "updateMatrix out of range(size="++show (r,c)++", pos="++show (i,j)++")"
-    | otherwise                  = let pos = j*r+i
-                                    in m { fdat = updateVector pos f v }
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 6274e48..2df33e0 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -189,28 +189,6 @@ liftVector2 f u v = fromList $ zipWith f (toList u) (toList v)
 
 -----------------------------------------------------------------
 
-{- | creates a new vector with a desired position updated with a modification function
-
-@> updateVector 3 (+7) (fromList [1..5])
-5 |> [1.0,2.0,3.0,11.0,5.0]@
-
--}
-updateVector :: Storable t => Int       -- ^ position
-                           -> (t->t)    -- ^ modification function
-                           -> Vector t  -- ^ source
-                           -> Vector t  -- ^ result
-updateVector k h (v@V {dim=n})
-    | k<0 || k >= n = error $ "updateVector out of range (dim="++show n++", pos="++show k++")"
-    | otherwise = unsafePerformIO $ do
-        r <- createVector n
-        let f _ s _ d =  copyArray d s n
-                      >> pokeElemOff d k (h (v`at'`k))
-                      >> return 0
-        app2 f vec v vec r "updateVector"
-        return r
-
------------------------------------------------------------------
-
 cloneVector :: Storable t => Vector t -> IO (Vector t)
 cloneVector (v@V {dim=n}) = do
         r <- createVector n
diff --git a/lib/Data/Packed/Matrix.hs b/lib/Data/Packed/Matrix.hs
index 62d28b1..7d2c564 100644
--- a/lib/Data/Packed/Matrix.hs
+++ b/lib/Data/Packed/Matrix.hs
@@ -226,4 +226,4 @@ extractRows l m = fromRows $ extract (toRows $ m) l
 
 -}
 repmat :: (Element t) => Matrix t -> Int -> Int -> Matrix t
-repmat m r c = fromBlocks $ partit c $ replicate (r*c) m
\ No newline at end of file
+repmat m r c = fromBlocks $ partit c $ replicate (r*c) m