[commit: packages/dph] master: minor wibbles to make examples compile (3e8b135)
git at git.haskell.org
git at git.haskell.org
Fri Dec 6 00:07:41 UTC 2013
Repository : ssh://git@git.haskell.org/dph
On branch : master
Link : http://git.haskell.org/packages/dph.git/commitdiff/3e8b135e741533a37bacb51c63dcd0fb8af2f912
>---------------------------------------------------------------
commit 3e8b135e741533a37bacb51c63dcd0fb8af2f912
Author: Amos Robinson <amos.robinson at gmail.com>
Date: Tue Nov 26 18:12:38 2013 +1100
minor wibbles to make examples compile
>---------------------------------------------------------------
3e8b135e741533a37bacb51c63dcd0fb8af2f912
dph-event-seer/dph-event-seer.cabal | 1 -
dph-examples/examples/spectral/ClosestPairs/dph/Vectorised1.hs | 2 +-
dph-examples/examples/spectral/QuickSelect/dph/Vectorised.hs | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dph-event-seer/dph-event-seer.cabal b/dph-event-seer/dph-event-seer.cabal
index a47fc87..73fdedd 100644
--- a/dph-event-seer/dph-event-seer.cabal
+++ b/dph-event-seer/dph-event-seer.cabal
@@ -15,7 +15,6 @@ Synopsis: Analyse eventlog files for time spent in garbage collection
Executable dph-event-seer
Build-depends:
base == 4.*,
- dph-prim-par == 0.6.*,
containers == 0.5.*,
ghc-events == 0.4.*,
pretty >= 1.1
diff --git a/dph-examples/examples/spectral/ClosestPairs/dph/Vectorised1.hs b/dph-examples/examples/spectral/ClosestPairs/dph/Vectorised1.hs
index cd08897..8480003 100644
--- a/dph-examples/examples/spectral/ClosestPairs/dph/Vectorised1.hs
+++ b/dph-examples/examples/spectral/ClosestPairs/dph/Vectorised1.hs
@@ -114,7 +114,7 @@ closeststupid1PA ps = closeststupid (fromPArrayP ps)
median :: [: Double :] -> Double
median xs = median' xs (lengthP xs `I.div` 2)
-median':: [: Double :] -> Int -> Double
+median':: [: Double :] -> P.Int -> Double
median' xs k =
let p = xs !: (lengthP xs `I.div` 2)
ls = [:x | x <- xs, x D.< p:]
diff --git a/dph-examples/examples/spectral/QuickSelect/dph/Vectorised.hs b/dph-examples/examples/spectral/QuickSelect/dph/Vectorised.hs
index d08103e..00139a3 100644
--- a/dph-examples/examples/spectral/QuickSelect/dph/Vectorised.hs
+++ b/dph-examples/examples/spectral/QuickSelect/dph/Vectorised.hs
@@ -4,7 +4,7 @@
module Vectorised (quickselectPA) where
import Data.Array.Parallel
import Data.Array.Parallel.Prelude.Double as D
-import qualified Data.Array.Parallel.Prelude.Int as I
+import Data.Array.Parallel.Prelude.Int as I
import qualified Prelude
More information about the ghc-commits
mailing list