summaryrefslogtreecommitdiff
path: root/testsuite/tests/dph
diff options
context:
space:
mode:
authorBen Lippmeier <benl@ouroborus.net>2011-11-09 17:14:10 +1100
committerBen Lippmeier <benl@ouroborus.net>2011-11-09 17:14:10 +1100
commitcd98bd8cfd6b557cb042a47c6df4f70e3f8e578d (patch)
treeb7e665330a7781e42f1ca485f2af1e54beda879b /testsuite/tests/dph
parent21bc0ef0e8f89d6d95969a8f5383b82abb1e711c (diff)
downloadhaskell-cd98bd8cfd6b557cb042a47c6df4f70e3f8e578d.tar.gz
Follow API changes in DPH tests
Diffstat (limited to 'testsuite/tests/dph')
-rw-r--r--testsuite/tests/dph/dotp/Main.hs2
-rw-r--r--testsuite/tests/dph/quickhull/Main.hs4
-rw-r--r--testsuite/tests/dph/quickhull/TestData.hs4
-rw-r--r--testsuite/tests/dph/words/Main.hs2
4 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/tests/dph/dotp/Main.hs b/testsuite/tests/dph/dotp/Main.hs
index 436beb07fd..ea21f395c4 100644
--- a/testsuite/tests/dph/dotp/Main.hs
+++ b/testsuite/tests/dph/dotp/Main.hs
@@ -28,7 +28,7 @@ generateVector :: Int -> IO (PArray Double)
generateVector n
= do
vec <- generateVectorU n
- return $ P.fromUArrPA' vec
+ return $ P.fromUArray vec
generateVectors :: Int -> IO (PArray Double, PArray Double)
generateVectors n =
diff --git a/testsuite/tests/dph/quickhull/Main.hs b/testsuite/tests/dph/quickhull/Main.hs
index ec59390850..5c1f9e6b01 100644
--- a/testsuite/tests/dph/quickhull/Main.hs
+++ b/testsuite/tests/dph/quickhull/Main.hs
@@ -19,8 +19,8 @@ import TestData
runQuickhull :: PArray QH.Point -> [(Double, Double)]
runQuickhull pts
= let result = quickhull pts
- resxs = P.toUArrPA (QH.xsOf result)
- resys = P.toUArrPA (QH.ysOf result)
+ resxs = P.toUArray (QH.xsOf result)
+ resys = P.toUArray (QH.ysOf result)
in resxs U.!: 0 `seq` (zip (U.toList resxs) (U.toList resys))
diff --git a/testsuite/tests/dph/quickhull/TestData.hs b/testsuite/tests/dph/quickhull/TestData.hs
index 6317927259..da112f1c99 100644
--- a/testsuite/tests/dph/quickhull/TestData.hs
+++ b/testsuite/tests/dph/quickhull/TestData.hs
@@ -86,7 +86,7 @@ toPArrayPoints ps
-- | Force points to be evaluated
force pts
- = P.toUArrPA (QH.xsOf pts) U.!: 0 D.+
- P.toUArrPA (QH.ysOf pts) U.!: 0
+ = P.toUArray (QH.xsOf pts) U.!: 0 D.+
+ P.toUArray (QH.ysOf pts) U.!: 0
diff --git a/testsuite/tests/dph/words/Main.hs b/testsuite/tests/dph/words/Main.hs
index bc706fb751..50804a6fe3 100644
--- a/testsuite/tests/dph/words/Main.hs
+++ b/testsuite/tests/dph/words/Main.hs
@@ -13,7 +13,7 @@ main
-- convert string to a PArray
let paStr :: PArray W.Word8
- paStr = fromUArrPA' $ U.map W.fromInt $ U.fromList $ map ord str
+ paStr = P.fromUArray $ U.map W.fromInt $ U.fromList $ map ord str
-- break the string into words then flatten it back