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

Minor changes

Browse Source
This commit is contained in:
Huw Campbell 2016-12-08 10:32:07 +11:00
parent 2433e1fba2
commit ff20855676
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Grenade/Layers/Internal/Convolution.hs
View File

@ -10,6 +10,7 @@ import Control.Monad.ST ( runST )
import Data.STRef ( newSTRef, modifySTRef, writeSTRef, readSTRef )
import Data.Foldable ( forM_ )
import Data.Traversable ( forM )
import Numeric.LinearAlgebra hiding ( uniformSample, konst )
import qualified Numeric.LinearAlgebra.Devel as U
@ -96,14 +97,11 @@ col2vidUnsafe kernelRows kernelColumns strideRows strideColumns destinationRows
let columnMatrixRows = rows columnMatrix
let filters = cols columnMatrix `div` (kernelRows * kernelColumns)
dataIms <- traverse (\_ -> U.newMatrix 0 destinationRows destinationCols) [0 .. filters-1]
offsetM <- newSTRef 0
forM_ dataIms $ \dataIm -> do
forM [0 .. filters - 1] $ \iter -> do
let offsetM = iter * (kernelRows * kernelColumns)
dataIm <- U.newMatrix 0 destinationRows destinationCols
offsetR <- newSTRef 0
offsetC <- newSTRef 0
offsetM' <- readSTRef offsetM
forM_ [0 .. columnMatrixRows - 1] $ \ir -> do
inputColumn <- newSTRef 0
forM_ [0 .. kernelRows -1] $ \kr ->
@ -111,7 +109,7 @@ col2vidUnsafe kernelRows kernelColumns strideRows strideColumns destinationRows
ic <- readSTRef inputColumn
offsetR' <- readSTRef offsetR
offsetC' <- readSTRef offsetC
U.modifyMatrix dataIm (kr + offsetR') (kc + offsetC') (+ U.atM' columnMatrix ir (ic + offsetM'))
U.modifyMatrix dataIm (kr + offsetR') (kc + offsetC') (+ U.atM' columnMatrix ir (ic + offsetM))
modifySTRef inputColumn (+1)
offsetC' <- readSTRef offsetC
@ -119,9 +117,7 @@ col2vidUnsafe kernelRows kernelColumns strideRows strideColumns destinationRows
then modifySTRef offsetC (+ strideColumns)
else writeSTRef offsetC 0 >> modifySTRef offsetR (+ strideRows)
modifySTRef offsetM (+ (kernelRows * kernelColumns))
traverse U.unsafeFreezeMatrix dataIms
U.unsafeFreezeMatrix dataIm
vid2colUnsafe :: Int -> Int -> Int -> Int -> Int -> Int -> [Matrix Double] -> Matrix Double
vid2colUnsafe kernelRows kernelColumns striderows stridecols vidrows vidcols dataVid = U.runSTMatrix $ do