HuwCampbell/grenade
1
1
Fork 0
mirror of https://github.com/HuwCampbell/grenade.git synced 2024-11-22 06:55:13 +03:00
Code Issues Projects Releases Wiki Activity

fix test suite for GHCs 8.2 8.4 8.6

Browse Source
This commit is contained in:
Claude Heiland-Allen 2018-12-14 21:07:45 +00:00 committed by Erik de Castro Lopo
parent 6c39f41e1d
commit 84f54dbe9b
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/Test/Grenade/Layers/Convolution.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE GADTs #-} {-# LANGUAGE GADTs #-}
@ -15,6 +16,10 @@ import Data.Singletons ()
import GHC.TypeLits import GHC.TypeLits
import GHC.TypeLits.Witnesses import GHC.TypeLits.Witnesses
#if MIN_VERSION_base(4,9,0)
import Data.Kind (Type)
#endif
import Grenade.Core import Grenade.Core
import Grenade.Layers.Convolution import Grenade.Layers.Convolution
@ -25,7 +30,7 @@ import Test.Hedgehog.Hmatrix
import Test.Hedgehog.TypeLits import Test.Hedgehog.TypeLits
import Test.Hedgehog.Compat import Test.Hedgehog.Compat
data OpaqueConvolution :: * where data OpaqueConvolution :: Type where
OpaqueConvolution :: Convolution channels filters kernelRows kernelColumns strideRows strideColumns -> OpaqueConvolution OpaqueConvolution :: Convolution channels filters kernelRows kernelColumns strideRows strideColumns -> OpaqueConvolution
instance Show OpaqueConvolution where instance Show OpaqueConvolution where

7
test/Test/Grenade/Layers/FullyConnected.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE BangPatterns #-} {-# LANGUAGE BangPatterns #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
@ -12,6 +13,10 @@ import Data.Singletons ()
import GHC.TypeLits import GHC.TypeLits
#if MIN_VERSION_base(4,9,0)
import Data.Kind (Type)
#endif
import Grenade.Core import Grenade.Core
import Grenade.Layers.FullyConnected import Grenade.Layers.FullyConnected
@ -20,7 +25,7 @@ import Hedgehog
import Test.Hedgehog.Compat import Test.Hedgehog.Compat
import Test.Hedgehog.Hmatrix import Test.Hedgehog.Hmatrix
data OpaqueFullyConnected :: * where data OpaqueFullyConnected :: Type where
OpaqueFullyConnected :: (KnownNat i, KnownNat o) => FullyConnected i o -> OpaqueFullyConnected OpaqueFullyConnected :: (KnownNat i, KnownNat o) => FullyConnected i o -> OpaqueFullyConnected
instance Show OpaqueFullyConnected where instance Show OpaqueFullyConnected where

15
test/Test/Grenade/Layers/Pooling.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE KindSignatures #-} {-# LANGUAGE KindSignatures #-}
@ -9,6 +10,10 @@ module Test.Grenade.Layers.Pooling where
import Data.Proxy import Data.Proxy
import Data.Singletons () import Data.Singletons ()
#if MIN_VERSION_base(4,9,0)
import Data.Kind (Type)
#endif
import GHC.TypeLits import GHC.TypeLits
import Grenade.Layers.Pooling import Grenade.Layers.Pooling
@ -16,7 +21,7 @@ import Hedgehog
import Test.Hedgehog.Compat import Test.Hedgehog.Compat
data OpaquePooling :: * where data OpaquePooling :: Type where
OpaquePooling :: (KnownNat kh, KnownNat kw, KnownNat sh, KnownNat sw) => Pooling kh kw sh sw -> OpaquePooling OpaquePooling :: (KnownNat kh, KnownNat kw, KnownNat sh, KnownNat sw) => Pooling kh kw sh sw -> OpaquePooling
instance Show OpaquePooling where instance Show OpaquePooling where
@ -24,10 +29,10 @@ instance Show OpaquePooling where
genOpaquePooling :: Gen OpaquePooling genOpaquePooling :: Gen OpaquePooling
genOpaquePooling = do genOpaquePooling = do
Just kernelHeight <- someNatVal <$> choose 2 15 ~(Just kernelHeight) <- someNatVal <$> choose 2 15
Just kernelWidth <- someNatVal <$> choose 2 15 ~(Just kernelWidth ) <- someNatVal <$> choose 2 15
Just strideHeight <- someNatVal <$> choose 2 15 ~(Just strideHeight) <- someNatVal <$> choose 2 15
Just strideWidth <- someNatVal <$> choose 2 15 ~(Just strideWidth ) <- someNatVal <$> choose 2 15
case (kernelHeight, kernelWidth, strideHeight, strideWidth) of case (kernelHeight, kernelWidth, strideHeight, strideWidth) of
(SomeNat (_ :: Proxy kh), SomeNat (_ :: Proxy kw), SomeNat (_ :: Proxy sh), SomeNat (_ :: Proxy sw)) -> (SomeNat (_ :: Proxy kh), SomeNat (_ :: Proxy kw), SomeNat (_ :: Proxy sh), SomeNat (_ :: Proxy sw)) ->

5
test/Test/Grenade/Network.hs
View File

@ -35,6 +35,9 @@ import GHC.TypeLits hiding (natVal)
#else #else
import GHC.TypeLits import GHC.TypeLits
#endif #endif
#if MIN_VERSION_base(4,9,0)
import Data.Kind (Type)
#endif
import GHC.TypeLits.Witnesses import GHC.TypeLits.Witnesses
import Test.Hedgehog.Compat import Test.Hedgehog.Compat
@ -46,7 +49,7 @@ import Numeric.LinearAlgebra ( flatten )
import Numeric.LinearAlgebra.Static ( extract, norm_Inf ) import Numeric.LinearAlgebra.Static ( extract, norm_Inf )
import Unsafe.Coerce import Unsafe.Coerce
data SomeNetwork :: * where data SomeNetwork :: Type where
SomeNetwork :: ( SingI shapes, SingI (Head shapes), SingI (Last shapes), Show (Network layers shapes) ) => Network layers shapes -> SomeNetwork SomeNetwork :: ( SingI shapes, SingI (Head shapes), SingI (Last shapes), Show (Network layers shapes) ) => Network layers shapes -> SomeNetwork
instance Show SomeNetwork where instance Show SomeNetwork where

2
test/Test/Hedgehog/TypeLits.hs
View File

@ -24,7 +24,7 @@ import Test.Hedgehog.Compat
genNat :: Gen SomeNat genNat :: Gen SomeNat
genNat = do genNat = do
Just n <- someNatVal <$> choose 1 10 ~(Just n) <- someNatVal <$> choose 1 10
return n return n
#if __GLASGOW_HASKELL__ < 800 #if __GLASGOW_HASKELL__ < 800