expanded stuff, included more dependencies, got accelerate to run
This commit is contained in:
parent
63499d0f0e
commit
717cfd7b34
14
dist/build/autogen/cabal_macros.h
vendored
14
dist/build/autogen/cabal_macros.h
vendored
@ -14,6 +14,13 @@
|
||||
(major1) == 0 && (major2) < 4 || \
|
||||
(major1) == 0 && (major2) == 4 && (minor) <= 6)
|
||||
|
||||
/* package accelerate-0.13.0.5 */
|
||||
#define VERSION_accelerate "0.13.0.5"
|
||||
#define MIN_VERSION_accelerate(major1,major2,minor) (\
|
||||
(major1) < 0 || \
|
||||
(major1) == 0 && (major2) < 13 || \
|
||||
(major1) == 0 && (major2) == 13 && (minor) <= 0)
|
||||
|
||||
/* package base-4.6.0.1 */
|
||||
#define VERSION_base "4.6.0.1"
|
||||
#define MIN_VERSION_base(major1,major2,minor) (\
|
||||
@ -28,6 +35,13 @@
|
||||
(major1) == 0 && (major2) < 10 || \
|
||||
(major1) == 0 && (major2) == 10 && (minor) <= 0)
|
||||
|
||||
/* package deepseq-1.3.0.1 */
|
||||
#define VERSION_deepseq "1.3.0.1"
|
||||
#define MIN_VERSION_deepseq(major1,major2,minor) (\
|
||||
(major1) < 1 || \
|
||||
(major1) == 1 && (major2) < 3 || \
|
||||
(major1) == 1 && (major2) == 3 && (minor) <= 0)
|
||||
|
||||
/* package ghc-7.6.3 */
|
||||
#define VERSION_ghc "7.6.3"
|
||||
#define MIN_VERSION_ghc(major1,major2,minor) (\
|
||||
|
BIN
dist/build/hgraph/hgraph
vendored
BIN
dist/build/hgraph/hgraph
vendored
Binary file not shown.
BIN
dist/build/hgraph/hgraph-tmp/Main.hi
vendored
BIN
dist/build/hgraph/hgraph-tmp/Main.hi
vendored
Binary file not shown.
BIN
dist/build/test-hgraph/test-hgraph
vendored
BIN
dist/build/test-hgraph/test-hgraph
vendored
Binary file not shown.
BIN
dist/build/test-hgraph/test-hgraph-tmp/Main.hi
vendored
BIN
dist/build/test-hgraph/test-hgraph-tmp/Main.hi
vendored
Binary file not shown.
4
dist/setup-config
vendored
4
dist/setup-config
vendored
File diff suppressed because one or more lines are too long
10
hgraph.cabal
10
hgraph.cabal
@ -8,16 +8,18 @@ description:
|
||||
data-dir: ""
|
||||
|
||||
executable hgraph
|
||||
build-depends: QuickCheck -any, Stream -any, base -any,
|
||||
bytestring -any, ghc -any, monad-par -any, parallel -any
|
||||
build-depends: QuickCheck -any, Stream -any, accelerate -any,
|
||||
base -any, bytestring -any, deepseq -any, ghc -any, monad-par -any,
|
||||
parallel -any
|
||||
main-is: Main.hs
|
||||
buildable: True
|
||||
hs-source-dirs: src
|
||||
ghc-options: -threaded -rtsopts -eventlog
|
||||
|
||||
test-suite test-hgraph
|
||||
build-depends: QuickCheck -any, Stream -any, base -any,
|
||||
bytestring -any, ghc -any, monad-par -any, parallel -any
|
||||
build-depends: QuickCheck -any, Stream -any, accelerate -any,
|
||||
base -any, bytestring -any, deepseq -any, ghc -any, monad-par -any,
|
||||
parallel -any
|
||||
type: exitcode-stdio-1.0
|
||||
main-is: Main.hs
|
||||
buildable: True
|
||||
|
BIN
references/STMTokyoApr10_slides.pdf
Normal file
BIN
references/STMTokyoApr10_slides.pdf
Normal file
Binary file not shown.
BIN
references/beautiful_concurrency.pdf
Normal file
BIN
references/beautiful_concurrency.pdf
Normal file
Binary file not shown.
BIN
references/parallel_haskell.pdf
Normal file
BIN
references/parallel_haskell.pdf
Normal file
Binary file not shown.
37
src/Main.hs
37
src/Main.hs
@ -19,6 +19,7 @@ module Main (
|
||||
|
||||
import Control.Monad (unless)
|
||||
import Control.Parallel.Strategies
|
||||
import Control.DeepSeq
|
||||
import Data.List
|
||||
import System.Exit (exitFailure)
|
||||
import System.Environment
|
||||
@ -28,16 +29,20 @@ import Data.ByteString.Lazy.Char8 (ByteString)
|
||||
import Control.Monad.Par.Scheds.Trace
|
||||
import qualified Data.Stream as S
|
||||
import Data.Either (lefts, rights)
|
||||
import Debug.Trace
|
||||
import qualified Data.Array.Accelerate as A
|
||||
-- change to Data.Array.Accelerate.CUDA as I and link accelerate-cuda to use GPU instead of CPU
|
||||
import Data.Array.Accelerate.Interpreter as I
|
||||
|
||||
import Stream hiding (map)
|
||||
|
||||
type Matrix e = A.Array A.DIM2 e
|
||||
|
||||
-- TODO: implement parser!
|
||||
createGraph :: String -> Either [Int] String
|
||||
createGraph input = createGraph' input (Left [])
|
||||
createGraph input = traceEvent "creating graph" createGraph' input (Left [])
|
||||
where
|
||||
createGraph' :: String -> Either [Int] String -> Either [Int] String
|
||||
createGraph' [] r = r
|
||||
createGraph' [] r = traceEvent "recursion done." r
|
||||
createGraph' (a:as) r =
|
||||
let next = (createGraph' as r) in
|
||||
case next of
|
||||
@ -87,8 +92,10 @@ emptyLog [] = True
|
||||
emptyLog a = emptyLine $ foldl1 (++) a
|
||||
|
||||
-- TODO: implement calculation
|
||||
doCalculation :: [[Int]] -> ByteString
|
||||
doCalculation a = B.pack $ (show a) ++ "\n"
|
||||
doCalculation :: Matrix Int -> ByteString
|
||||
doCalculation a = B.pack $ "" --(show a) ++ "\n"
|
||||
|
||||
|
||||
|
||||
exeMain = do
|
||||
args <- getArgs
|
||||
@ -103,10 +110,22 @@ exeMain = do
|
||||
-- split at \n, convert to String
|
||||
(map B.unpack (B.split '\n' input)))
|
||||
--egraph <- return $ graphFolder unrefined_graph
|
||||
(graph, log) <- return (lefts unrefined_graph, rights unrefined_graph)
|
||||
output <- return $ case emptyLog log of
|
||||
True -> doCalculation graph
|
||||
_ -> B.pack $ "Error detected:\n" ++ (foldl (concatWith "\n") "" log) ++ "\n\n"
|
||||
(graph, log, lines) <- return $ ((foldl1 (++) (lefts unrefined_graph), -- concatenated graph
|
||||
foldl (concatWith "\n") "" (rights unrefined_graph), -- concat error-log
|
||||
length unrefined_graph) -- number of elements in graph
|
||||
-- in parallel
|
||||
`using` parTuple3 rdeepseq rdeepseq rdeepseq)
|
||||
|
||||
-- validate graph
|
||||
log <- return $ let l = length graph in
|
||||
if l /= lines*lines then
|
||||
log ++ "Lines dont match up. Read " ++ (show l) ++ " lines. Expected "
|
||||
++ (show (lines*lines)) ++ " lines.\n"
|
||||
else
|
||||
log
|
||||
output <- return $ case emptyLine log of
|
||||
True -> doCalculation $ A.fromList (A.Z A.:. lines A.:. lines) graph
|
||||
_ -> B.pack $ "Error detected:\n" ++ log ++ "\n\n"
|
||||
B.putStr output
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user