From 3bfb2c5a37b789eda8511a750b59d6d4da6477f8 Mon Sep 17 00:00:00 2001
From: Mike J Innes <mike.j.innes@gmail.com>
Date: Mon, 26 Dec 2016 12:11:24 +0000
Subject: [PATCH] more stack frame integration

---
 src/Flux.jl                     | 2 +-
 src/backend/tensorflow/model.jl | 5 +++--
 src/compiler/code.jl            | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Flux.jl b/src/Flux.jl
index 023692c2..a7604561 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -4,7 +4,7 @@ using MacroTools, Lazy, DataFlow, Juno
 using DataFlow: graphm, syntax, prewalk!, postwalk!, prewalk, postwalk,
   iscyclic, Constant, constant, isconstant, group, Split, splitnode,
   detuple, value, inputs, thread!, value, inputs, Split, splitnode, inputnode,
-  spliceinputs, bumpinputs
+  spliceinputs, bumpinputs, Frame
 using Juno: Tree, Row
 
 # Zero Flux Given
diff --git a/src/backend/tensorflow/model.jl b/src/backend/tensorflow/model.jl
index 7f03ba8a..ef6d2040 100644
--- a/src/backend/tensorflow/model.jl
+++ b/src/backend/tensorflow/model.jl
@@ -41,8 +41,9 @@ function tferr(model::Model, e)
   m == nothing && return
   node = m.captures[1]
   if haskey(model.stacks, node)
-    l = model.stacks[node][end]
-    println("TensorFlow error occured at $(l.file):$(l.line)")
+    stk = model.stacks[node]
+    println("TensorFlow error occured at:")
+    foreach(l -> println("$(l.file):$(l.line)"), stk)
   end
 end
 
diff --git a/src/compiler/code.jl b/src/compiler/code.jl
index 68134364..49c7dc65 100644
--- a/src/compiler/code.jl
+++ b/src/compiler/code.jl
@@ -21,6 +21,7 @@ function makegraph(graph, args)
       :(Flux.Offset($(Expr(:quote, x.name)), $(x.n), self.$(x.name))) :
       x
   end
+  vertex(:(Flux.Frame(self)), graph)
 end
 
 function build_type(T, params)