From 329e8be6a66c4fcd74a4dc17665ccf75b9dde73b Mon Sep 17 00:00:00 2001 From: JamesWrigley Date: Wed, 13 Mar 2024 22:43:44 +0100 Subject: [PATCH 1/2] Reference Dagger.EAGER_THUNK_STREAMS explicitly --- src/sch/eager.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sch/eager.jl b/src/sch/eager.jl index ee58ccd7d..40f63ad6c 100644 --- 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 From 73c62dc7650a24689ffac4c7d7aa5784fef23d53 Mon Sep 17 00:00:00 2001 From: JamesWrigley Date: Thu, 14 Mar 2024 10:42:33 +0100 Subject: [PATCH 2/2] Use Base.promote_op() instead of Base._return_type() return_type() is kinda broken in v1.10, see: https://github.com/JuliaLang/julia/issues/52385 In any case Base.promote_op() is the official public API for this operation so we should use it anyway. --- src/submission.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submission.jl b/src/submission.jl index 776315f65..9627c77a3 100644 --- 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