git.iko.soy/grenade
on master help sign in
Make tests work in 7.10 and 8.0
commit145aba4592eabd551ff8e11110b2b99a3753ba58 authorHuw Campbell <huw.campbell@ambiata.com> dateTue 7 Feb 2017, 16:11 (10 years ago) parentbad6d0e
3 files changed+15−5
compare with master
unifiedsplit
main/recurrent.hs−1 test/Test/Grenade/Layers/Nonlinear.hs+5 test/Test/Jack/TypeLits.hs+10−4
main/recurrent.hs−1
@@ -23,7 +23,6 @@ import Options.Applicative
2323import Grenade
2424import Grenade.Recurrent
2525
26−{-# OPTIONS_GHC -fno-redundant-imports #-}
2726-- The defininition for our simple recurrent network.
2827-- This file just trains a network to generate a repeating sequence
2928-- of 0 0 1.
test/Test/Grenade/Layers/Nonlinear.hs+5
@@ -1,4 +1,5 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE CPP #-}
23{-# LANGUAGE TemplateHaskell #-}
34{-# LANGUAGE DataKinds #-}
45{-# LANGUAGE KindSignatures #-}
@@ -10,6 +11,10 @@ module Test.Grenade.Layers.Nonlinear where
1011
1112import Data.Singletons
1213
14+#if __GLASGOW_HASKELL__ < 800
15+import Data.Proxy
16+#endif
17+
1318import Grenade
1419import GHC.TypeLits
1520
test/Test/Jack/TypeLits.hs+10−4
@@ -22,7 +22,13 @@ genNat = do
2222 Just n <- someNatVal <$> choose (1, 10)
2323 return n
2424
25−genShape :: Jack (SomeSing Shape)
25+#if __GLASGOW_HASKELL__ < 800
26+type Shape' = ('KProxy :: KProxy Shape)
27+#else
28+type Shape' = Shape
29+#endif
30+
31+genShape :: Jack (SomeSing Shape')
2632genShape
2733 = oneOf [
2834 genD1
@@ -30,20 +36,20 @@ genShape
3036 , genD3
3137 ]
3238
33−genD1 :: Jack (SomeSing Shape)
39+genD1 :: Jack (SomeSing Shape')
3440genD1 = do
3541 n <- genNat
3642 return $ case n of
3743 SomeNat (_ :: Proxy x) -> SomeSing (sing :: Sing ('D1 x))
3844
39−genD2 :: Jack (SomeSing Shape)
45+genD2 :: Jack (SomeSing Shape')
4046genD2 = do
4147 n <- genNat
4248 m <- genNat
4349 return $ case (n, m) of
4450 (SomeNat (_ :: Proxy x), SomeNat (_ :: Proxy y)) -> SomeSing (sing :: Sing ('D2 x y))
4551
46−genD3 :: Jack (SomeSing Shape)
52+genD3 :: Jack (SomeSing Shape')
4753genD3 = do
4854 n <- genNat
4955 m <- genNat