git.iko.soy/typerep-map
on main help sign in
Update ghc version and travis config
f78299evrom911
.gitignore+2
compare with main
unifiedsplit
@@ -20,6 +20,8 @@ cabal.sandbox.config
20cabal.config
20cabal.config
21cabal.project.local
21cabal.project.local
22.HTF/
22.HTF/
23+.ghc.environment.*
24+
23# Stack
25# Stack
24.stack-work/
26.stack-work/
25
27
.travis.yml+83−26
@@ -1,28 +1,85 @@
1−# Use new container infrastructure to enable caching
2−sudo: false
1+sudo: true
3−
4−# Choose a lightweight base image; we provide our own build tools.
5−language: c
2+language: generic
6−
3+
7−# GHC depends on GMP. You can add other dependencies here as well.
4+git:
8−addons:
5+ depth: 5
9− apt:
6+
10− packages:
11− - libgmp-dev
12−
13−before_install:
14−# Download and unpack the stack executable
15−- mkdir -p ~/.local/bin
16−- export PATH=$HOME/.local/bin:$PATH
17−- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
18−
19−# This line does all of the work: installs GHC if necessary, builds the
20−# library, executables, and test suites, and runs the test suites.
21−# `--no-terminal works` around some quirks in Travis's terminal implementation.
22−script: stack --no-terminal --install-ghc test
23−
24−# Caching so the next build will be fast too.
25cache:
7cache:
26 directories:
8 directories:
9+ - "$HOME/.cabal"
10+ - "$HOME/.ghc"
27− - $HOME/.stack
11+ - "$HOME/.stack"
12+ - ".stack-work"
13+
14+matrix:
15+
16+ include:
17+
18+ - ghc: 8.0.2
19+ env: GHCVER='8.0.2' CABALVER='head'
20+ os: linux
21+ addons:
22+ apt:
23+ sources:
24+ - hvr-ghc
25+ packages:
26+ - ghc-8.0.2
27+ - cabal-install-head
28+
29+ - ghc: 8.2.2
30+ env: GHCVER='8.2.2' CABALVER='head'
31+ os: linux
32+ addons:
33+ apt:
34+ sources:
35+ - hvr-ghc
36+ packages:
37+ - ghc-8.2.2
38+ - cabal-install-head
39+
40+ - ghc: 8.4.3
41+ env: GHCVER='8.4.3' CABALVER='head'
42+ os: linux
43+ addons:
44+ apt:
45+ sources:
46+ - hvr-ghc
47+ packages:
48+ - ghc-8.4.3
49+ - cabal-install-head
50+
51+ - ghc: 8.4.3
28− - $HOME/build/vrom911/typerep-map/.stack-work
52+ env: STACK_YAML="$HOME/build/vrom911/typerep-map/stack.yaml"
53+ os: linux
54+ addons:
55+ apt:
56+ packages:
57+ - libgmp-dev
58+
59+install:
60+ - |
61+ if [ -z "$STACK_YAML" ]; then
62+ export PATH="/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH"
63+ echo $PATH
64+ cabal new-update
65+ cabal new-build --enable-tests --enable-benchmarks
66+ else
67+ mkdir -p ~/.local/bin
68+ export PATH="$HOME/.local/bin:$PATH"
69+ travis_retry curl -L 'https://www.stackage.org/stack/linux-x86_64' | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
70+ stack --version
71+ stack setup --no-terminal --install-cabal 2.0.1.0
72+ stack ghc -- --version
73+ stack build --only-dependencies --no-terminal
74+ fi
75+
76+script:
77+ - |
78+ if [ -z "$STACK_YAML" ]; then
79+ cabal new-test
80+ else
81+ stack build --test --bench --no-terminal
82+ fi
83+
84+notifications:
85+ email: false
benchmark/Map.hs+3−3
@@ -19,14 +19,14 @@ import Criterion.Main (Benchmark, bench, bgroup, nf)
19
19
20import Prelude hiding (lookup)
20import Prelude hiding (lookup)
21
21
22−import Control.Exception
23import Control.DeepSeq (rnf)
22import Control.DeepSeq (rnf)
23+import Control.Exception
24import Data.Maybe (fromJust)
24import Data.Maybe (fromJust)
25import Data.Proxy (Proxy (..))
25import Data.Proxy (Proxy (..))
26import Data.Typeable (Typeable)
26import Data.Typeable (Typeable)
27import GHC.TypeLits
27import GHC.TypeLits
28
28
29−import Data.TypeRep.Map (TypeRepMap (..), empty, insert, lookup, keys)
29+import Data.TypeRep.Map (TypeRepMap (..), empty, insert, keys, lookup)
30
30
31benchMap :: Benchmark
31benchMap :: Benchmark
32benchMap = bgroup "map"
32benchMap = bgroup "map"
@@ -48,7 +48,7 @@ tenLookups tmap = (lp, lp, lp, lp, lp, lp, lp, lp)
48bigMap :: TypeRepMap (Proxy :: Nat -> *)
48bigMap :: TypeRepMap (Proxy :: Nat -> *)
49bigMap = buildBigMap 10000 (Proxy :: Proxy 0) empty
49bigMap = buildBigMap 10000 (Proxy :: Proxy 0) empty
50
50
51−buildBigMap :: forall a . (Typeable a, KnownNat a) => Int -> Proxy (a :: Nat) -> TypeRepMap (Proxy :: Nat -> *) -> TypeRepMap (Proxy :: Nat -> *)
51+buildBigMap :: forall a . (KnownNat a) => Int -> Proxy (a :: Nat) -> TypeRepMap (Proxy :: Nat -> *) -> TypeRepMap (Proxy :: Nat -> *)
52buildBigMap 1 x = insert x
52buildBigMap 1 x = insert x
53buildBigMap n x = insert x . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
53buildBigMap n x = insert x . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
54
54
benchmark/OptimalVector.hs+2−2
@@ -18,8 +18,8 @@ import Criterion.Main (Benchmark, bench, bgroup, nf)
18
18
19import Prelude hiding (lookup)
19import Prelude hiding (lookup)
20
20
21−import Control.Exception
22import Control.DeepSeq (rnf)
21import Control.DeepSeq (rnf)
22+import Control.Exception
23import Data.Maybe (fromJust)
23import Data.Maybe (fromJust)
24import Data.Proxy (Proxy (..))
24import Data.Proxy (Proxy (..))
25import Data.Typeable (Typeable)
25import Data.Typeable (Typeable)
@@ -47,7 +47,7 @@ tenLookups tmap = (lp, lp, lp, lp, lp, lp, lp, lp)
47bigMap :: TypeRepVector (Proxy :: Nat -> *)
47bigMap :: TypeRepVector (Proxy :: Nat -> *)
48bigMap = fromList $ buildBigMap 10000 (Proxy :: Proxy 0) []
48bigMap = fromList $ buildBigMap 10000 (Proxy :: Proxy 0) []
49
49
50−buildBigMap :: forall a . (Typeable a, KnownNat a) => Int -> Proxy (a :: Nat) -> [TF (Proxy :: Nat -> *)] -> [TF (Proxy :: Nat -> *)]
50+buildBigMap :: forall a . (KnownNat a) => Int -> Proxy (a :: Nat) -> [TF (Proxy :: Nat -> *)] -> [TF (Proxy :: Nat -> *)]
51buildBigMap 1 x = (TF x :)
51buildBigMap 1 x = (TF x :)
52buildBigMap n x = (TF x :) . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
52buildBigMap n x = (TF x :) . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
53
53
benchmark/Vector.hs+2−2
@@ -18,8 +18,8 @@ import Criterion.Main (Benchmark, bench, bgroup, nf)
18
18
19import Prelude hiding (lookup)
19import Prelude hiding (lookup)
20
20
21−import Control.Exception
22import Control.DeepSeq (rnf)
21import Control.DeepSeq (rnf)
22+import Control.Exception
23import Data.Maybe (fromJust)
23import Data.Maybe (fromJust)
24import Data.Proxy (Proxy (..))
24import Data.Proxy (Proxy (..))
25import Data.Typeable (Typeable)
25import Data.Typeable (Typeable)
@@ -47,7 +47,7 @@ tenLookups tmap = (lp, lp, lp, lp, lp, lp, lp, lp)
47bigMap :: TypeRepVector (Proxy :: Nat -> *)
47bigMap :: TypeRepVector (Proxy :: Nat -> *)
48bigMap = fromList $ buildBigMap 10000 (Proxy :: Proxy 0) []
48bigMap = fromList $ buildBigMap 10000 (Proxy :: Proxy 0) []
49
49
50−buildBigMap :: forall a . (Typeable a, KnownNat a) => Int -> Proxy (a :: Nat) -> [TF (Proxy :: Nat -> *)] -> [TF (Proxy :: Nat -> *)]
50+buildBigMap :: forall a . (KnownNat a) => Int -> Proxy (a :: Nat) -> [TF (Proxy :: Nat -> *)] -> [TF (Proxy :: Nat -> *)]
51buildBigMap 1 x = (TF x :)
51buildBigMap 1 x = (TF x :)
52buildBigMap n x = (TF x :) . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
52buildBigMap n x = (TF x :) . buildBigMap (n - 1) (Proxy :: Proxy (a + 1))
53
53
stack.yaml+1−11
@@ -1,11 +1 @@
1−resolver: lts-9.18
1+resolver: lts-11.15
2−
3−packages:
4−- .
5−
6−extra-deps:
7−- tasty-discover-4.1.1
8−
9−flags: {}
10−
11−extra-package-dbs: []
typerep-map.cabal+5−2
@@ -11,8 +11,10 @@ copyright: 2017 Veronika Romashkina
11category: Data Structures
11category: Data Structures
12build-type: Simple
12build-type: Simple
13extra-source-files: README.md
13extra-source-files: README.md
14−cabal-version: >=1.10
14+cabal-version: 2.0
15−tested-with: GHC == 8.0.1
15+tested-with: GHC == 8.0.2
16+ , GHC == 8.2.2
17+ , GHC == 8.4.3
16
18
17library
19library
18 hs-source-dirs: src
20 hs-source-dirs: src
@@ -38,6 +40,7 @@ test-suite typerep-map-test
38 , tasty
40 , tasty
39 , tasty-discover >= 4.1.1
41 , tasty-discover >= 4.1.1
40 , tasty-hspec
42 , tasty-hspec
43+ build-tool-depends: tasty-discover:tasty-discover
41 ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N
44 ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N
42 default-language: Haskell2010
45 default-language: Haskell2010
43
46