Skip to content

Commit d4a5f05

Browse files
committed
fixup! wrong move_rewrap signature
1 parent 7368675 commit d4a5f05

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/datadeps/aliasing.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ function merge_history!(state::DataDepsState, arg_w::ArgumentWrapper, other_arg_
513513
history = state.arg_history[arg_w]
514514
@opcounter :merge_history
515515
@opcounter :merge_history_complexity length(history)
516-
largest_value_update!(length(history))
517516
origin_space = state.arg_origin[other_arg_w.arg]
518517
for other_entry in state.arg_history[other_arg_w]
519518
write_num_tuple = HistoryEntry(AliasingWrapper(NoAliasing()), origin_space, other_entry.write_num)
@@ -663,7 +662,7 @@ function generate_slot!(state::DataDepsState, dest_space, data)
663662
ctx = Sch.eager_context()
664663
id = rand(Int)
665664
@maybelog ctx timespan_start(ctx, :move, (;thunk_id=0, id, position=ArgPosition(), processor=to_proc), (;f=nothing, data))
666-
data_chunk = move_rewrap(from_proc, to_proc, data)
665+
data_chunk = move_rewrap(from_proc, to_proc, orig_space, dest_space, data)
667666
@maybelog ctx timespan_finish(ctx, :move, (;thunk_id=0, id, position=ArgPosition(), processor=to_proc), (;f=nothing, data=data_chunk))
668667
end
669668
@assert memory_space(data_chunk) == dest_space "space mismatch! $dest_space (dest) != $(memory_space(data_chunk)) (actual) ($(typeof(data)) (data) vs. $(typeof(data_chunk)) (chunk)), spaces ($orig_space -> $dest_space)"
@@ -684,7 +683,7 @@ function get_or_generate_slot!(state, dest_space, data)
684683
end
685684
return state.remote_args[dest_space][data]
686685
end
687-
function move_rewrap(from_proc::Processor, to_proc::Processor, data)
686+
function move_rewrap(from_proc::Processor, to_proc::Processor, from_space::MemorySpace, to_space::MemorySpace, data)
688687
return aliased_object!(data) do data
689688
return remotecall_endpoint(identity, from_proc, to_proc, from_space, to_space, data)
690689
end

0 commit comments

Comments
 (0)