3cf431e · grenade · git.iko.soy

git.iko.soy/grenade

Match instance head type indicies

commit3cf431e66d034932f921b9a370ba4c20479b1e2c authorHuw Campbell <huw.campbell@ambiata.com> dateTue 26 Sep 2017, 22:02 (9 years ago) parentf8431ca

3 files changed+3−3

compare with master

unifiedsplit

src/Grenade/Layers/Convolution.hs+1−1 src/Grenade/Layers/Deconvolution.hs+1−1 src/Grenade/Layers/Pooling.hs+1−1

src/Grenade/Layers/Convolution.hs+1−1

@@ -129,7 +129,7 @@ instance ( KnownNat channels

129129 , KnownNat strideColumns

130130 , KnownNat (kernelRows * kernelColumns * channels)

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

132− type Gradient (Convolution channels filters kernelRows kernelCols strideRows strideCols) = (Convolution' channels filters kernelRows kernelCols strideRows strideCols)

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

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

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

135135 in Convolution newKernel newMomentum

src/Grenade/Layers/Deconvolution.hs+1−1

@@ -128,7 +128,7 @@ instance ( KnownNat channels

128128 , KnownNat strideColumns

129129 , KnownNat (kernelRows * kernelColumns * filters)

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

131− type Gradient (Deconvolution channels filters kernelRows kernelCols strideRows strideCols) = (Deconvolution' channels filters kernelRows kernelCols strideRows strideCols)

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

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

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

134134 in Deconvolution newKernel newMomentum

src/Grenade/Layers/Pooling.hs+1−1

@@ -43,7 +43,7 @@ instance Show (Pooling k k' s s') where

4343 show Pooling = "Pooling"

4444

4545instance UpdateLayer (Pooling kernelRows kernelColumns strideRows strideColumns) where

46− type Gradient (Pooling kr kc sr sc) = ()

46+ type Gradient (Pooling kernelRows kernelColumns strideRows strideColumns) = ()

4747 runUpdate _ Pooling _ = Pooling

4848 createRandom = return Pooling

4949