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

Merge pull request #494 from FluxML/mji/chain

Browse Source 
Make Chain immutable
This commit is contained in:
Mike J Innes 2018-11-16 13:52:00 +00:00 committed by GitHub
commit 4cba46c293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Flux.jl
View File

@ -2,6 +2,7 @@ module Flux
# Zero Flux Given # Zero Flux Given
using Base: tail
using MacroTools, Juno, Requires, Reexport, Statistics, Random using MacroTools, Juno, Requires, Reexport, Statistics, Random
using MacroTools: @forward using MacroTools: @forward

13
src/layers/basic.jl
View File

@ -16,18 +16,21 @@ m(x) == m[2](m[1](x))
`Chain` also supports indexing and slicing, e.g. `m[2]` or `m[1:end-1]`. `Chain` also supports indexing and slicing, e.g. `m[2]` or `m[1:end-1]`.
`m[1:3](x)` will calculate the output of the first three layers. `m[1:3](x)` will calculate the output of the first three layers.
""" """
struct Chain struct Chain{T<:Tuple}
layers::Vector{Any} layers::T
Chain(xs...) = new([xs...]) Chain(xs...) = new{typeof(xs)}(xs)
end end
@forward Chain.layers Base.getindex, Base.first, Base.last, Base.lastindex, Base.push! @forward Chain.layers Base.getindex, Base.first, Base.last, Base.lastindex
@forward Chain.layers Base.iterate @forward Chain.layers Base.iterate
children(c::Chain) = c.layers children(c::Chain) = c.layers
mapchildren(f, c::Chain) = Chain(f.(c.layers)...) mapchildren(f, c::Chain) = Chain(f.(c.layers)...)
(c::Chain)(x) = foldl((x, m) -> m(x), c.layers; init = x) applychain(::Tuple{}, x) = x
applychain(fs::Tuple, x) = applychain(tail(fs), first(fs)(x))
(c::Chain)(x) = applychain(c.layers, x)
Base.getindex(c::Chain, i::AbstractArray) = Chain(c.layers[i]...) Base.getindex(c::Chain, i::AbstractArray) = Chain(c.layers[i]...)