Drezil/hgraph
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added bang-patterns, added more ghc-flags

Browse Source
This commit is contained in:
Nicole Dresselhaus 2013-12-01 19:25:06 +01:00
parent 4b552083e6
commit a3228188e5
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgraph.cabal
View File

@ -26,8 +26,10 @@ executable hgraph
buildable: True buildable: True
hs-source-dirs: src hs-source-dirs: src
other-modules: DCB other-modules: DCB
ghc-options: -threaded -rtsopts -eventlog ghc-options: -eventlog -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3
extensions: DoAndIfThenElse extensions:
BangPatterns,
DoAndIfThenElse
test-suite test-hgraph test-suite test-hgraph
build-depends: QuickCheck -any, Stream -any, accelerate -any, build-depends: QuickCheck -any, Stream -any, accelerate -any,

15
src/Main.hs
View File

@ -1,6 +1,6 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# LANGUAGE DoAndIfThenElse #-} {-# LANGUAGE DoAndIfThenElse #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell, BangPatterns #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- --
-- Module : Main -- Module : Main
@ -53,8 +53,9 @@ import Test.QuickCheck.All (quickCheckAll)
-- * Valid Chars: 0, 1, \\n -- * Valid Chars: 0, 1, \\n
-- --
-- * Invalid: \\r -- * Invalid: \\r
createGraph :: T.Text -> Either [Int8] T.Text createGraph :: T.Text -> Either [Int8] T.Text
createGraph input = createGraph' input (Left []) createGraph (!input) = createGraph' input (Left [])
where where
createGraph' :: T.Text -> Either [Int8] T.Text -> Either [Int8] T.Text createGraph' :: T.Text -> Either [Int8] T.Text -> Either [Int8] T.Text
createGraph' a r createGraph' a r
@ -87,7 +88,7 @@ createGraph input = createGraph' input (Left [])
--TODO: curruntly ignores first element --TODO: curruntly ignores first element
createAttr :: T.Text -> Either [Double] T.Text createAttr :: T.Text -> Either [Double] T.Text
createAttr input = createAttr' (tail (T.split (=='\t') input)) (Left []) createAttr (!input) = createAttr' (tail (T.split (=='\t') input)) (Left [])
where where
createAttr' :: [T.Text] -> Either [Double] T.Text -> Either [Double] T.Text createAttr' :: [T.Text] -> Either [Double] T.Text -> Either [Double] T.Text
createAttr' [] r = r createAttr' [] r = r
@ -125,7 +126,9 @@ createOutput a = _createOutput a "," "\n"
-- --
-- * Second String is the between-dimensions-separator -- * Second String is the between-dimensions-separator
_createOutput :: (Unbox a, Show a) => Array U DIM2 a -> String -> String -> B.ByteString _createOutput :: (Unbox a, Show a) => Array U DIM2 a -> String -> String -> B.ByteString
_createOutput a itt lt = B.concat $ L.map B.pack (_createOutput' (extent a) a itt lt) _createOutput a itt lt = B.concat $
(B.pack $ "Matrix "++(show $ listOfShape $ extent a)++ "\n\n")
: (L.map B.pack (_createOutput' (extent a) a itt lt))
where where
_createOutput' :: (Unbox a, Show a) => DIM2 -> Array U DIM2 a -> String -> String -> [String] _createOutput' :: (Unbox a, Show a) => DIM2 -> Array U DIM2 a -> String -> String -> [String]
_createOutput' shape@(Z :. si :. sj) a itt lt = [(_createOutput'' shape i 0 a itt) ++ lt | i <- [0..(si - 1)]] _createOutput' shape@(Z :. si :. sj) a itt lt = [(_createOutput'' shape i 0 a itt) ++ lt | i <- [0..(si - 1)]]
@ -199,9 +202,9 @@ main = do
attrLines <- return $ length attrMat attrLines <- return $ length attrMat
unrefined_graph <- return $ (L.map (createGraph) adjMat) unrefined_graph <- return $ (L.map (createGraph) adjMat)
+|| (parBuffer 100 rdeepseq) --run parallel, evaluate fully -- +|| (parBuffer 25 rseq) --run parallel, evaluate fully
unrefined_attr <- return $ (L.map (createAttr) attrMat) unrefined_attr <- return $ (L.map (createAttr) attrMat)
+|| (parBuffer 100 rdeepseq) --run parallel, evaluate fully -- +|| (parBuffer 25 rseq) --run parallel, evaluate fully
adjNum <- return $ getLength (head unrefined_graph) adjNum <- return $ getLength (head unrefined_graph)
attrNum <- return $ getLength (head unrefined_attr) attrNum <- return $ getLength (head unrefined_attr)
debug $ show (adjLines, attrLines, attrNum) debug $ show (adjLines, attrLines, attrNum)