mostly recover old behaviour
This commit is contained in:
parent
42a7a6ebf6
commit
21a3b95260
@ -32,39 +32,53 @@ function atomise(model)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# hiddeninput(n) = vertex(Split(n), inputnode(1))
|
function collect_state(v::IVertex)
|
||||||
#
|
state = typeof(v)[]
|
||||||
# function unroll!(delay::IVertex, n)
|
offset = Int[]
|
||||||
# prewalk!(delay[1]) do v
|
default = Param[]
|
||||||
# v === delay ? hiddeninput(n) : v
|
prewalk!(v) do v
|
||||||
# end
|
isa(value(v), Offset) || return v
|
||||||
# end
|
if (i = findfirst(state, v[1])) == 0
|
||||||
#
|
push!(state, v[1])
|
||||||
# function break!(g::IVertex)
|
push!(offset, value(v).n)
|
||||||
# g = bumpinputs(g)
|
push!(default, get(value(v).default))
|
||||||
# loops = []
|
else
|
||||||
# defaults = []
|
offset[i] = min(offset[i], value(v).n)
|
||||||
# g = prewalk!(g) do v
|
end
|
||||||
# isa(value(v), Offset) || return v
|
v
|
||||||
# n = length(loops)+1
|
end
|
||||||
# push!(loops, unroll!(v, n))
|
return state, offset, default
|
||||||
# push!(defaults, get(value(v).default))
|
end
|
||||||
# hiddeninput(n)
|
|
||||||
# end
|
hiddeninput(n) = vertex(Split(n), inputnode(1))
|
||||||
# cse(group(group(loops...), g)), defaults
|
|
||||||
# end
|
function create_steps(v::IVertex, n)
|
||||||
#
|
[bumpinputs(spliceinputs(v, hiddeninput(i))) for i = 1:n]
|
||||||
# function unrollgraph(model, n)
|
end
|
||||||
# graph, defaults = break!(atomise(model))
|
|
||||||
# outputs = [spliceinputs(graph, group([constant(splitnode(inputnode(1),i)) for i = 1:length(defaults)]...),
|
function unrollgraph(v::IVertex, n)
|
||||||
# splitnode(inputnode(2), 1))]
|
state, offset, default = collect_state(v)
|
||||||
# for i = 2:n
|
v = group(group(state...), v)
|
||||||
# push!(outputs, spliceinputs(graph, outputs[end][1], splitnode(inputnode(2), i)))
|
steps = create_steps(v, n)
|
||||||
# end
|
for i = 1:n
|
||||||
# state = outputs[end][1]
|
vars = inputs(steps[i][1])
|
||||||
# outputs = map(x -> x[2], outputs)
|
prewalk!(steps[i]) do v
|
||||||
# (@> group(state, group(outputs...)) detuple), map(x->x.x, defaults)
|
isa(value(v), Offset) || return v
|
||||||
# end
|
stepid = value(v).n + i
|
||||||
|
varid = findfirst(vars,v[1])
|
||||||
|
if stepid ∈ 1:n
|
||||||
|
steps[stepid][1,varid]
|
||||||
|
elseif stepid < 1
|
||||||
|
vertex(:input, constant(varid))
|
||||||
|
elseif stepid > n
|
||||||
|
constant(:output, constant(varid))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
group(steps[end][1],group(map(x->x[2], steps)...))
|
||||||
|
end
|
||||||
|
|
||||||
|
unrollgraph(atomise(Chain(r,r)), 5) |> detuple |> syntax |> prettify
|
||||||
|
|
||||||
type Unrolled <: Model
|
type Unrolled <: Model
|
||||||
model
|
model
|
||||||
@ -76,3 +90,12 @@ end
|
|||||||
graph(u::Unrolled) = u.graph
|
graph(u::Unrolled) = u.graph
|
||||||
|
|
||||||
unroll(model, n) = Unrolled(model, unrollgraph(model, n)..., n)
|
unroll(model, n) = Unrolled(model, unrollgraph(model, n)..., n)
|
||||||
|
|
||||||
|
@net type Recurrent
|
||||||
|
y
|
||||||
|
function (x)
|
||||||
|
y = σ(x, y{-1})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
r = Recurrent(rand(5))
|
||||||
|
Loading…
Reference in New Issue
Block a user