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

Make it build with ghc 8.4

Browse Source
This commit is contained in:
Erik de Castro Lopo 2018-09-16 17:36:16 +10:00
parent efd11f7960
commit 55e6719fcb
7 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Grenade/Core/Shape.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE GADTs #-} {-# LANGUAGE GADTs #-}
{-# LANGUAGE KindSignatures #-} {-# LANGUAGE KindSignatures #-}
@ -35,7 +36,11 @@ import Data.Singletons.TypeLits
import Data.Vector.Storable ( Vector ) import Data.Vector.Storable ( Vector )
import qualified Data.Vector.Storable as V import qualified Data.Vector.Storable as V
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import qualified Numeric.LinearAlgebra.Static as H import qualified Numeric.LinearAlgebra.Static as H
import Numeric.LinearAlgebra.Static import Numeric.LinearAlgebra.Static

5
src/Grenade/Layers/Convolution.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
@ -29,7 +30,11 @@ import Data.Proxy
import Data.Serialize import Data.Serialize
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import Numeric.LinearAlgebra hiding ( uniformSample, konst ) import Numeric.LinearAlgebra hiding ( uniformSample, konst )
import qualified Numeric.LinearAlgebra as LA import qualified Numeric.LinearAlgebra as LA

6
src/Grenade/Layers/Crop.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE GADTs #-} {-# LANGUAGE GADTs #-}
@ -20,7 +21,12 @@ import Data.Maybe
import Data.Proxy import Data.Proxy
import Data.Serialize import Data.Serialize
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import Grenade.Core import Grenade.Core
import Grenade.Layers.Internal.Pad import Grenade.Layers.Internal.Pad

5
src/Grenade/Layers/Deconvolution.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
@ -33,7 +34,11 @@ import Data.Proxy
import Data.Serialize import Data.Serialize
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import Numeric.LinearAlgebra hiding ( uniformSample, konst ) import Numeric.LinearAlgebra hiding ( uniformSample, konst )
import qualified Numeric.LinearAlgebra as LA import qualified Numeric.LinearAlgebra as LA

6
src/Grenade/Layers/Pad.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE GADTs #-} {-# LANGUAGE GADTs #-}
@ -20,7 +21,12 @@ import Data.Maybe
import Data.Proxy import Data.Proxy
import Data.Serialize import Data.Serialize
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import Grenade.Core import Grenade.Core
import Grenade.Layers.Internal.Pad import Grenade.Layers.Internal.Pad

6
src/Grenade/Layers/Pooling.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE StandaloneDeriving #-}
@ -21,7 +22,12 @@ import Data.Maybe
import Data.Proxy import Data.Proxy
import Data.Serialize import Data.Serialize
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import Grenade.Core import Grenade.Core
import Grenade.Layers.Internal.Pooling import Grenade.Layers.Internal.Pooling

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

@ -23,8 +23,6 @@ import Data.Singletons
import Data.Singletons.Prelude.List import Data.Singletons.Prelude.List
import Data.Singletons.TypeLits import Data.Singletons.TypeLits
-- import Data.Type.Equality
import Hedgehog import Hedgehog
import qualified Hedgehog.Gen as Gen import qualified Hedgehog.Gen as Gen
import Hedgehog.Internal.Source import Hedgehog.Internal.Source
@ -32,7 +30,12 @@ import Hedgehog.Internal.Property ( failWith )
import Grenade import Grenade
#if MIN_VERSION_base(4,11,0)
import GHC.TypeLits hiding (natVal)
#else
import GHC.TypeLits import GHC.TypeLits
#endif
import GHC.TypeLits.Witnesses import GHC.TypeLits.Witnesses
import Test.Hedgehog.Compat import Test.Hedgehog.Compat
import Test.Hedgehog.TypeLits import Test.Hedgehog.TypeLits
@ -74,8 +77,9 @@ genNetwork =
, pure (SomeNetwork (Elu :~> rest :: Network ( Elu ': layers ) ( h ': h ': hs ))) , pure (SomeNetwork (Elu :~> rest :: Network ( Elu ': layers ) ( h ': h ': hs )))
, pure (SomeNetwork (Softmax :~> rest :: Network ( Softmax ': layers ) ( h ': h ': hs ))) , pure (SomeNetwork (Softmax :~> rest :: Network ( Softmax ': layers ) ( h ': h ': hs )))
, do -- Reshape to two dimensions , do -- Reshape to two dimensions
let divisors n = 1 : [x | x <- [2..(n-1)], n `rem` x == 0] let divisors :: Integer -> [Integer]
let len = natVal l divisors n = 1 : [x | x <- [2..(n-1)], n `rem` x == 0]
let len = fromIntegral $ natVal l
rs <- Gen.element $ divisors len rs <- Gen.element $ divisors len
let cs = len `quot` rs let cs = len `quot` rs
case ( someNatVal rs, someNatVal cs, someNatVal len ) of case ( someNatVal rs, someNatVal cs, someNatVal len ) of
@ -96,8 +100,8 @@ genNetwork =
, do -- Build a convolution layer with one filter output , do -- Build a convolution layer with one filter output
-- Figure out some kernel sizes which work for this layer -- Figure out some kernel sizes which work for this layer
-- There must be a better way than this... -- There must be a better way than this...
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0] let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0]
@ -136,8 +140,8 @@ genNetwork =
, do -- Build a convolution layer with one filter output , do -- Build a convolution layer with one filter output
-- Figure out some kernel sizes which work for this layer -- Figure out some kernel sizes which work for this layer
-- There must be a better way than this... -- There must be a better way than this...
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0] let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0]
@ -178,8 +182,8 @@ genNetwork =
pure (SomeNetwork (conv :~> rest :: Network ( Convolution channels 1 kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols channels) ': h ': hs ))) pure (SomeNetwork (conv :~> rest :: Network ( Convolution channels 1 kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols channels) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Pooling layer , do -- Build a Pooling layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0] let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0]
@ -215,8 +219,8 @@ genNetwork =
pure (SomeNetwork (Pooling :~> rest :: Network ( Pooling kernelRows kernelCols strideRows strideCols ': layers ) ( ('D2 inRows inCols) ': h ': hs ))) pure (SomeNetwork (Pooling :~> rest :: Network ( Pooling kernelRows kernelCols strideRows strideCols ': layers ) ( ('D2 inRows inCols) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Pad layer , do -- Build a Pad layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
pad_left <- choose 0 (output_r - 1) pad_left <- choose 0 (output_r - 1)
pad_right <- choose 0 (output_r - 1 - pad_left) pad_right <- choose 0 (output_r - 1 - pad_left)
@ -242,8 +246,8 @@ genNetwork =
pure (SomeNetwork (Pad :~> rest :: Network ( Pad padLeft padTop padRight padBottom ': layers ) ( ('D2 inputRows inputColumns) ': h ': hs ))) pure (SomeNetwork (Pad :~> rest :: Network ( Pad padLeft padTop padRight padBottom ': layers ) ( ('D2 inputRows inputColumns) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Crop layer , do -- Build a Crop layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
crop_left <- choose 0 10 crop_left <- choose 0 10
crop_right <- choose 0 10 crop_right <- choose 0 10
@ -275,9 +279,9 @@ genNetwork =
, do -- Build a convolution layer with one filter output , do -- Build a convolution layer with one filter output
-- Figure out some kernel sizes which work for this layer -- Figure out some kernel sizes which work for this layer
-- There must be a better way than this... -- There must be a better way than this...
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let output_f = natVal f let output_f = fromIntegral $ natVal f
let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0] let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0]
@ -318,9 +322,9 @@ genNetwork =
pure (SomeNetwork (conv :~> rest :: Network ( Convolution channels filters kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols channels) ': h ': hs ))) pure (SomeNetwork (conv :~> rest :: Network ( Convolution channels filters kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols channels) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Pooling layer , do -- Build a Pooling layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let output_f = natVal f let output_f = fromIntegral $ natVal f
let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0] let ok extent kernel = [stride | stride <- [ 1 .. extent ], (extent - kernel) `mod` stride == 0]
@ -359,9 +363,9 @@ genNetwork =
pure (SomeNetwork (Pooling :~> rest :: Network ( Pooling kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols filters) ': h ': hs ))) pure (SomeNetwork (Pooling :~> rest :: Network ( Pooling kernelRows kernelCols strideRows strideCols ': layers ) ( ('D3 inRows inCols filters) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Pad layer , do -- Build a Pad layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let output_f = natVal f let output_f = fromIntegral $ natVal f
pad_left <- choose 0 (output_r - 1) pad_left <- choose 0 (output_r - 1)
pad_right <- choose 0 (output_r - 1 - pad_left) pad_right <- choose 0 (output_r - 1 - pad_left)
@ -389,9 +393,9 @@ genNetwork =
pure (SomeNetwork (Pad :~> rest :: Network ( Pad padLeft padTop padRight padBottom ': layers ) ( ('D3 inputRows inputColumns filters) ': h ': hs ))) pure (SomeNetwork (Pad :~> rest :: Network ( Pad padLeft padTop padRight padBottom ': layers ) ( ('D3 inputRows inputColumns filters) ': h ': hs )))
_ -> Gen.discard -- Can't occur _ -> Gen.discard -- Can't occur
, do -- Build a Crop layer , do -- Build a Crop layer
let output_r = natVal r let output_r = fromIntegral $ natVal r
let output_c = natVal c let output_c = fromIntegral $ natVal c
let output_f = natVal f let output_f = fromIntegral $ natVal f
crop_left <- choose 0 10 crop_left <- choose 0 10
crop_right <- choose 0 10 crop_right <- choose 0 10