8d5ef50 · grenade · git.iko.soy

grenade.cabal+1

compare with master

unifiedsplit

@@ -57,6 +57,7 @@ library

57

58 if impl(ghc < 8.0)

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

60+ cpp-options: -DType=*

60

61

61 if impl(ghc >= 8.6)

62 if impl(ghc >= 8.6)

62 default-extensions: NoStarIsType

63 default-extensions: NoStarIsType

src/Grenade/Core/Layer.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

@@ -41,7 +42,9 @@ import Control.Monad.Random ( MonadRandom )

41

42

42import Data.List ( foldl' )

43import Data.List ( foldl' )

43

44

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

44import Data.Kind (Type)

46import Data.Kind (Type)

47+#endif

45

48

46import Grenade.Core.Shape

49import Grenade.Core.Shape

47import Grenade.Core.LearningParameters

50import Grenade.Core.LearningParameters

src/Grenade/Core/Network.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE BangPatterns #-}

3{-# LANGUAGE BangPatterns #-}

3{-# LANGUAGE GADTs #-}

4{-# LANGUAGE GADTs #-}

@@ -36,7 +37,9 @@ import Data.Singletons

36import Data.Singletons.Prelude

37import Data.Singletons.Prelude

37import Data.Serialize

38import Data.Serialize

38

39

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

39import Data.Kind (Type)

41import Data.Kind (Type)

42+#endif

40

43

41import Grenade.Core.Layer

44import Grenade.Core.Layer

42import Grenade.Core.LearningParameters

45import Grenade.Core.LearningParameters

src/Grenade/Layers/Concat.hs+4

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

@@ -26,7 +27,10 @@ import Data.Serialize

26

27

27import Data.Singletons

28import Data.Singletons

28import GHC.TypeLits

29import GHC.TypeLits

30+

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

29import Data.Kind (Type)

32import Data.Kind (Type)

33+#endif

30

34

31import Grenade.Core

35import Grenade.Core

32

36

src/Grenade/Layers/Convolution.hs+2

@@ -36,7 +36,9 @@ import GHC.TypeLits hiding (natVal)

36#else

37import GHC.TypeLits

38#endif

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

39import Data.Kind (Type)

40import Data.Kind (Type)

41+#endif

40

42

41import Numeric.LinearAlgebra hiding ( uniformSample, konst )

43import Numeric.LinearAlgebra hiding ( uniformSample, konst )

42import qualified Numeric.LinearAlgebra as LA

44import qualified Numeric.LinearAlgebra as LA

src/Grenade/Layers/Crop.hs+2

@@ -28,7 +28,9 @@ import GHC.TypeLits hiding (natVal)

28#else

29import GHC.TypeLits

30#endif

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

31import Data.Kind (Type)

32import Data.Kind (Type)

33+#endif

32

34

33import Grenade.Core

35import Grenade.Core

34import Grenade.Layers.Internal.Pad

36import Grenade.Layers.Internal.Pad

src/Grenade/Layers/Deconvolution.hs+2

@@ -40,7 +40,9 @@ import GHC.TypeLits hiding (natVal)

40#else

41import GHC.TypeLits

42#endif

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

43import Data.Kind (Type)

44import Data.Kind (Type)

45+#endif

44

46

45import Numeric.LinearAlgebra hiding ( uniformSample, konst )

47import Numeric.LinearAlgebra hiding ( uniformSample, konst )

46import qualified Numeric.LinearAlgebra as LA

48import qualified Numeric.LinearAlgebra as LA

src/Grenade/Layers/Merge.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

@@ -23,7 +24,9 @@ import Data.Serialize

23

24

24import Data.Singletons

25import Data.Singletons

25

26

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

26import Data.Kind (Type)

28import Data.Kind (Type)

29+#endif

27

30

28import Grenade.Core

31import Grenade.Core

29

32

src/Grenade/Layers/Pad.hs+2

@@ -28,7 +28,9 @@ import GHC.TypeLits hiding (natVal)

28#else

29import GHC.TypeLits

30#endif

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

31import Data.Kind (Type)

32import Data.Kind (Type)

33+#endif

32

34

33import Grenade.Core

35import Grenade.Core

34import Grenade.Layers.Internal.Pad

36import Grenade.Layers.Internal.Pad

src/Grenade/Layers/Pooling.hs+2

@@ -29,7 +29,9 @@ import GHC.TypeLits hiding (natVal)

29#else

30import GHC.TypeLits

31#endif

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

32import Data.Kind (Type)

33import Data.Kind (Type)

34+#endif

33

35

34import Grenade.Core

36import Grenade.Core

35import Grenade.Layers.Internal.Pooling

37import Grenade.Layers.Internal.Pooling

src/Grenade/Recurrent/Core/Layer.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE TypeFamilies #-}

3{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE MultiParamTypeClasses #-}

@@ -8,7 +9,9 @@ module Grenade.Recurrent.Core.Layer (

8 , RecurrentUpdateLayer (..)

9 , RecurrentUpdateLayer (..)

9 ) where

10 ) where

10

11

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

11import Data.Kind (Type)

13import Data.Kind (Type)

14+#endif

12

15

13import Grenade.Core

16import Grenade.Core

14

17

src/Grenade/Recurrent/Core/Network.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

@@ -32,7 +33,9 @@ import Data.Singletons ( SingI )

32import Data.Singletons.Prelude ( Head, Last )

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

33import Data.Serialize

34import Data.Serialize

34

35

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

35import Data.Kind (Type)

37import Data.Kind (Type)

38+#endif

36

39

37import Grenade.Core

40import Grenade.Core

38import Grenade.Recurrent.Core.Layer

41import Grenade.Recurrent.Core.Layer

src/Grenade/Recurrent/Layers/BasicRecurrent.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE RecordWildCards #-}

4{-# LANGUAGE RecordWildCards #-}

@@ -18,7 +19,9 @@ import Control.Monad.Random ( MonadRandom, getRandom )

18

19

19import Data.Singletons.TypeLits

20import Data.Singletons.TypeLits

20

21

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

21import Data.Kind (Type)

23import Data.Kind (Type)

24+#endif

22

25

23import Numeric.LinearAlgebra.Static

26import Numeric.LinearAlgebra.Static

24

27

src/Grenade/Recurrent/Layers/ConcatRecurrent.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE DataKinds #-}

2{-# LANGUAGE GADTs #-}

3{-# LANGUAGE GADTs #-}

3{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

@@ -27,7 +28,9 @@ import Data.Serialize

27import Data.Singletons

28import Data.Singletons

28import GHC.TypeLits

29import GHC.TypeLits

29

30

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

30import Data.Kind (Type)

32import Data.Kind (Type)

33+#endif

31

34

32import Grenade.Core

35import Grenade.Core

33import Grenade.Recurrent.Core

36import Grenade.Recurrent.Core

src/Grenade/Recurrent/Layers/LSTM.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE BangPatterns #-}

2{-# LANGUAGE BangPatterns #-}

2{-# LANGUAGE DataKinds #-}

3{-# LANGUAGE DataKinds #-}

3{-# LANGUAGE GADTs #-}

4{-# LANGUAGE GADTs #-}

@@ -23,7 +24,9 @@ import Data.Proxy

23import Data.Serialize

24import Data.Serialize

24import Data.Singletons.TypeLits

25import Data.Singletons.TypeLits

25

26

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

26import Data.Kind (Type)

28import Data.Kind (Type)

29+#endif

27

30

28import qualified Numeric.LinearAlgebra as LA

31import qualified Numeric.LinearAlgebra as LA

29import Numeric.LinearAlgebra.Static

32import Numeric.LinearAlgebra.Static