git.iko.soy/streamly
on master help sign in
Fix build/travis config for ghc 7.10.3
b649592Harendra Kumar
.travis.yml+6−2
compare with master
unifiedsplit
@@ -14,8 +14,12 @@ cache:
14matrix:
14matrix:
15 include:
15 include:
16 # cabal/linux
16 # cabal/linux
17+ # cabal build for GHC 7.10.3 hangs
17− - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
18+ #- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
19+ #addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
20+
21+ - env: BUILD=stack RESOLVER=lts-6.35 CABALVER=1.22
18− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
22+ addons: {apt: {packages: [libgmp-dev,cabal-install-1.22], sources: [hvr-ghc]}}
19
23
20 # stack/linux use a pre-installed cabal-install for faster builds
24 # stack/linux use a pre-installed cabal-install for faster builds
21 # GHC 8.0.1
25 # GHC 8.0.1
benchmark/Main.hs+9
@@ -1,3 +1,5 @@
1+{-# LANGUAGE CPP #-}
2+
1module Main where
3module Main where
2
4
3import Control.Applicative (Alternative(..))
5import Control.Applicative (Alternative(..))
@@ -13,8 +15,10 @@ import qualified Asyncly as A
13import qualified Conduit.Simple as S
15import qualified Conduit.Simple as S
14import qualified Control.Monad.Logic as LG
16import qualified Control.Monad.Logic as LG
15import qualified Data.Machine as M
17import qualified Data.Machine as M
18+#if MIN_VERSION_transient(0,5,1)
16import qualified Transient.Internals as T
19import qualified Transient.Internals as T
17import qualified Transient.Indeterminism as T
20import qualified Transient.Indeterminism as T
21+#endif
18import qualified ListT as LT
22import qualified ListT as LT
19
23
20main :: IO ()
24main :: IO ()
@@ -29,8 +33,10 @@ main = do
29 , bench "asyncly-interleaved-nil" $ nfIO (asyncly_nil (A.<=>))
33 , bench "asyncly-interleaved-nil" $ nfIO (asyncly_nil (A.<=>))
30 , bench "asyncly-parleft-nil" $ nfIO (asyncly_nil (A.<|))
34 , bench "asyncly-parleft-nil" $ nfIO (asyncly_nil (A.<|))
31 , bench "asyncly-parinterleaved-nil" $ nfIO (asyncly_nil (A.<|>))
35 , bench "asyncly-parinterleaved-nil" $ nfIO (asyncly_nil (A.<|>))
36+#if MIN_VERSION_transient(0,5,1)
32 , bench "transient" $ nfIO transient_basic
37 , bench "transient" $ nfIO transient_basic
33 , bench "transient-nil" $ nfIO transient_nil
38 , bench "transient-nil" $ nfIO transient_nil
39+#endif
34 , bench "logict" $ nfIO logict_basic
40 , bench "logict" $ nfIO logict_basic
35 , bench "list-t" $ nfIO list_t_basic
41 , bench "list-t" $ nfIO list_t_basic
36 , bench "simple-conduit" $ nfIO simple_conduit_basic
42 , bench "simple-conduit" $ nfIO simple_conduit_basic
@@ -58,6 +64,7 @@ drop num x = do
58 guard mn
64 guard mn
59 return x
65 return x
60
66
67+#if MIN_VERSION_transient(0,5,1)
61tmap :: (a -> Int) -> a -> T.TransIO Int
68tmap :: (a -> Int) -> a -> T.TransIO Int
62tmap = Main.map
69tmap = Main.map
63
70
@@ -68,6 +75,7 @@ tdrop :: Int -> Int -> T.TransIO Int
68tdrop = Main.drop
75tdrop = Main.drop
69
76
70transient_basic :: IO (Maybe Int)
77transient_basic :: IO (Maybe Int)
78+
71transient_basic = T.keep' $ T.threads 0 $ do
79transient_basic = T.keep' $ T.threads 0 $ do
72 liftIO $ writeIORef count 0
80 liftIO $ writeIORef count 0
73 xs <- T.group 49900 $ do
81 xs <- T.group 49900 $ do
@@ -87,6 +95,7 @@ transient_nil = T.keep' $ T.threads 0 $ do
87 T.choose [1..100000 :: Int]
95 T.choose [1..100000 :: Int]
88 assert (Prelude.length xs == 49900) $
96 assert (Prelude.length xs == 49900) $
89 T.exit (Prelude.length xs)
97 T.exit (Prelude.length xs)
98+#endif
90
99
91amap :: (Int -> Int) -> Int -> A.AsyncT IO Int
100amap :: (Int -> Int) -> Int -> A.AsyncT IO Int
92amap = Main.map
101amap = Main.map