Merge pull request #484 from JamesWrigley/undefined-variable

Reference Dagger.EAGER_THUNK_STREAMS explicitly
JuliaParallel · Mar 14, 2024 · b4f41c8 · b4f41c8
2 parents 6b9a1af + 73c62dc
commit b4f41c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/sch/eager.jl b/src/sch/eager.jl
@@ -117,7 +117,7 @@ function eager_cleanup(state, uid)
         delete!(state.thunk_dict, tid)
     end
     remotecall_wait(1, uid) do uid
-        lock(EAGER_THUNK_STREAMS) do global_streams
+        lock(Dagger.EAGER_THUNK_STREAMS) do global_streams
             if haskey(global_streams, uid)
                 delete!(global_streams, uid)
             end

diff --git a/src/submission.jl b/src/submission.jl
@@ -186,7 +186,7 @@ end
 function EagerThunkMetadata(spec::EagerTaskSpec)
     f = chunktype(spec.f).instance
     arg_types = ntuple(i->chunktype(spec.args[i][2]), length(spec.args))
-    return_type = Base._return_type(f, Base.to_tuple_type(arg_types))
+    return_type = Base.promote_op(f, arg_types...)
     return EagerThunkMetadata(return_type)
 end
 chunktype(t::EagerThunk) = t.metadata.return_type