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

val deprecations

Browse Source
This commit is contained in:
Mike J Innes 2018-07-12 20:59:07 +01:00
parent 474f578517
commit 89872c5a8b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tracker/array.jl
View File

@ -165,11 +165,11 @@ Base.cat(a::AbstractArray, b::TrackedArray, c::AbstractArray...; dims) = track_k
@grad function cat(Xs...; dims) @grad function cat(Xs...; dims)
cat(data.(Xs)..., dims = dims), function (Δ) cat(data.(Xs)..., dims = dims), function (Δ)
start = ntuple(i -> 0, Val{ndims(Δ)}) start = ntuple(i -> 0, Val(ndims(Δ)))
Δs = [begin Δs = [begin
dim_xs = 1:ndims(xs) dim_xs = 1:ndims(xs)
till_xs = ntuple((i -> i in dims ? (i in dim_xs ? size(xs,i) : 1) : 0), Val{ndims(Δ)}) till_xs = ntuple((i -> i in dims ? (i in dim_xs ? size(xs,i) : 1) : 0), Val(ndims(Δ)))
xs_in_Δ = ntuple(i -> till_xs[i] > 0 ? (start[i]+1:start[i]+till_xs[i]) : Colon(), Val{ndims(Δ)}) xs_in_Δ = ntuple(i -> till_xs[i] > 0 ? (start[i]+1:start[i]+till_xs[i]) : Colon(), Val(ndims(Δ)))
d = reshape(Δ[xs_in_Δ...],size(xs)) d = reshape(Δ[xs_in_Δ...],size(xs))
start = start .+ till_xs start = start .+ till_xs
d d
@ -350,13 +350,13 @@ end
function ∇broadcast(f, args::Vararg{Any,N}) where N function ∇broadcast(f, args::Vararg{Any,N}) where N
sizes = _size.(args) sizes = _size.(args)
dargs = map((x,i) -> dualify(data(x), ntuple(j -> i==j, Val{N})), args, ntuple(identity, Val{N})) dargs = map((x,i) -> dualify(data(x), ntuple(j -> i==j, Val(N))), args, ntuple(identity, Val(N)))
out = broadcast(f, dargs...) out = broadcast(f, dargs...)
eltype(out) <: Dual || return out eltype(out) <: Dual || return out
y = value.(out) y = value.(out)
back = function (Δ_) back = function (Δ_)
Δ = data(Δ_) Δ = data(Δ_)
Δargs = ntuple(i -> getpartial.(Δ, out, i), Val{N}) Δargs = ntuple(i -> getpartial.(Δ, out, i), Val(N))
dxs = map((x, Δ) -> unbroadcast(x, Δ), sizes, Δargs) dxs = map((x, Δ) -> unbroadcast(x, Δ), sizes, Δargs)
nobacksies(:broadcast, dxs) nobacksies(:broadcast, dxs)
end end