Permalink
Browse files

Make the mergesort example build without GPU business by default.

  • Loading branch information...
1 parent 9d2fbdd commit 09a1c7176575e399f6867a484baa3c4bf6c1ceea @rrnewton rrnewton committed Oct 26, 2012
Showing with 9 additions and 5 deletions.
  1. +1 −1 Deques
  2. +1 −1 accelerate
  3. +1 −1 distributed-process
  4. +4 −2 examples/src/sorting/mergesort.hs
  5. +2 −0 monad-par/Control/Monad/Par/Scheds/Direct.hs
2 Deques
@@ -1 +1 @@
-Subproject commit e28aa8cde2d7c9d42ddd58ab753c5b00efa2fdf0
+Subproject commit f66410546ad0246389c10a65ee5b1a0fe2d46b27
2 accelerate
@@ -1 +1 @@
-Subproject commit 9e4a6d30c7b56a483f35329bed7a0fb7bbed930c
+Subproject commit a14059410c9f3b1e42ae398d24510d43d9a512c9
2 distributed-process
@@ -1 +1 @@
-Subproject commit 6b26fa97feb2fe03b99cca72d1b96b6bf8075b31
+Subproject commit e6701d9d6d372293cb998a995589e4ef837e81a7
View
6 examples/src/sorting/mergesort.hs
@@ -33,9 +33,11 @@ import Data.Vector.Algorithms.Merge (sort)
#ifdef PARSCHED
import PARSCHED
-#else
+#elif 0
import Control.Monad.Par.Meta.SMPMergeSort
#define GPU_ENABLED
+#else
+import Control.Monad.Par
#endif
#ifdef GPU_ENABLED
@@ -426,7 +428,7 @@ main = do args <- getArgs
-> ("dynamic", (read lo), (read hi), (read n), (read t))
[mode, n] | isMode mode -> (mode, 16, 22, read n, 8192)
[mode, n, t] | isMode mode -> (mode, 16, 22, read n, read t)
- xs -> error $ "invalid argument list " ++ unwords xs
+ xs -> error $ "invalid argument list, expecting cpu/dynamic [log_2(numelems)]: " ++ unwords xs
gpuThi = 2 ^ (min 22 hi)
gpuTlo = 2 ^ lo
gpuT = (gpuTlo, gpuThi)
View
2 monad-par/Control/Monad/Par/Scheds/Direct.hs
@@ -723,3 +723,5 @@ forkIO_Suppress whre action =
return ()
)
action
+
+-- forkOnIt

0 comments on commit 09a1c71

Please sign in to comment.