GraphVizExt, TaskDependencies: Various fixes

Author: jpsamaroo

ext/GraphVizExt.jl

@@ -9,7 +9,7 @@ end
 import Dagger
 import Dagger: EagerThunk, Chunk, Processor
 import Dagger.TimespanLogging: Timespan
-import Graphs: SimpleDiGraph, add_edge!, add_vertex!, inneighbors, outneighbors, vertices, is_directed, edges, nv
+import Graphs: SimpleDiGraph, add_edge!, add_vertex!, inneighbors, outneighbors, vertices, is_directed, edges, nv, src, dst
 
 function pretty_time(t; digits=3)
     r(t) = round(t; digits)

src/sch/dynamic.jl

@@ -7,6 +7,7 @@ struct ThunkID
     ref::Union{DRef,Nothing}
 end
 ThunkID(id::Int) = ThunkID(id, nothing)
+Dagger.istask(::ThunkID) = true
 
 "A handle to the scheduler, used by dynamic thunks."
 struct SchedulerHandle

src/utils/logging-events.jl

@@ -181,20 +181,27 @@ Records the dependencies of each submitted task.
 """
 struct TaskDependencies end
 function (::TaskDependencies)(ev::Event{:start})
-    if ev.category == :add_thunk
-        deps = Int[]
-        for dep in get(Set, ev.timeline.options, :syncdeps)
+    local deps_tids::Vector{Int}
+    function get_deps!(deps)
+        for dep in deps
             dep = Dagger.unwrap_weak_checked(dep)
             if dep isa Dagger.Thunk || dep isa Dagger.Sch.ThunkID
-                push!(deps, dep.id)
-            elseif dep isa Dagger.EagerThunk
-                # FIXME: Get TID
-                #push!(deps, dep.uid)
+                push!(deps_tids, dep.id)
+            elseif dep isa Dagger.EagerThunk && myid() == 1
+                tid = lock(Dagger.Sch.EAGER_ID_MAP) do id_map
+                    id_map[dep.uid]
+                end
+                push!(deps_tids, tid)
             else
                 @warn "Unexpected dependency type: $dep"
             end
         end
-        return ev.id.thunk_id => deps
+    end
+    if ev.category == :add_thunk
+        deps_tids = Int[]
+        get_deps!(Iterators.filter(Dagger.istask, Iterators.map(last, ev.timeline.args)))
+        get_deps!(get(Set, ev.timeline.options, :syncdeps))
+        return ev.id.thunk_id => deps_tids
     end
     return
 end