git.iko.soy/grenade
on master help sign in
Merge pull request #7 from erikd/master

Now builds with ghc 7.10 and 8.0

commita5398f7ec7f5e589491c04ee9e9e55efc9e93adf authorHuw Campbell <huw.campbell@gmail.com> dateFri 1 Jul 2016, 20:00 (10 years ago) parent047ee6ab4df23e
5 files changed+8−4
compare with master
unifiedsplit
README.md+1−1 grenade.cabal+1−1 mafia+1−1 src/Grenade/Core/Runner.hs+1−1 src/Grenade/Core/Shape.hs+4
README.md+1−1
@@ -54,7 +54,7 @@ and the tests run using:
5454./mafia test
5555```
5656
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.
5858
5959
6060Thanks
grenade.cabal+1−1
@@ -97,5 +97,5 @@ test-suite test
9797 , hmatrix
9898 , mtl
9999 , text == 1.2.*
100− , QuickCheck == 2.7.*
100+ , QuickCheck >= 2.7 && < 2.9
101101 , quickcheck-instances == 0.3.*
mafia+1−1
@@ -118,4 +118,4 @@ case "$MODE" in
118118upgrade) shift; run_upgrade "$@" ;;
119119*) exec_mafia "$@"
120120esac
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
2525 -> m (Network m hs)
2626train rate x0 target = fmap fst . go x0
2727 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)
2929 => S' j -- ^ input vector
3030 -> Network m' js -- ^ network to train
3131 -> m' (Network m' js, S' j)
src/Grenade/Core/Shape.hs+4
@@ -11,6 +11,10 @@
1111{-# LANGUAGE FlexibleContexts #-}
1212{-# LANGUAGE FlexibleInstances #-}
1313
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+
1418module Grenade.Core.Shape (
1519 Shape (..)
1620 , S' (..)