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

make use of line info

Browse Source
This commit is contained in:
Mike J Innes 2016-12-27 00:45:36 +00:00
parent 8d1171cb96
commit 525ebf00f2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/shape.jl
View File

@ -1,4 +1,4 @@
using DataFlow: iline, iargs using DataFlow: ilinev, iargs, applylines, Line
type Hint type Hint
typ typ
@ -7,6 +7,7 @@ end
DataFlow.tocall(h::Hint, x) = :($x::$(h.typ)) DataFlow.tocall(h::Hint, x) = :($x::$(h.typ))
function gethint(v::IVertex) function gethint(v::IVertex)
while isa(value(v), Union{Line,Frame}) v = v[1] end
isa(value(v), Hint) && return value(v).typ isa(value(v), Hint) && return value(v).typ
return return
end end
@ -17,7 +18,7 @@ ihint(f, args...) = f(args...)
hintify(c::Constant) = hintify(state(c.value)) hintify(c::Constant) = hintify(state(c.value))
hintify(xs::AbstractArray) = vertex(Hint(size(xs)), constant(:_)) hintify(xs::AbstractArray) = vertex(Hint(size(xs)), constant(:_))
interpshape = mux(iline, ihint, iargs, ituple, hintify) interpshape = mux(ilinev, ihint, iargs, ituple, hintify)
function hintify(f, xs...) function hintify(f, xs...)
sh = infer(f, map(gethint, xs)...) sh = infer(f, map(gethint, xs)...)
@ -26,15 +27,17 @@ function hintify(f, xs...)
vertex(f, xs...) vertex(f, xs...)
end end
function shapes(f, args...) function shapesv(f, args...)
(g = graph(f)) == nothing && return (g = graph(f)) == nothing && return
ins = [vertex(Hint(d), inputnode(i)) for (i,d) in enumerate(args)] ins = [vertex(Hint(d), inputnode(i)) for (i,d) in enumerate(args)]
interpret(Context(interpshape), g, ins...) interpret(Context(interpshape), g, ins...)
end end
shapes(args...) = shapesv(args...) |> syntax |> applylines |> (x->prettify(x, lines=true))
# Inference primitives # Inference primitives
infer(f, args...) = graph(f) == nothing ? nothing : gethint(shapes(f, args...)) infer(f, args...) = graph(f) == nothing ? nothing : gethint(shapesv(f, args...))
function infer(::typeof(*), a::NTuple{2}, b::NTuple{2}) function infer(::typeof(*), a::NTuple{2}, b::NTuple{2})
a[2] == b[1] || return nothing a[2] == b[1] || return nothing