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

fix tensorflow

Browse Source
This commit is contained in:
Mike J Innes 2017-05-22 18:15:47 +01:00
parent f7eb5179b1
commit 7a2a72a74a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/tensorflow/graph.jl
View File

@ -1,5 +1,5 @@
using Base: @get! using Base: @get!
using DataFlow: Constant, constant, Split using DataFlow: constant, Split
using DataFlow.Interpreter using DataFlow.Interpreter
using DataFlow.Interpreter: stack using DataFlow.Interpreter: stack
using TensorFlow: RawTensor, TFException using TensorFlow: RawTensor, TFException
@ -53,33 +53,34 @@ graph(p::MaxPool, x) =
graph(op::Op, xs...) = op.f(xs...) graph(op::Op, xs...) = op.f(xs...)
function graph(ctx::Context, model, args...) function graph(ctx::Context, model, args...)
node = graph(model, interpv(ctx, args)...) node = graph(model, args...)
node isa Tensor && (ctx[:stacks][node.op.name] = stack(ctx)) node isa Tensor && (ctx[:stacks][node.op.name] = stack(ctx))
return node return node
end end
interp(ctx, c::Conv2D, x) = interp(ctx, c::Conv2D, x) =
nn.conv2d(interpv(ctx, x), interp(ctx, Constant(c.filter)), [1,c.stride...,1], "VALID") nn.conv2d(x, interp(ctx, constant(c.filter)), [1,c.stride...,1], "VALID")
interp{T<:AArray}(ctx, p::Constant{Flux.Param{T}}) = param(ctx, p::Flux.Param{<:AArray}) =
haskey(ctx[:params], p.value) ? haskey(ctx[:params], p) ?
ctx[:params][p.value] : ctx[:params][p] :
(ctx[:params][p.value] = (ctx[:params][p] =
ctx[:variables] ? ctx[:variables] ?
Variable(Float32.(p.value.x)) : Variable(Float32.(p.x)) :
placeholder(Float32)) placeholder(Float32))
interp(ctx, p::Constant) = p.value param(ctx, x) = x
function interp(ctx, model, args...) function interp(ctx, model, args...)
args = param.(ctx, args)
g = Flux.graph(model) g = Flux.graph(model)
g == nothing && return graph(ctx, model, args...) g == nothing && return graph(ctx, model, args...)
DataFlow.iscyclic(g) && error("This model has a cycle; try unrolling it first.") DataFlow.iscyclic(g) && error("This model has a cycle; try unrolling it first.")
interpret(ctx, g, interpv(ctx, args)...) interpret(ctx, g, args...)
end end
function tograph(model, args...; variables = false) function tograph(model, args...; variables = false)
ctx = Context(mux(iline, ilambda, interp), ctx = Context(mux(iline, iconst, ilambda, iargs, ituple, interp),
params = ObjectIdDict(), stacks = Dict(), variables = variables) params = ObjectIdDict(), stacks = Dict(), variables = variables)
out = interp(ctx, model, map(constant, args)...) out = interp(ctx, model, map(constant, args)...)
return ctx[:params], ctx[:stacks], out return ctx[:params], ctx[:stacks], out