on master help sign in
Match instance head type indicies
3cf431eHuw Campbell
src/Grenade/Layers/Convolution.hs+1−1
@@ -129,7 +129,7 @@ instance ( KnownNat channels
129 , KnownNat strideColumns
129 , KnownNat strideColumns
130 , KnownNat (kernelRows * kernelColumns * channels)
130 , KnownNat (kernelRows * kernelColumns * channels)
131 ) => UpdateLayer (Convolution channels filters kernelRows kernelColumns strideRows strideColumns) where
131 ) => 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)
133 runUpdate LearningParameters {..} (Convolution oldKernel oldMomentum) (Convolution' kernelGradient) =
133 runUpdate LearningParameters {..} (Convolution oldKernel oldMomentum) (Convolution' kernelGradient) =
134 let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum
134 let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum
135 in Convolution newKernel newMomentum
135 in Convolution newKernel newMomentum
src/Grenade/Layers/Deconvolution.hs+1−1
@@ -128,7 +128,7 @@ instance ( KnownNat channels
128 , KnownNat strideColumns
128 , KnownNat strideColumns
129 , KnownNat (kernelRows * kernelColumns * filters)
129 , KnownNat (kernelRows * kernelColumns * filters)
130 ) => UpdateLayer (Deconvolution channels filters kernelRows kernelColumns strideRows strideColumns) where
130 ) => 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)
132 runUpdate LearningParameters {..} (Deconvolution oldKernel oldMomentum) (Deconvolution' kernelGradient) =
132 runUpdate LearningParameters {..} (Deconvolution oldKernel oldMomentum) (Deconvolution' kernelGradient) =
133 let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum
133 let (newKernel, newMomentum) = descendMatrix learningRate learningMomentum learningRegulariser oldKernel kernelGradient oldMomentum
134 in Deconvolution newKernel newMomentum
134 in Deconvolution newKernel newMomentum
src/Grenade/Layers/Pooling.hs+1−1
@@ -43,7 +43,7 @@ instance Show (Pooling k k' s s') where
43 show Pooling = "Pooling"
43 show Pooling = "Pooling"
44
44
45instance UpdateLayer (Pooling kernelRows kernelColumns strideRows strideColumns) where
45instance UpdateLayer (Pooling kernelRows kernelColumns strideRows strideColumns) where
46− type Gradient (Pooling kr kc sr sc) = ()
46+ type Gradient (Pooling kernelRows kernelColumns strideRows strideColumns) = ()
47 runUpdate _ Pooling _ = Pooling
47 runUpdate _ Pooling _ = Pooling
48 createRandom = return Pooling
48 createRandom = return Pooling
49
49