conv_filter api changes

This commit is contained in:
Tejan Karmali 2018-10-24 13:28:22 -04:00
parent ca8ad63fb6
commit 10f3a8eae2

View File

@ -384,7 +384,7 @@ conv(x::TrackedArray, w::AbstractArray; kw...) = track(conv, x, w; kw...)
conv(data(x), data(w); kw...), conv(data(x), data(w); kw...),
Δ -> nobacksies(:conv, Δ -> nobacksies(:conv,
(NNlib.∇conv_data(data.((Δ, w))...; size=size(x), kw...), (NNlib.∇conv_data(data.((Δ, w))...; size=size(x), kw...),
NNlib.∇conv_filter(data.((Δ, x, w))...; kw...))) NNlib.∇conv_filter(data.((Δ, x))..., size(w); kw...)))
∇conv_data(x::TrackedArray, w::TrackedArray; kw...) = track(∇conv_data, x, w; kw...) ∇conv_data(x::TrackedArray, w::TrackedArray; kw...) = track(∇conv_data, x, w; kw...)
∇conv_data(x::AbstractArray, w::TrackedArray; kw...) = track(∇conv_data, x, w; kw...) ∇conv_data(x::AbstractArray, w::TrackedArray; kw...) = track(∇conv_data, x, w; kw...)
@ -394,7 +394,7 @@ conv(x::TrackedArray, w::AbstractArray; kw...) = track(conv, x, w; kw...)
∇conv_data(data(x), data(w); kw...), ∇conv_data(data(x), data(w); kw...),
Δ -> nobacksies(:conv, Δ -> nobacksies(:conv,
(NNlib.conv(data.((Δ, w))...; size=size(x), kw...), (NNlib.conv(data.((Δ, w))...; size=size(x), kw...),
NNlib.∇conv_filter(data.((x, Δ, w))...; kw...))) NNlib.∇conv_filter(data.((x, Δ))..., size(w); kw...)))
maxpool(x::TrackedArray, k; kw...) = track(maxpool, x, k; kw...) maxpool(x::TrackedArray, k; kw...) = track(maxpool, x, k; kw...)