master..8d5ef50 · grenade

.gitignore+1−3

@@ -1,6 +1,4 @@

1−cabal.project.local

21.cabal-sandbox/

32cabal.sandbox.config

43dist/

5−dist-newstyle/

6−.stack-work/

4+

.travis.yml+11−12

@@ -2,30 +2,29 @@

22

33# The following enables several GHC versions to be tested; often it's enough to test only against the last release in a major GHC version. Feel free to omit lines listings versions you don't need/want testing for.

44env:

5− - GHCVER=8.0.2

6− - GHCVER=8.2.2

7− - GHCVER=8.4.4

8− - GHCVER=8.6.5

9− - GHCVER=8.8.3

10− - GHCVER=8.10.1

5+ - CABALVER=1.24 GHCVER=8.0.2

6+ - CABALVER=2.0 GHCVER=8.2.2

7+ - CABALVER=2.0 GHCVER=8.4.4

118

129# Note: the distinction between `before_install` and `install` is not important.

1310before_install:

1411 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc

1512 - travis_retry sudo apt-get update

16− - travis_retry sudo apt-get install cabal-install-3.2 ghc-$GHCVER libblas-dev liblapack-dev

17− - export PATH=/opt/cabal/bin:/opt/ghc/$GHCVER/bin:$PATH

13+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER happy-1.19.5 alex-3.1.7 libblas-dev liblapack-dev

14+ - export PATH=/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.cabal/bin:$PATH

1815

1916install:

17+ - cabal --version

2018 - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"

21− - travis_retry cabal-3.2 update

19+ - travis_retry cabal update

20+ - cabal sandbox init

21+ - cabal install --enable-tests --enable-benchmarks

2222

2323notifications:

2424 email: false

2525

2626# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.

2727script:

28− - cabal-3.2 configure --enable-tests

29− - cabal-3.2 build all

30− - cabal-3.2 test --test-show-details=direct -j1

28+ - cabal build

29+ - cabal test --show-details=streaming

3130

examples/grenade-examples.cabal+9−10

@@ -26,7 +26,7 @@ executable feedforward

2626 , bytestring

2727 , cereal

2828 , either

29− , optparse-applicative >= 0.13 && < 0.18

29+ , optparse-applicative >= 0.13 && < 0.15

3030 , text == 1.2.*

3131 , mtl >= 2.2.1 && < 2.3

3232 , hmatrix

@@ -42,10 +42,10 @@ executable mnist

4242 , grenade

4343 , attoparsec

4444 , either

45− , optparse-applicative >= 0.13 && < 0.18

45+ , optparse-applicative >= 0.13 && < 0.15

4646 , text == 1.2.*

4747 , mtl >= 2.2.1 && < 2.3

48− , hmatrix >= 0.18 && < 0.21

48+ , hmatrix >= 0.18 && < 0.19

4949 , transformers

5050 , semigroups

5151 , singletons

@@ -61,10 +61,10 @@ executable gan-mnist

6161 , bytestring

6262 , cereal

6363 , either

64− , optparse-applicative >= 0.13 && < 0.18

64+ , optparse-applicative >= 0.13 && < 0.15

6565 , text == 1.2.*

6666 , mtl >= 2.2.1 && < 2.3

67− , hmatrix >= 0.18 && < 0.21

67+ , hmatrix >= 0.18 && < 0.19

6868 , transformers

6969 , semigroups

7070 , singletons

@@ -78,10 +78,10 @@ executable recurrent

7878 , grenade

7979 , attoparsec

8080 , either

81− , optparse-applicative >= 0.13 && < 0.18

81+ , optparse-applicative >= 0.13 && < 0.15

8282 , text == 1.2.*

8383 , mtl >= 2.2.1 && < 2.3

84− , hmatrix >= 0.18 && < 0.21

84+ , hmatrix >= 0.18 && < 0.19

8585 , transformers

8686 , semigroups

8787 , singletons

@@ -96,14 +96,13 @@ executable shakespeare

9696 , bytestring

9797 , cereal

9898 , either

99− , optparse-applicative >= 0.13 && < 0.18

99+ , optparse-applicative >= 0.13 && < 0.15

100100 , text == 1.2.*

101101 , mtl >= 2.2.1 && < 2.3

102− , hmatrix >= 0.18 && < 0.21

102+ , hmatrix >= 0.18 && < 0.19

103103 , transformers

104104 , semigroups

105105 , singletons

106− , singletons-base

107106 , vector

108107 , MonadRandom

109108 , containers

examples/main/feedforward.hs+1−3

@@ -1,5 +1,4 @@

