TastyPancakes/Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update as per new AD

Browse Source
This commit is contained in:
Avik Pal 2018-07-13 14:12:46 +05:30
parent 0aabf9d86b
commit 2664a16556
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/models/convolution.md
View File

@ -1,4 +1,4 @@
# Additional Convolution Models # Additional Convolution Layers
## Depthwise Convolutions ## Depthwise Convolutions

20
src/tracker/array.jl
View File

@ -324,19 +324,15 @@ logsoftmax(xs::TrackedArray) = track(logsoftmax, xs)
@grad logsoftmax(xs) = logsoftmax(data(xs)), Δ -> (nobacksies(:logsoftmax, ∇logsoftmax(data(Δ), data(xs))),) @grad logsoftmax(xs) = logsoftmax(data(xs)), Δ -> (nobacksies(:logsoftmax, ∇logsoftmax(data(Δ), data(xs))),)
_depthwiseconv(x, w, stride, pad) = depthwiseconv(x, w, stride = stride, pad = pad) depthwiseconv(x::TrackedArray, w::TrackedArray; kw...) = track(depthwiseconv, x, w; kw...)
depthwiseconv(x::AbstractArray, w::TrackedArray; kw...) = track(depthwiseconv, x, w; kw...)
depthwiseconv(x::TrackedArray, w::AbstractArray; kw...) = track(depthwiseconv, x, w; kw...)
depthwiseconv(x::TrackedArray{<:Real,N}, w::TrackedArray{<:Real,N}; stride = 1, pad = 0) where N = @grad depthwiseconv(x, w; kw...) =
track(_depthwiseconv, x, w, stride, pad) depthwiseconv(data(x), data(w); kw...),
depthwiseconv(x::AbstractArray{<:Real,N}, w::TrackedArray{<:Real,N}; stride = 1, pad = 0) where N = Δ -> nobacksies(:depthwiseconv,
track(_depthwiseconv, x, w, stride, pad) (NNlib.∇depthwiseconv_data(data.((Δ, x, w))...; kw...),
depthwiseconv(x::TrackedArray{<:Real,N}, w::AbstractArray{<:Real,N}; stride = 1, pad = 0) where N = NNlib.∇depthwiseconv_filter(data.((Δ, x, w))...; kw...)))
track(_depthwiseconv, x, w, stride, pad)
function back(::typeof(_depthwiseconv), Δ, x, w, stride, pad)
@back(x, NNlib.∇depthwiseconv_data(Δ, data(x), data(w), stride = stride, pad = pad))
@back(w, NNlib.∇depthwiseconv_filter(Δ, data(x), data(w), stride = stride, pad = pad))
end
conv(x::TrackedArray, w::TrackedArray; kw...) = track(conv, x, w; kw...) conv(x::TrackedArray, w::TrackedArray; kw...) = track(conv, x, w; kw...)
conv(x::AbstractArray, w::TrackedArray; kw...) = track(conv, x, w; kw...) conv(x::AbstractArray, w::TrackedArray; kw...) = track(conv, x, w; kw...)