on master help sign in
Merge pull request #7 from erikd/master
a5398f7Huw Campbell
README.md+1−1
@@ -54,7 +54,7 @@ and the tests run using:
54./mafia test
54./mafia test
55```
55```
56
56
57−Grenade is currently known to build with ghc 7.10. We are working on making it build with ghc 8.0.
57+Grenade is currently known to build with ghc 7.10 and 8.0.
58
58
59
59
60Thanks
60Thanks
grenade.cabal+1−1
@@ -97,5 +97,5 @@ test-suite test
97 , hmatrix
97 , hmatrix
98 , mtl
98 , mtl
99 , text == 1.2.*
99 , text == 1.2.*
100− , QuickCheck == 2.7.*
100+ , QuickCheck >= 2.7 && < 2.9
101 , quickcheck-instances == 0.3.*
101 , quickcheck-instances == 0.3.*
mafia+1−1
@@ -118,4 +118,4 @@ case "$MODE" in
118upgrade) shift; run_upgrade "$@" ;;
118upgrade) shift; run_upgrade "$@" ;;
119*) exec_mafia "$@"
119*) exec_mafia "$@"
120esac
120esac
121−# Version: dbbe635d8f98be1815130f04465c155f414985bf
121+# Version: a1b39ee8ac1969ed2e891b9062d079be75863e99
src/Grenade/Core/Runner.hs+1−1
@@ -25,7 +25,7 @@ train :: forall m i o hs. (Monad m, Head hs ~ i, Last hs ~ o, KnownShape i, Know
25 -> m (Network m hs)
25 -> m (Network m hs)
26train rate x0 target = fmap fst . go x0
26train rate x0 target = fmap fst . go x0
27 where
27 where
28− go :: forall m' j js. (Monad m', Head js ~ j, Last js ~ o, KnownShape j, KnownShape o)
28+ go :: forall m' j js. (Monad m', Head js ~ j, Last js ~ o, KnownShape j)
29 => S' j -- ^ input vector
29 => S' j -- ^ input vector
30 -> Network m' js -- ^ network to train
30 -> Network m' js -- ^ network to train
31 -> m' (Network m' js, S' j)
31 -> m' (Network m' js, S' j)
src/Grenade/Core/Shape.hs+4
@@ -11,6 +11,10 @@
11{-# LANGUAGE FlexibleContexts #-}
11{-# LANGUAGE FlexibleContexts #-}
12{-# LANGUAGE FlexibleInstances #-}
12{-# LANGUAGE FlexibleInstances #-}
13
13
14+-- Ghc 8.0 gives a warning on `(+) _ _ = error ...` but ghc 7.10 fails to
15+-- compile without this default pattern.
16+{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
17+
14module Grenade.Core.Shape (
18module Grenade.Core.Shape (
15 Shape (..)
19 Shape (..)
16 , S' (..)
20 , S' (..)