11{-# LANGUAGE BangPatterns #-}

2−{-# LANGUAGE CPP #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE ScopedTypeVariables #-}

54{-# LANGUAGE TypeOperators #-}

@@ -11,9 +10,8 @@ import Data.List ( foldl' )

1110

1211import qualified Data.ByteString as B

1312import Data.Serialize

14−#if ! MIN_VERSION_base(4,13,0)

1513import Data.Semigroup ( (<>) )

16−#endif

14+

1715import GHC.TypeLits

1816

1917import qualified Numeric.LinearAlgebra.Static as SA

examples/main/gan-mnist.hs−3

@@ -1,5 +1,4 @@

11{-# LANGUAGE BangPatterns #-}

2−{-# LANGUAGE CPP #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE GADTs #-}

54{-# LANGUAGE ScopedTypeVariables #-}

@@ -44,9 +43,7 @@ import Control.Monad.Trans.Except

4443import qualified Data.Attoparsec.Text as A

4544import qualified Data.ByteString as B

4645import Data.List ( foldl' )

47−#if ! MIN_VERSION_base(4,13,0)

4846import Data.Semigroup ( (<>) )

49−#endif

5047import Data.Serialize

5148import qualified Data.Text as T

5249import qualified Data.Text.IO as T

examples/main/mnist.hs−4

@@ -1,5 +1,4 @@

11{-# LANGUAGE BangPatterns #-}

2−{-# LANGUAGE CPP #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE ScopedTypeVariables #-}

54{-# LANGUAGE TypeOperators #-}

@@ -14,10 +13,7 @@ import Control.Monad.Trans.Except

1413

1514import qualified Data.Attoparsec.Text as A

1615import Data.List ( foldl' )

17−#if ! MIN_VERSION_base(4,13,0)

1816import Data.Semigroup ( (<>) )

19−#endif

20−

2117import qualified Data.Text as T

2218import qualified Data.Text.IO as T

2319import qualified Data.Vector.Storable as V

examples/main/recurrent.hs+2−2

@@ -9,12 +9,12 @@

99import Control.Monad ( foldM )

1010import Control.Monad.Random ( MonadRandom, getRandomR )

1111

12−#if MIN_VERSION_base(4,13,0)

12+#if __GLASGOW_HASKELL__ < 800

1313import Data.List ( unfoldr )

1414#else

1515import Data.List ( cycle, unfoldr )

16−import Data.Semigroup ( (<>) )

1716#endif

17+import Data.Semigroup ( (<>) )

1818

1919import qualified Numeric.LinearAlgebra.Static as SA

2020

examples/main/shakespeare.hs+16−16

@@ -1,5 +1,5 @@

11{-# LANGUAGE BangPatterns #-}

2−{-# LANGUAGE CPP #-}

2+{-# LANGUAGE RecordWildCards #-}

33{-# LANGUAGE DataKinds #-}

44{-# LANGUAGE ScopedTypeVariables #-}

55{-# LANGUAGE TypeOperators #-}

@@ -13,16 +13,18 @@ import Control.Monad.Trans.Except

1313import Data.Char ( isUpper, toUpper, toLower )

1414import Data.List ( foldl' )

1515import Data.Maybe ( fromMaybe )

16−

16+import Data.Semigroup ( (<>) )

1717

1818import qualified Data.Vector as V

1919import Data.Vector ( Vector )

2020

2121import qualified Data.Map as M

22+import Data.Proxy ( Proxy (..) )

2223

2324import qualified Data.ByteString as B

2425import Data.Serialize

2526

27+import Data.Singletons.Prelude

2628import GHC.TypeLits

2729

2830import Numeric.LinearAlgebra.Static ( konst )

@@ -34,8 +36,6 @@ import Grenade.Recurrent

3436import Grenade.Utils.OneHot

3537

3638import System.IO.Unsafe ( unsafeInterleaveIO )

37−import Data.Proxy

38−import Prelude.Singletons

3939

4040-- The defininition for our natural language recurrent network.

4141-- This network is able to learn and generate simple words in

@@ -77,34 +77,34 @@ loadShakespeare path = do

7777 return (V.fromList hot, m, cs)

7878

7979trainSlice :: LearningParameters -> Shakespeare -> Shakespearian -> Vector Int -> Int -> Int -> (Shakespeare, Shakespearian)

80−trainSlice !lrate !net !recIns input offset size =

80+trainSlice !rate !net !recIns input offset size =

8181 let e = fmap (x . oneHot) . V.toList $ V.slice offset size input

8282 in case reverse e of

8383 (o : l : xs) ->

8484 let examples = reverse $ (l, Just o) : ((,Nothing) <$> xs)

85− in trainRecurrent lrate net recIns examples

85+ in trainRecurrent rate net recIns examples

8686 _ -> error "Not enough input"

8787 where

8888 x = fromMaybe (error "Hot variable didn't fit.")

8989

9090runShakespeare :: ShakespeareOpts -> ExceptT String IO ()

91−runShakespeare opts = do

92− (shakespeare, oneHotMap, oneHotDictionary) <- loadShakespeare $ trainingFile opts

91+runShakespeare ShakespeareOpts {..} = do

92+ (shakespeare, oneHotMap, oneHotDictionary) <- loadShakespeare trainingFile

9393 (net0, i0) <- lift $

94− case loadPath opts of

94+ case loadPath of

9595 Just loadFile -> netLoad loadFile

9696 Nothing -> (,0) <$> randomNet

9797

9898 (trained, bestInput) <- lift $ foldM (\(!net, !io) size -> do

99− xs <- take (iterations opts `div` 10) <$> getRandomRs (0, length shakespeare - size - 1)

100− let (!trained, !bestInput) = foldl' (\(!n, !i) offset -> trainSlice (rate opts) n i shakespeare offset size) (net, io) xs

101− results <- take 1000 <$> generateParagraph trained bestInput (temperature opts) oneHotMap oneHotDictionary ( S1D $ konst 0)

99+ xs <- take (iterations `div` 10) <$> getRandomRs (0, length shakespeare - size - 1)

100+ let (!trained, !bestInput) = foldl' (\(!n, !i) offset -> trainSlice rate n i shakespeare offset size) (net, io) xs

101+ results <- take 1000 <$> generateParagraph trained bestInput temperature oneHotMap oneHotDictionary ( S1D $ konst 0)

102102 putStrLn ("TRAINING STEP WITH SIZE: " ++ show size)

103103 putStrLn (unAnnotateCapitals results)

104104 return (trained, bestInput)

105− ) (net0, i0) $ replicate 10 (sequenceSize opts)

105+ ) (net0, i0) $ replicate 10 sequenceSize

106106

107− case savePath opts of

107+ case savePath of

108108 Just saveFile -> lift . B.writeFile saveFile $ runPut (put trained >> put bestInput)

109109 Nothing -> return ()

110110

@@ -116,12 +116,12 @@ generateParagraph :: forall layers shapes n a. (Last shapes ~ 'D1 n, Head shapes

116116 -> Vector a

117117 -> S ('D1 n)

118118 -> IO [a]

119−generateParagraph n s temp hotmap hotdict =

119+generateParagraph n s temperature hotmap hotdict =

120120 go s

121121 where

122122 go x y =

123123 do let (_, ns, o) = runRecurrent n x y

124− un <- sample temp hotdict o

124+ un <- sample temperature hotdict o

125125 Just re <- return $ makeHot hotmap un

126126 rest <- unsafeInterleaveIO $ go ns re

127127 return (un : rest)

grenade.cabal+7−19

@@ -7,7 +7,7 @@ maintainer: Huw Campbell <huw.campbell@gmail.com>

88synopsis: Practical Deep Learning in Haskell

99category: AI, Machine Learning

10−cabal-version: >= 1.10

10+cabal-version: >= 1.8

1111build-type: Simple

1212description:

1313 Grenade is a composable, dependently typed, practical, and fast

@@ -38,17 +38,16 @@ source-repository head

3838library

3939 build-depends:

4040 base >= 4.8 && < 5

41− , bytestring >= 0.10.0

41+ , bytestring == 0.10.*

4242 , containers >= 0.5 && < 0.7

4343 , cereal >= 0.5 && < 0.6

4444 , deepseq >= 1.4 && < 1.5

45− , hmatrix >= 0.18 && < 0.21

45+ , hmatrix >= 0.18 && < 0.20

4646 , MonadRandom >= 0.4 && < 0.6

47− , primitive >= 0.6 && < 0.8

47+ , primitive >= 0.6 && < 0.7

4848 -- Versions of singletons are *tightly* coupled with the

4949 -- GHC version so its fine to drop version bounds.

5050 , singletons

51− , singletons-base

5251 , vector >= 0.11 && < 0.13

5352

5453 ghc-options:

@@ -56,8 +55,6 @@ library

5655 hs-source-dirs:

5756 src

5857

59− default-language: Haskell2010

60−

6158 if impl(ghc < 8.0)

6259 ghc-options: -fno-warn-incomplete-patterns

6360 cpp-options: -DType=*

@@ -132,7 +129,6 @@ test-suite test

132129 hs-source-dirs:

133130 test

134131

135− default-language: Haskell2010

136132

137133 other-modules: Test.Hedgehog.Compat

138134 Test.Hedgehog.Hmatrix

@@ -153,20 +149,16 @@ test-suite test

153149

154150 if impl(ghc < 8.0)

155151 ghc-options: -fno-warn-incomplete-patterns

156− cpp-options: -DType=*

157−

158− if impl(ghc >= 8.6)

159− default-extensions: NoStarIsType

160152

161153 build-depends:

162154 base

163155 , grenade

164− , hedgehog >= 1.0 && < 1.1

156+ , hedgehog >= 0.5 && < 0.7

165157 , hmatrix

166158 , mtl

167159 , singletons

168160 , text == 1.2.*

169− , typelits-witnesses < 0.4

161+ , typelits-witnesses

170162 , transformers

171163 , constraints

172164 , MonadRandom

@@ -186,12 +178,10 @@ benchmark bench

186178 hs-source-dirs:

187179 bench

188180

189− default-language: Haskell2010

190−

191181 build-depends:

192182 base

193183 , bytestring

194− , criterion >= 1.1 && < 1.6

184+ , criterion >= 1.1 && < 1.5

195185 , grenade

196186 , hmatrix

197187

@@ -205,8 +195,6 @@ benchmark bench-lstm

205195 hs-source-dirs:

206196 bench

207197

208− default-language: Haskell2010

209−

210198 build-depends:

211199 base

212200 , bytestring

src/Grenade/Core/Network.hs+1−1

@@ -34,6 +34,7 @@ module Grenade.Core.Network (

3434import Control.Monad.Random ( MonadRandom )

3535

3636import Data.Singletons

37+import Data.Singletons.Prelude

3738import Data.Serialize

3839

3940#if MIN_VERSION_base(4,9,0)

@@ -43,7 +44,6 @@ import Data.Kind (Type)

4344import Grenade.Core.Layer

4445import Grenade.Core.LearningParameters

4546import Grenade.Core.Shape

46−import Prelude.Singletons

4747

4848-- | Type of a network.

4949--

src/Grenade/Core/Runner.hs+1−2

@@ -13,12 +13,11 @@ module Grenade.Core.Runner (

1313 , runNet

1414 ) where

1515

16+import Data.Singletons.Prelude

1617

1718import Grenade.Core.LearningParameters

1819import Grenade.Core.Network

1920import Grenade.Core.Shape

20−import Data.Singletons

21−import Prelude.Singletons

2221

2322-- | Perform reverse automatic differentiation on the network

2423-- for the current input and expected output.

src/Grenade/Core/Shape.hs+25−27

@@ -19,22 +19,30 @@ Stability : experimental

1919

2020-}

2121module Grenade.Core.Shape (

22− S (..)

23− , Shape (..)

24− , SShape (..)

22+ Shape (..)

23+ , S (..)

24+ , Sing (..)

25+

2526 , randomOfShape

2627 , fromStorable

2728 ) where

2829

2930import Control.DeepSeq (NFData (..))

3031import Control.Monad.Random ( MonadRandom, getRandom )

31−import Data.Kind (Type)

32+

3233import Data.Proxy

3334import Data.Serialize

3435import Data.Singletons

36+import Data.Singletons.TypeLits

3537import Data.Vector.Storable ( Vector )

3638import qualified Data.Vector.Storable as V

39+

40+#if MIN_VERSION_base(4,11,0)

41+import GHC.TypeLits hiding (natVal)

42+#else

3743import GHC.TypeLits

44+#endif

45+

3846import qualified Numeric.LinearAlgebra.Static as H

3947import Numeric.LinearAlgebra.Static

4048import qualified Numeric.LinearAlgebra as NLA

@@ -79,27 +87,17 @@ deriving instance Show (S n)

7987-- These could probably be derived with template haskell, but this seems

8088-- clear and makes adding the KnownNat constraints simple.

8189-- We can also keep our code TH free, which is great.

82−#if MIN_VERSION_singletons(2,6,0)

83−-- In singletons 2.6 Sing switched from a data family to a type family.

84−type instance Sing = SShape

85−

86−data SShape :: Shape -> Type where

87− D1Sing :: KnownNat a => SShape ('D1 a)

88− D2Sing :: (KnownNat a, KnownNat b) => SShape ('D2 a b)

89− D3Sing :: (KnownNat (a * c), KnownNat a, KnownNat b, KnownNat c) => SShape ('D3 a b c)

90−#else

9190data instance Sing (n :: Shape) where

9291 D1Sing :: Sing a -> Sing ('D1 a)

9392 D2Sing :: Sing a -> Sing b -> Sing ('D2 a b)

9493 D3Sing :: KnownNat (a * c) => Sing a -> Sing b -> Sing c -> Sing ('D3 a b c)

95−#endif

9694

9795instance KnownNat a => SingI ('D1 a) where

98− sing = D1Sing

96+ sing = D1Sing sing

9997instance (KnownNat a, KnownNat b) => SingI ('D2 a b) where

100− sing = D2Sing

98+ sing = D2Sing sing sing

10199instance (KnownNat a, KnownNat b, KnownNat c, KnownNat (a * c)) => SingI ('D3 a b c) where

102− sing = D3Sing

100+ sing = D3Sing sing sing sing

103101

104102instance SingI x => Num (S x) where

105103 (+) = n2 (+)

@@ -148,13 +146,13 @@ randomOfShape :: forall x m. ( MonadRandom m, SingI x ) => m (S x)

148146randomOfShape = do

149147 seed :: Int <- getRandom

150148 return $ case (sing :: Sing x) of

151− D1Sing ->

149+ D1Sing SNat ->

152150 S1D (randomVector seed Uniform * 2 - 1)

153151

154− D2Sing ->

152+ D2Sing SNat SNat ->

155153 S2D (uniformSample seed (-1) 1)

156154

157− D3Sing ->

155+ D3Sing SNat SNat SNat ->

158156 S3D (uniformSample seed (-1) 1)

159157

160158-- | Generate a shape from a Storable Vector.

@@ -162,13 +160,13 @@ randomOfShape = do

162160-- Returns Nothing if the vector is of the wrong size.

163161fromStorable :: forall x. SingI x => Vector Double -> Maybe (S x)

164162fromStorable xs = case sing :: Sing x of

165− D1Sing ->

163+ D1Sing SNat ->

166164 S1D <$> H.create xs

167165

168− D2Sing ->

166+ D2Sing SNat SNat ->

169167 S2D <$> mkL xs

170168

171− D3Sing ->

169+ D3Sing SNat SNat SNat ->

172170 S3D <$> mkL xs

173171 where

174172 mkL :: forall rows columns. (KnownNat rows, KnownNat columns)

@@ -205,13 +203,13 @@ n2 f (S2D x) (S2D y) = S2D (f x y)

205203n2 f (S3D x) (S3D y) = S3D (f x y)

206204

207205-- Helper function for creating the number instances

208−nk :: forall x. (SingI x) => Double -> S x

206+nk :: forall x. SingI x => Double -> S x

209207nk x = case (sing :: Sing x) of

210− D1Sing ->

208+ D1Sing SNat ->

211209 S1D (konst x)

212210

213− D2Sing ->

211+ D2Sing SNat SNat ->

214212 S2D (konst x)

215213

216− D3Sing ->

214+ D3Sing SNat SNat SNat ->

217215 S3D (konst x)

src/Grenade/Layers/Convolution.hs+10−2

@@ -1,6 +1,7 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE DataKinds #-}

33{-# LANGUAGE ScopedTypeVariables #-}

4+{-# LANGUAGE RecordWildCards #-}

45{-# LANGUAGE GADTs #-}

56{-# LANGUAGE TypeOperators #-}

67{-# LANGUAGE TypeFamilies #-}

@@ -28,9 +29,16 @@ import Control.Monad.Random hiding ( fromList )

2829import Data.Maybe

2930import Data.Proxy

3031import Data.Serialize

32+import Data.Singletons.TypeLits

3133

34+#if MIN_VERSION_base(4,11,0)

35+import GHC.TypeLits hiding (natVal)

36+#else

3237import GHC.TypeLits

38+#endif

39+#if MIN_VERSION_base(4,9,0)

3340import Data.Kind (Type)

41+#endif

3442

3543import Numeric.LinearAlgebra hiding ( uniformSample, konst )

3644import qualified Numeric.LinearAlgebra as LA

@@ -131,8 +139,8 @@ instance ( KnownNat channels

131139 , KnownNat (kernelRows * kernelColumns * channels)

132140 ) => UpdateLayer (Convolution channels filters kernelRows kernelColumns strideRows strideColumns) where

133141 type Gradient (Convolution channels filters kernelRows kernelColumns strideRows strideColumns) = (Convolution' channels filters kernelRows kernelColumns strideRows strideColumns)

134− runUpdate lp (Convolution oldKernel oldMomentum) (Convolution' kernelGradient) =

135− let (newKernel, newMomentum) = descendMatrix (learningRate lp) (learningMomentum lp) (learningRegulariser lp) oldKernel kernelGradient oldMomentum

142+ runUpdate LearningParameters {..} (Convolution oldKernel oldMomentum) (Convolution' kernelGradient) =

143+ let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum

136144 in Convolution newKernel newMomentum

137145

138146 createRandom = randomConvolution

src/Grenade/Layers/Crop.hs+7

@@ -21,9 +21,16 @@ module Grenade.Layers.Crop (

2121import Data.Maybe

2222import Data.Proxy

2323import Data.Serialize

24+import Data.Singletons.TypeLits

2425

26+#if MIN_VERSION_base(4,11,0)

27+import GHC.TypeLits hiding (natVal)

28+#else

2529import GHC.TypeLits

30+#endif

31+#if MIN_VERSION_base(4,9,0)

2632import Data.Kind (Type)

33+#endif

2734

2835import Grenade.Core

2936import Grenade.Layers.Internal.Pad

src/Grenade/Layers/Deconvolution.hs+10−2

@@ -1,6 +1,7 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE DataKinds #-}

33{-# LANGUAGE ScopedTypeVariables #-}

4+{-# LANGUAGE RecordWildCards #-}

45{-# LANGUAGE GADTs #-}

56{-# LANGUAGE TypeOperators #-}

67{-# LANGUAGE TypeFamilies #-}

@@ -32,9 +33,16 @@ import Control.Monad.Random hiding ( fromList )

3233import Data.Maybe

3334import Data.Proxy

3435import Data.Serialize

36+import Data.Singletons.TypeLits

3537

38+#if MIN_VERSION_base(4,11,0)

39+import GHC.TypeLits hiding (natVal)

40+#else

3641import GHC.TypeLits

42+#endif

43+#if MIN_VERSION_base(4,9,0)

3744import Data.Kind (Type)

45+#endif

3846

3947import Numeric.LinearAlgebra hiding ( uniformSample, konst )

4048import qualified Numeric.LinearAlgebra as LA

@@ -130,8 +138,8 @@ instance ( KnownNat channels

130138 , KnownNat (kernelRows * kernelColumns * filters)

131139 ) => UpdateLayer (Deconvolution channels filters kernelRows kernelColumns strideRows strideColumns) where

132140 type Gradient (Deconvolution channels filters kernelRows kernelColumns strideRows strideColumns) = (Deconvolution' channels filters kernelRows kernelColumns strideRows strideColumns)

133− runUpdate lp (Deconvolution oldKernel oldMomentum) (Deconvolution' kernelGradient) =

134− let (newKernel, newMomentum) = descendMatrix (learningRate lp) (learningMomentum lp) (learningRegulariser lp) oldKernel kernelGradient oldMomentum

141+ runUpdate LearningParameters {..} (Deconvolution oldKernel oldMomentum) (Deconvolution' kernelGradient) =

142+ let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum

135143 in Deconvolution newKernel newMomentum

136144

137145 createRandom = randomDeconvolution

src/Grenade/Layers/FullyConnected.hs+5−4

@@ -1,4 +1,5 @@

11{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE RecordWildCards #-}

23{-# LANGUAGE TypeOperators #-}

34{-# LANGUAGE TypeFamilies #-}

45{-# LANGUAGE MultiParamTypeClasses #-}

@@ -13,6 +14,7 @@ import Control.Monad.Random hiding (fromList)

1314

1415import Data.Proxy

1516import Data.Serialize

17+import Data.Singletons.TypeLits

1618

1719import qualified Numeric.LinearAlgebra as LA

1820import Numeric.LinearAlgebra.Static

@@ -20,7 +22,6 @@ import Numeric.LinearAlgebra.Static

2022import Grenade.Core

2123

2224import Grenade.Layers.Internal.Update

23−import GHC.TypeLits

2425

2526-- | A basic fully connected (or inner product) neural network layer.

2627data FullyConnected i o = FullyConnected

@@ -37,9 +38,9 @@ instance Show (FullyConnected i o) where

3738instance (KnownNat i, KnownNat o) => UpdateLayer (FullyConnected i o) where

3839 type Gradient (FullyConnected i o) = (FullyConnected' i o)

3940

40− runUpdate lp (FullyConnected (FullyConnected' oldBias oldActivations) (FullyConnected' oldBiasMomentum oldMomentum)) (FullyConnected' biasGradient activationGradient) =

41− let (newBias, newBiasMomentum) = descendVector (learningRate lp) (learningMomentum lp) (learningRegulariser lp) oldBias biasGradient oldBiasMomentum

42− (newActivations, newMomentum) = descendMatrix (learningRate lp) (learningMomentum lp) (learningRegulariser lp) oldActivations activationGradient oldMomentum

41+ runUpdate LearningParameters {..} (FullyConnected (FullyConnected' oldBias oldActivations) (FullyConnected' oldBiasMomentum oldMomentum)) (FullyConnected' biasGradient activationGradient) =

42+ let (newBias, newBiasMomentum) = descendVector learningRate learningMomentum learningRegulariser oldBias biasGradient oldBiasMomentum

43+ (newActivations, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldActivations activationGradient oldMomentum

4344 in FullyConnected (FullyConnected' newBias newActivations) (FullyConnected' newBiasMomentum newMomentum)

4445

4546 createRandom = randomFullyConnected

src/Grenade/Layers/Pad.hs+7

@@ -21,9 +21,16 @@ module Grenade.Layers.Pad (

2121import Data.Maybe

2222import Data.Proxy

2323import Data.Serialize

24+import Data.Singletons.TypeLits

2425

26+#if MIN_VERSION_base(4,11,0)

27+import GHC.TypeLits hiding (natVal)

28+#else

2529import GHC.TypeLits

30+#endif

31+#if MIN_VERSION_base(4,9,0)

2632import Data.Kind (Type)

33+#endif

2734

2835import Grenade.Core

2936import Grenade.Layers.Internal.Pad

src/Grenade/Layers/Pooling.hs+7

@@ -22,9 +22,16 @@ module Grenade.Layers.Pooling (

2222import Data.Maybe

2323import Data.Proxy

2424import Data.Serialize

25+import Data.Singletons.TypeLits

2526

27+#if MIN_VERSION_base(4,11,0)

28+import GHC.TypeLits hiding (natVal)

29+#else

2630import GHC.TypeLits

31+#endif

32+#if MIN_VERSION_base(4,9,0)

2733import Data.Kind (Type)

34+#endif

2835

2936import Grenade.Core

3037import Grenade.Layers.Internal.Pooling

src/Grenade/Layers/Reshape.hs+1

@@ -17,6 +17,7 @@ module Grenade.Layers.Reshape (

1717

1818import Data.Serialize

1919

20+import Data.Singletons.TypeLits

2021import GHC.TypeLits

2122

2223import Numeric.LinearAlgebra.Static

src/Grenade/Recurrent/Core/Network.hs+4−1

@@ -29,13 +29,16 @@ module Grenade.Recurrent.Core.Network (

2929

3030

3131import Control.Monad.Random ( MonadRandom )

32+import Data.Singletons ( SingI )

33+import Data.Singletons.Prelude ( Head, Last )

3234import Data.Serialize

3335

36+#if MIN_VERSION_base(4,9,0)

3437import Data.Kind (Type)

38+#endif

3539

3640import Grenade.Core

3741import Grenade.Recurrent.Core.Layer

38−import Prelude.Singletons

3942

4043-- | Witness type to say indicate we're building up with a normal feed

4144-- forward layer.

src/Grenade/Recurrent/Core/Runner.hs+6−5

@@ -6,6 +6,7 @@

66{-# LANGUAGE TypeFamilies #-}

77{-# LANGUAGE FlexibleContexts #-}

88{-# LANGUAGE RankNTypes #-}

9+{-# LANGUAGE RecordWildCards #-}

910

1011module Grenade.Recurrent.Core.Runner (

1112 runRecurrentExamples

@@ -17,10 +18,10 @@ module Grenade.Recurrent.Core.Runner (

1718 ) where

1819

1920import Data.List ( foldl' )

21+import Data.Singletons.Prelude

2022import Grenade.Core

2123

2224import Grenade.Recurrent.Core.Network

23−import Prelude.Singletons

2425

2526type RecurrentGradients layers = [RecurrentGradient layers]

2627

@@ -100,11 +101,11 @@ updateRecInputs :: Fractional (RecurrentInputs sublayers)

100101 -> RecurrentInputs sublayers

101102 -> RecurrentInputs sublayers

102103

103−updateRecInputs lp (() :~~+> xs) (() :~~+> ys)

104− = () :~~+> updateRecInputs lp xs ys

104+updateRecInputs l@LearningParameters {..} (() :~~+> xs) (() :~~+> ys)

105+ = () :~~+> updateRecInputs l xs ys

105106

106−updateRecInputs lp (x :~@+> xs) (y :~@+> ys)

107− = (realToFrac (1 - learningRate lp * learningRegulariser lp) * x - realToFrac (learningRate lp) * y) :~@+> updateRecInputs lp xs ys

107+updateRecInputs l@LearningParameters {..} (x :~@+> xs) (y :~@+> ys)

108+ = (realToFrac (1 - learningRate * learningRegulariser) * x - realToFrac learningRate * y) :~@+> updateRecInputs l xs ys

108109

109110updateRecInputs _ RINil RINil

110111 = RINil

src/Grenade/Recurrent/Layers/BasicRecurrent.hs+8−4

@@ -1,6 +1,7 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE DataKinds #-}

33{-# LANGUAGE GADTs #-}

4+{-# LANGUAGE RecordWildCards #-}

45{-# LANGUAGE TypeOperators #-}

56{-# LANGUAGE TypeFamilies #-}

67{-# LANGUAGE MultiParamTypeClasses #-}

@@ -16,8 +17,11 @@ module Grenade.Recurrent.Layers.BasicRecurrent (

1617

1718import Control.Monad.Random ( MonadRandom, getRandom )

1819

20+import Data.Singletons.TypeLits

1921

22+#if MIN_VERSION_base(4,9,0)

2023import Data.Kind (Type)

24+#endif

2125

2226import Numeric.LinearAlgebra.Static

2327

@@ -56,11 +60,11 @@ instance Show (BasicRecurrent i o) where

5660instance (KnownNat i, KnownNat o, KnownNat (i + o)) => UpdateLayer (BasicRecurrent i o) where

5761 type Gradient (BasicRecurrent i o) = (BasicRecurrent' i o)

5862

59− runUpdate lp (BasicRecurrent oldBias oldBiasMomentum oldActivations oldMomentum) (BasicRecurrent' biasGradient activationGradient) =

60− let newBiasMomentum = konst (learningMomentum lp) * oldBiasMomentum - konst (learningRate lp) * biasGradient

63+ runUpdate LearningParameters {..} (BasicRecurrent oldBias oldBiasMomentum oldActivations oldMomentum) (BasicRecurrent' biasGradient activationGradient) =

64+ let newBiasMomentum = konst learningMomentum * oldBiasMomentum - konst learningRate * biasGradient

6165 newBias = oldBias + newBiasMomentum

62− newMomentum = konst (learningMomentum lp) * oldMomentum - konst (learningRate lp) * activationGradient

63− regulariser = konst (learningRegulariser lp * learningRate lp) * oldActivations

66+ newMomentum = konst learningMomentum * oldMomentum - konst learningRate * activationGradient

67+ regulariser = konst (learningRegulariser * learningRate) * oldActivations

6468 newActivations = oldActivations + newMomentum - regulariser

6569 in BasicRecurrent newBias newBiasMomentum newActivations newMomentum

6670

src/Grenade/Recurrent/Layers/LSTM.hs+55−41

@@ -3,6 +3,7 @@

33{-# LANGUAGE DataKinds #-}

44{-# LANGUAGE GADTs #-}

55{-# LANGUAGE RankNTypes #-}

6+{-# LANGUAGE RecordWildCards #-}

67{-# LANGUAGE TypeOperators #-}

78{-# LANGUAGE TypeFamilies #-}

89{-# LANGUAGE MultiParamTypeClasses #-}

@@ -21,7 +22,11 @@ import Control.Monad.Random ( MonadRandom, getRandom )

2122-- import Data.List ( foldl1' )

2223import Data.Proxy

2324import Data.Serialize

25+import Data.Singletons.TypeLits

26+

27+#if MIN_VERSION_base(4,9,0)

2428import Data.Kind (Type)

29+#endif

2530

2631import qualified Numeric.LinearAlgebra as LA

2732import Numeric.LinearAlgebra.Static

@@ -29,7 +34,6 @@ import Numeric.LinearAlgebra.Static

2934import Grenade.Core

3035import Grenade.Recurrent.Core

3136import Grenade.Layers.Internal.Update

32−import GHC.TypeLits

3337

3438

3539-- | Long Short Term Memory Recurrent unit

@@ -71,7 +75,7 @@ instance (KnownNat i, KnownNat o) => UpdateLayer (LSTM i o) where

7175

7276 -- Run the update function for each group matrix/vector of weights, momentums and gradients.

7377 -- Hmm, maybe the function should be used instead of passing in the learning parameters.

74− runUpdate lp (LSTM w m) g =

78+ runUpdate LearningParameters {..} (LSTM w m) g =

7579 let (wf, wf') = u lstmWf w m g

7680 (uf, uf') = u lstmUf w m g

7781 (bf, bf') = v lstmBf w m g

@@ -88,11 +92,11 @@ instance (KnownNat i, KnownNat o) => UpdateLayer (LSTM i o) where

8892 -- Utility function for updating with the momentum, gradients, and weights.

8993 u :: forall x ix out. (KnownNat ix, KnownNat out) => (x -> (L out ix)) -> x -> x -> x -> ((L out ix), (L out ix))

9094 u e (e -> weights) (e -> momentum) (e -> gradient) =

91− descendMatrix (learningRate lp) (learningMomentum lp) (learningRegulariser lp) weights gradient momentum

95+ descendMatrix learningRate learningMomentum learningRegulariser weights gradient momentum

9296

9397 v :: forall x ix. (KnownNat ix) => (x -> (R ix)) -> x -> x -> x -> ((R ix), (R ix))

9498 v e (e -> weights) (e -> momentum) (e -> gradient) =

95− descendVector (learningRate lp) (learningMomentum lp) (learningRegulariser lp) weights gradient momentum

99+ descendVector learningRate learningMomentum learningRegulariser weights gradient momentum

96100

97101 -- There's a lot of updates here, so to try and minimise the number of data copies

98102 -- we'll create a mutable bucket for each.

@@ -133,18 +137,18 @@ instance (KnownNat i, KnownNat o) => RecurrentLayer (LSTM i o) ('D1 i) ('D1 o) w

133137 type RecTape (LSTM i o) ('D1 i) ('D1 o) = (R o, R i, R o, R o, R o, R o, R o, R o, R o, R o, R o)

134138 -- Forward propagation for the LSTM layer.

135139 -- The size of the cell state is also the size of the output.

136− runRecurrentForwards (LSTM lw _) (S1D cell) (S1D input) =

140+ runRecurrentForwards (LSTM (LSTMWeights {..}) _) (S1D cell) (S1D input) =

137141 let -- Forget state vector

138− f_s = lstmBf lw + lstmWf lw #> input + lstmUf lw #> cell

142+ f_s = lstmBf + lstmWf #> input + lstmUf #> cell

139143 f_t = sigmoid f_s

140144 -- Input state vector

141− i_s = lstmBi lw + lstmWi lw #> input + lstmUi lw #> cell

145+ i_s = lstmBi + lstmWi #> input + lstmUi #> cell

142146 i_t = sigmoid i_s

143147 -- Output state vector

144− o_s = lstmBo lw + lstmWo lw #> input + lstmUo lw #> cell

148+ o_s = lstmBo + lstmWo #> input + lstmUo #> cell

145149 o_t = sigmoid o_s

146150 -- Cell input state vector

147− c_s = lstmBc lw + lstmWc lw #> input

151+ c_s = lstmBc + lstmWc #> input

148152 c_x = tanh c_s

149153 -- Cell state

150154 c_t = f_t * cell + i_t * c_x

@@ -158,7 +162,7 @@ instance (KnownNat i, KnownNat o) => RecurrentLayer (LSTM i o) ('D1 i) ('D1 o) w

158162 --

159163 -- There's a test version using the AD library without hmatrix in the test

160164 -- suite. These should match always.

161− runRecurrentBackwards (LSTM lw _) (cell, input, f_s, f_t, i_s, i_t, o_s, o_t, c_s, c_x, c_t) (S1D cellGrad) (S1D h_t') =

165+ runRecurrentBackwards (LSTM (LSTMWeights {..}) _) (cell, input, f_s, f_t, i_s, i_t, o_s, o_t, c_s, c_x, c_t) (S1D cellGrad) (S1D h_t') =

162166 let -- Reverse Mode AD Derivitives

163167 c_t' = h_t' * o_t + cellGrad

164168

@@ -175,8 +179,8 @@ instance (KnownNat i, KnownNat o) => RecurrentLayer (LSTM i o) ('D1 i) ('D1 o) w

175179 c_s' = tanh' c_s * c_x'

176180

177181 -- The derivatives to pass sideways (recurrent) and downwards

178− cell' = tr (lstmUf lw) #> f_s' + tr (lstmUo lw) #> o_s' + tr (lstmUi lw) #> i_s' + c_t' * f_t

179− input' = tr (lstmWf lw) #> f_s' + tr (lstmWo lw) #> o_s' + tr (lstmWi lw) #> i_s' + tr (lstmWc lw) #> c_s'

182+ cell' = tr lstmUf #> f_s' + tr lstmUo #> o_s' + tr lstmUi #> i_s' + c_t' * f_t

183+ input' = tr lstmWf #> f_s' + tr lstmWo #> o_s' + tr lstmWi #> i_s' + tr lstmWc #> c_s'

180184

181185 -- Calculate the gradient Matricies for the input

182186 lstmWf' = f_s' `outer` input

@@ -235,34 +239,44 @@ tanh' :: (Floating a) => a -> a

235239tanh' t = 1 - s ^ (2 :: Int) where s = tanh t

236240

237241instance (KnownNat i, KnownNat o) => Serialize (LSTM i o) where

238− put (LSTM lw _) = do

239− u (lstmWf lw)

240− u (lstmUf lw)

241− v (lstmBf lw)

242− u (lstmWi lw)

243− u (lstmUi lw)

244− v (lstmBi lw)

245− u (lstmWo lw)

246− u (lstmUo lw)

247− v (lstmBo lw)

248− u (lstmWc lw)

249− v (lstmBc lw)

250− where

251− u :: forall a b. (KnownNat a, KnownNat b) => Putter (L b a)

252− u = putListOf put . LA.toList . LA.flatten . extract

253− v :: forall a. (KnownNat a) => Putter (R a)

254− v = putListOf put . LA.toList . extract

242+ put (LSTM LSTMWeights {..} _) = do

243+ u lstmWf

244+ u lstmUf

245+ v lstmBf

246+ u lstmWi

247+ u lstmUi

248+ v lstmBi

249+ u lstmWo

250+ u lstmUo

251+ v lstmBo

252+ u lstmWc

253+ v lstmBc

254+ where

255+ u :: forall a b. (KnownNat a, KnownNat b) => Putter (L b a)

256+ u = putListOf put . LA.toList . LA.flatten . extract

257+ v :: forall a. (KnownNat a) => Putter (R a)

258+ v = putListOf put . LA.toList . extract

255259

256260 get = do

257− w <- LSTMWeights <$> u <*> u <*> v <*> u <*> u <*> v <*> u <*> u <*> v <*> u <*> v

258− return $ LSTM w (LSTMWeights w0 u0 v0 w0 u0 v0 w0 u0 v0 w0 v0)

259− where

260− u :: forall a b. (KnownNat a, KnownNat b) => Get (L b a)

261− u = let f = fromIntegral $ natVal (Proxy :: Proxy a)

262− in maybe (fail "Vector of incorrect size") return . create . LA.reshape f . LA.fromList =<< getListOf get

263− v :: forall a. (KnownNat a) => Get (R a)

264− v = maybe (fail "Vector of incorrect size") return . create . LA.fromList =<< getListOf get

265−

266− w0 = konst 0

267− u0 = konst 0

268− v0 = konst 0

261+ lstmWf <- u

262+ lstmUf <- u

263+ lstmBf <- v

264+ lstmWi <- u

265+ lstmUi <- u

266+ lstmBi <- v

267+ lstmWo <- u

268+ lstmUo <- u

269+ lstmBo <- v

270+ lstmWc <- u

271+ lstmBc <- v

272+ return $ LSTM (LSTMWeights {..}) (LSTMWeights w0 u0 v0 w0 u0 v0 w0 u0 v0 w0 v0)

273+ where

274+ u :: forall a b. (KnownNat a, KnownNat b) => Get (L b a)

275+ u = let f = fromIntegral $ natVal (Proxy :: Proxy a)

276+ in maybe (fail "Vector of incorrect size") return . create . LA.reshape f . LA.fromList =<< getListOf get

277+ v :: forall a. (KnownNat a) => Get (R a)

278+ v = maybe (fail "Vector of incorrect size") return . create . LA.fromList =<< getListOf get

279+

280+ w0 = konst 0

281+ u0 = konst 0

282+ v0 = konst 0

src/Grenade/Utils/OneHot.hs+1−1

@@ -22,6 +22,7 @@ import Data.Map ( Map )

2222import qualified Data.Map as M

2323

2424import Data.Proxy

25+import Data.Singletons.TypeLits

2526

2627import Data.Vector ( Vector )

2728import qualified Data.Vector as V

@@ -30,7 +31,6 @@ import qualified Data.Vector.Storable as VS

3031import Numeric.LinearAlgebra ( maxIndex )

3132import Numeric.LinearAlgebra.Devel

3233import Numeric.LinearAlgebra.Static

33−import GHC.TypeLits

3434

3535import Grenade.Core.Shape

3636

stack.yamldeleted−78

@@ -1,78 +0,0 @@

1−# This file was automatically generated by 'stack init'

2−#

3−# Some commonly used options have been documented as comments in this file.

4−# For advanced use and comprehensive documentation of the format, please see:

5−# https://docs.haskellstack.org/en/stable/yaml_configuration/

6−

7−# A warning or info to be displayed to the user on config load.

8−# user-message: |

9−

10−# Resolver to choose a 'specific' stackage snapshot or a compiler version.

11−# A snapshot resolver dictates the compiler version and the set of packages

12−# to be used for project dependencies. For example:

13−#

14−# resolver: lts-3.5

15−# resolver: nightly-2015-09-21

16−# resolver: ghc-7.10.2

17−#

18−# The location of a snapshot can be provided as a file or url. Stack assumes

19−# a snapshot provided as a file might change, whereas a url resource does not.

20−#

21−# resolver: ./custom-snapshot.yaml

22−# resolver: https://example.com/snapshots/2018-01-01.yaml

23−resolver: lts-20.18

24−

25−# User packages to be built.

26−# Various formats can be used as shown in the example below.

27−#

28−# packages:

29−# - some-directory

30−# - https://example.com/foo/bar/baz-0.0.2.tar.gz

31−# subdirs:

32−# - auto-update

33−# - wai

34−packages:

35− - .

36− - examples

37−

38−# Dependency packages to be pulled from upstream that are not in the resolver.

39−# These entries can reference officially published versions as well as

40−# forks / in-progress versions pinned to a git hash. For example:

41−#

42−# extra-deps:

43−# - acme-missiles-0.3

44−# - git: https://github.com/commercialhaskell/stack.git

45−# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a

46−#

47−extra-deps:

48− - typelits-witnesses-0.3.0.3

49−

50−# Override default flag values for local packages and extra-deps

51−# flags: {}

52−

53−# Extra package databases containing global packages

54−# extra-package-dbs: []

55−

56−# Control whether we use the GHC we find on the path

57−# system-ghc: true

58−#

59−# Require a specific version of stack, using version ranges

60−# require-stack-version: -any # Default

61−# require-stack-version: ">=2.1"

62−#

63−# Override the architecture used by stack, especially useful on Windows

64−# arch: i386

65−# arch: x86_64

66−#

67−# Extra directories used by stack for building

68−# extra-include-dirs: [/path/to/dir]

69−# extra-lib-dirs: [/path/to/dir]

70−#

71−# Allow a newer minor version of GHC than the snapshot specifies

72−# compiler-check: newer-minor

73−

74−nix:

75− enable: true

76− packages:

77− - blas

78− - lapack

stack.yaml.lockdeleted−19

@@ -1,19 +0,0 @@

1−# This file was autogenerated by Stack.

2−# You should not edit this file by hand.

3−# For more information, please see the documentation at:

4−# https://docs.haskellstack.org/en/stable/lock_files

5−

6−packages:

7−- completed:

8− hackage: typelits-witnesses-0.3.0.3@sha256:2d9df4ac6ff3077bfd2bf659e4b495e157723ac5b45c519762853f55df5c16db,2738

9− pantry-tree:

10− sha256: 6a42a462f98e94933b6e9721acd912c6c6b6a4743635efd15cc5871908c816a0

11− size: 469

12− original:

13− hackage: typelits-witnesses-0.3.0.3

14−snapshots:

15−- completed:

16− sha256: 9fa4bece7acfac1fc7930c5d6e24606004b09e80aa0e52e9f68b148201008db9

17− size: 649606

18− url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/18.yaml

19− original: lts-20.18

test/Test/Grenade/Layers/Convolution.hs+1−6

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

21{-# LANGUAGE TemplateHaskell #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE GADTs #-}

@@ -16,10 +15,6 @@ import Data.Singletons ()

1615import GHC.TypeLits

1716import GHC.TypeLits.Witnesses

1817

19−#if MIN_VERSION_base(4,9,0)

20−import Data.Kind (Type)

21−#endif

22−

2318import Grenade.Core

2419import Grenade.Layers.Convolution

2520

@@ -30,7 +25,7 @@ import Test.Hedgehog.Hmatrix

3025import Test.Hedgehog.TypeLits

3126import Test.Hedgehog.Compat

3227

33−data OpaqueConvolution :: Type where

28+data OpaqueConvolution :: * where

3429 OpaqueConvolution :: Convolution channels filters kernelRows kernelColumns strideRows strideColumns -> OpaqueConvolution

3530

3631instance Show OpaqueConvolution where

test/Test/Grenade/Layers/FullyConnected.hs+1−6

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

21{-# LANGUAGE BangPatterns #-}

32{-# LANGUAGE TemplateHaskell #-}

43{-# LANGUAGE DataKinds #-}

@@ -13,10 +12,6 @@ import Data.Singletons ()

1312

1413import GHC.TypeLits

1514

16−#if MIN_VERSION_base(4,9,0)

17−import Data.Kind (Type)

18−#endif

19−

2015import Grenade.Core

2116import Grenade.Layers.FullyConnected

2217

@@ -25,7 +20,7 @@ import Hedgehog

2520import Test.Hedgehog.Compat

2621import Test.Hedgehog.Hmatrix

2722

28−data OpaqueFullyConnected :: Type where

23+data OpaqueFullyConnected :: * where

2924 OpaqueFullyConnected :: (KnownNat i, KnownNat o) => FullyConnected i o -> OpaqueFullyConnected

3025

3126instance Show OpaqueFullyConnected where

test/Test/Grenade/Layers/PadCrop.hs+4

@@ -7,6 +7,10 @@

77{-# LANGUAGE ScopedTypeVariables #-}

88{-# OPTIONS_GHC -fno-warn-missing-signatures #-}

99

10+#if __GLASGOW_HASKELL__ < 800

11+{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}

12+#endif

13+

1014module Test.Grenade.Layers.PadCrop where

1115

1216import Grenade

test/Test/Grenade/Layers/Pooling.hs+5−10

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

21{-# LANGUAGE TemplateHaskell #-}

32{-# LANGUAGE DataKinds #-}

43{-# LANGUAGE KindSignatures #-}

@@ -10,10 +9,6 @@ module Test.Grenade.Layers.Pooling where

109import Data.Proxy

1110import Data.Singletons ()

1211

13−#if MIN_VERSION_base(4,9,0)

14−import Data.Kind (Type)

15−#endif

16−

1712import GHC.TypeLits

1813import Grenade.Layers.Pooling

1914

@@ -21,7 +16,7 @@ import Hedgehog

2116

2217import Test.Hedgehog.Compat

2318

24−data OpaquePooling :: Type where

19+data OpaquePooling :: * where

2520 OpaquePooling :: (KnownNat kh, KnownNat kw, KnownNat sh, KnownNat sw) => Pooling kh kw sh sw -> OpaquePooling

2621

2722instance Show OpaquePooling where

@@ -29,10 +24,10 @@ instance Show OpaquePooling where

2924

3025genOpaquePooling :: Gen OpaquePooling

3126genOpaquePooling = do

32− ~(Just kernelHeight) <- someNatVal <$> choose 2 15

33− ~(Just kernelWidth ) <- someNatVal <$> choose 2 15

34− ~(Just strideHeight) <- someNatVal <$> choose 2 15

35− ~(Just strideWidth ) <- someNatVal <$> choose 2 15

27+ Just kernelHeight <- someNatVal <$> choose 2 15

28+ Just kernelWidth <- someNatVal <$> choose 2 15

29+ Just strideHeight <- someNatVal <$> choose 2 15

30+ Just strideWidth <- someNatVal <$> choose 2 15

3631

3732 case (kernelHeight, kernelWidth, strideHeight, strideWidth) of

3833 (SomeNat (_ :: Proxy kh), SomeNat (_ :: Proxy kw), SomeNat (_ :: Proxy sh), SomeNat (_ :: Proxy sw)) ->

test/Test/Grenade/Network.hs+7−7

@@ -14,6 +14,9 @@ import Control.Monad ( guard )

1414import Control.Monad.ST ( runST )

1515

1616import Data.Constraint

17+#if __GLASGOW_HASKELL__ < 800

18+import Data.Proxy

19+#endif

1720import qualified Data.Vector.Storable as VS

1821import qualified Data.Vector.Storable.Mutable as VS ( write )

1922import Data.Singletons

@@ -32,9 +35,6 @@ import GHC.TypeLits hiding (natVal)

3235#else

3336import GHC.TypeLits

3437#endif

35−#if MIN_VERSION_base(4,9,0)

36−import Data.Kind (Type)

37−#endif

3838

3939import GHC.TypeLits.Witnesses

4040import Test.Hedgehog.Compat

@@ -46,7 +46,7 @@ import Numeric.LinearAlgebra ( flatten )

4646import Numeric.LinearAlgebra.Static ( extract, norm_Inf )

4747import Unsafe.Coerce

4848

49−data SomeNetwork :: Type where

49+data SomeNetwork :: * where

5050 SomeNetwork :: ( SingI shapes, SingI (Head shapes), SingI (Last shapes), Show (Network layers shapes) ) => Network layers shapes -> SomeNetwork

5151

5252instance Show SomeNetwork where

@@ -448,7 +448,7 @@ oneUp =

448448 D1Sing SNat ->

449449 let x = 0 :: S ( shape )

450450 in case x of

451− ( S1D x' ) -> do

451+ ( S1D x' ) -> do

452452 let ex = extract x'

453453 let len = VS.length ex

454454 ix <- choose 0 (len - 1)

@@ -460,7 +460,7 @@ oneUp =

460460 D2Sing SNat SNat ->

461461 let x = 0 :: S ( shape )

462462 in case x of

463− ( S2D x' ) -> do

463+ ( S2D x' ) -> do

464464 let ex = flatten ( extract x' )

465465 let len = VS.length ex

466466 ix <- choose 0 (len - 1)

@@ -472,7 +472,7 @@ oneUp =

472472 D3Sing SNat SNat SNat ->

473473 let x = 0 :: S ( shape )

474474 in case x of

475− ( S3D x' ) -> do

475+ ( S3D x' ) -> do

476476 let ex = flatten ( extract x' )

477477 let len = VS.length ex

478478 ix <- choose 0 (len - 1)

test/Test/Grenade/Recurrent/Layers/LSTM.hs+2−2

@@ -121,9 +121,9 @@ prop_lstm_reference_backwards_cell =

121121 , showPretty x

122122 , showPretty y

123123 ]

124− Just differ ->

124+ Just diff ->

125125 withFrozenCallStack $

126− failWith (Just $ Diff "Failed (" "- lhs" "~/~" "+ rhs" ")" differ) ""

126+ failWith (Just $ Diff "Failed (" "- lhs" "~/~" "+ rhs" ")" diff) ""

127127infix 4 ~~~

128128

129129tests :: IO Bool

test/Test/Grenade/Recurrent/Layers/LSTM/Reference.hs+21−25

@@ -6,6 +6,7 @@

66{-# LANGUAGE DeriveFunctor #-}

77{-# LANGUAGE DeriveFoldable #-}

88{-# LANGUAGE DeriveTraversable #-}

9+{-# LANGUAGE RecordWildCards #-}

910{-# LANGUAGE FlexibleContexts #-}

1011{-# LANGUAGE RankNTypes #-}

1112

@@ -14,13 +15,9 @@ module Test.Grenade.Recurrent.Layers.LSTM.Reference where

1415

1516import Data.Reflection

1617import Numeric.AD.Mode.Reverse

17−import Numeric.AD.Internal.Reverse (Tape)

18+import Numeric.AD.Internal.Reverse ( Tape )

1819

19−import GHC.TypeLits (KnownNat)

20−

21−import Grenade.Recurrent.Layers.LSTM (LSTMWeights (..))

2220import qualified Grenade.Recurrent.Layers.LSTM as LSTM

23−

2421import qualified Numeric.LinearAlgebra.Static as S

2522import qualified Numeric.LinearAlgebra as H

2623

@@ -57,32 +54,31 @@ data RefLSTM a = RefLSTM

5754 , refLstmBc :: Vector a -- Bias Cell (b_c)

5855 } deriving (Functor, Foldable, Traversable, Eq, Show)

5956

60−lstmToReference :: (KnownNat a, KnownNat b) => LSTM.LSTMWeights a b -> RefLSTM Double

61−lstmToReference lw =

62− RefLSTM

63− { refLstmWf = Matrix . H.toLists . S.extract $ lstmWf lw -- Weight Forget (W_f)

64− , refLstmUf = Matrix . H.toLists . S.extract $ lstmUf lw -- Cell State Forget (U_f)

65− , refLstmBf = Vector . H.toList . S.extract $ lstmBf lw -- Bias Forget (b_f)

66− , refLstmWi = Matrix . H.toLists . S.extract $ lstmWi lw -- Weight Input (W_i)

67− , refLstmUi = Matrix . H.toLists . S.extract $ lstmUi lw -- Cell State Input (U_i)

68− , refLstmBi = Vector . H.toList . S.extract $ lstmBi lw -- Bias Input (b_i)

69− , refLstmWo = Matrix . H.toLists . S.extract $ lstmWo lw -- Weight Output (W_o)

70− , refLstmUo = Matrix . H.toLists . S.extract $ lstmUo lw -- Cell State Output (U_o)

71− , refLstmBo = Vector . H.toList . S.extract $ lstmBo lw -- Bias Output (b_o)

72− , refLstmWc = Matrix . H.toLists . S.extract $ lstmWc lw -- Weight Cell (W_c)

73− , refLstmBc = Vector . H.toList . S.extract $ lstmBc lw -- Bias Cell (b_c)

74− }

57+lstmToReference :: LSTM.LSTMWeights a b -> RefLSTM Double

58+lstmToReference LSTM.LSTMWeights {..} =

59+ let refLstmWf = Matrix . H.toLists . S.extract $ lstmWf -- Weight Forget (W_f)

60+ refLstmUf = Matrix . H.toLists . S.extract $ lstmUf -- Cell State Forget (U_f)

61+ refLstmBf = Vector . H.toList . S.extract $ lstmBf -- Bias Forget (b_f)

62+ refLstmWi = Matrix . H.toLists . S.extract $ lstmWi -- Weight Input (W_i)

63+ refLstmUi = Matrix . H.toLists . S.extract $ lstmUi -- Cell State Input (U_i)

64+ refLstmBi = Vector . H.toList . S.extract $ lstmBi -- Bias Input (b_i)

65+ refLstmWo = Matrix . H.toLists . S.extract $ lstmWo -- Weight Output (W_o)

66+ refLstmUo = Matrix . H.toLists . S.extract $ lstmUo -- Cell State Output (U_o)

67+ refLstmBo = Vector . H.toList . S.extract $ lstmBo -- Bias Output (b_o)

68+ refLstmWc = Matrix . H.toLists . S.extract $ lstmWc -- Weight Cell (W_c)

69+ refLstmBc = Vector . H.toList . S.extract $ lstmBc -- Bias Cell (b_c)

70+ in RefLSTM {..}

7571

7672runLSTM :: Floating a => RefLSTM a -> Vector a -> Vector a -> (Vector a, Vector a)

77−runLSTM rl cell input =

73+runLSTM RefLSTM {..} cell input =

7874 let -- Forget state vector

79− f_t = sigmoid $ refLstmBf rl #+ refLstmWf rl #> input #+ refLstmUf rl #> cell

75+ f_t = sigmoid $ refLstmBf #+ refLstmWf #> input #+ refLstmUf #> cell

8076 -- Input state vector

81− i_t = sigmoid $ refLstmBi rl #+ refLstmWi rl #> input #+ refLstmUi rl #> cell

77+ i_t = sigmoid $ refLstmBi #+ refLstmWi #> input #+ refLstmUi #> cell

8278 -- Output state vector

83− o_t = sigmoid $ refLstmBo rl #+ refLstmWo rl #> input #+ refLstmUo rl #> cell

79+ o_t = sigmoid $ refLstmBo #+ refLstmWo #> input #+ refLstmUo #> cell

8480 -- Cell input state vector

85− c_x = fmap tanh $ refLstmBc rl #+ refLstmWc rl #> input

81+ c_x = fmap tanh $ refLstmBc #+ refLstmWc #> input

8682 -- Cell state

8783 c_t = f_t #* cell #+ i_t #* c_x

8884 -- Output (it's sometimes recommended to use tanh c_t)

test/Test/Hedgehog/Hmatrix.hs+2−3

@@ -1,8 +1,7 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE KindSignatures #-}

3−{-# LANGUAGE GADTs #-}

41{-# LANGUAGE RankNTypes #-}

2+{-# LANGUAGE DataKinds #-}

53{-# LANGUAGE ScopedTypeVariables #-}

4+{-# LANGUAGE GADTs #-}

65

76module Test.Hedgehog.Hmatrix where

87

test/Test/Hedgehog/TypeLits.hs+19−13

@@ -7,27 +7,33 @@

77{-# LANGUAGE GADTs #-}

88module Test.Hedgehog.TypeLits where

99

10−import Data.Constraint (Dict (..))

11−import Data.Singletons (Proxy (..), Sing (..), SomeSing (..), sing)

12−#if MIN_VERSION_singletons(2,6,0)

13−import Data.Singletons.TypeLits (SNat (..))

10+import Data.Constraint

11+#if __GLASGOW_HASKELL__ < 800

12+import Data.Proxy

1413#endif

14+import Data.Singletons

1515

1616import Hedgehog (Gen)

1717import qualified Hedgehog.Gen as Gen

1818

1919import Grenade

2020

21−import GHC.TypeLits (SomeNat (..), natVal, someNatVal)

22−import GHC.TypeLits.Witnesses ((%*), natDict)

23−import Test.Hedgehog.Compat (choose)

21+import GHC.TypeLits

22+import GHC.TypeLits.Witnesses

23+import Test.Hedgehog.Compat

2424

2525genNat :: Gen SomeNat

2626genNat = do

27− ~(Just n) <- someNatVal <$> choose 1 10

27+ Just n <- someNatVal <$> choose 1 10

2828 return n

2929

30−genShape :: Gen (SomeSing Shape)

30+#if __GLASGOW_HASKELL__ < 800

31+type Shape' = ('KProxy :: KProxy Shape)

32+#else

33+type Shape' = Shape

34+#endif

35+

36+genShape :: Gen (SomeSing Shape')

3137genShape

3238 = Gen.choice [

3339 genD1

@@ -35,20 +41,20 @@ genShape

3541 , genD3

3642 ]

3743

38−genD1 :: Gen (SomeSing Shape)

44+genD1 :: Gen (SomeSing Shape')

3945genD1 = do

4046 n <- genNat

4147 return $ case n of

4248 SomeNat (_ :: Proxy x) -> SomeSing (sing :: Sing ('D1 x))

4349

44−genD2 :: Gen (SomeSing Shape)

50+genD2 :: Gen (SomeSing Shape')

4551genD2 = do

4652 n <- genNat

4753 m <- genNat

4854 return $ case (n, m) of

4955 (SomeNat (_ :: Proxy x), SomeNat (_ :: Proxy y)) -> SomeSing (sing :: Sing ('D2 x y))

5056

51−genD3 :: Gen (SomeSing Shape)

57+genD3 :: Gen (SomeSing Shape')

5258genD3 = do

5359 n <- genNat

5460 m <- genNat

@@ -58,7 +64,7 @@ genD3 = do

5864 case natDict px %* natDict pz of

5965 Dict -> SomeSing (sing :: Sing ('D3 x y z))

6066

61−rss :: SomeSing Shape -> String

67+rss :: SomeSing Shape' -> String

6268rss (SomeSing (r :: Sing s)) = case r of

6369 (D1Sing a@SNat) -> "D1 " ++ show (natVal a)

6470 (D2Sing a@SNat b@SNat) -> "D2 " ++ show (natVal a) ++ " " ++ show (natVal b)