Skip to content

Update args at copy #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 10, 2022
Merged

Update args at copy #141

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0355eab
Update mappingx
FredericWantiez May 7, 2022
041e90b
Revert "Update mappingx"
KDr2 May 10, 2022
0b2be06
store and copy args of tapedtask
KDr2 May 10, 2022
5b83b49
check type of args
KDr2 May 10, 2022
4ebbe9e
Update src/tapedtask.jl
yebai May 10, 2022
e23387f
Update src/tapedtask.jl
yebai May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/tapedtask.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@ struct TapedTaskException
backtrace::Vector{Any}
end

struct TapedTask{F}
struct TapedTask{F, AT<:Tuple}
task::Task
tf::TapedFunction{F}
args::AT
produce_ch::Channel{Any}
consume_ch::Channel{Int}
produced_val::Vector{Any}

function TapedTask(
t::Task,
tf::TapedFunction{F},
args::AT,
produce_ch::Channel{Any},
consume_ch::Channel{Int}
) where {F}
new{F}(t, tf, produce_ch, consume_ch, Any[])
) where {F, AT<:Tuple}
new{F, AT}(t, tf, args, produce_ch, consume_ch, Any[])
end
end

Expand Down Expand Up @@ -55,7 +57,7 @@ function TapedTask(tf::TapedFunction, args...)
produce_ch = Channel()
consume_ch = Channel{Int}()
task = @task wrap_task(tf, produce_ch, consume_ch, args...)
t = TapedTask(task, tf, produce_ch, consume_ch)
t = TapedTask(task, tf, args, produce_ch, consume_ch)
task.storage === nothing && (task.storage = IdDict())
task.storage[:tapedtask] = t
return t
Expand Down Expand Up @@ -159,9 +161,15 @@ Base.IteratorEltype(::Type{<:TapedTask}) = Base.EltypeUnknown()

# copy the task

function Base.copy(t::TapedTask)
function Base.copy(t::TapedTask; args=())
tf = copy(t.tf)
new_t = TapedTask(tf)
task_args = if length(args) > 0
typeof(args) == typeof(t.args) || error("bad arguments")
args
else
tape_copy.(t.args)
end
new_t = TapedTask(tf, real_args...)
storage = t.task.storage::IdDict{Any,Any}
new_t.task.storage = copy(storage)
new_t.task.storage[:tapedtask] = new_t
Expand Down
16 changes: 16 additions & 0 deletions test/tapedtask.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,20 @@
end
end
end

@testset "Issues" begin
@testset "Issue-140, copy unstarted task" begin
function f(x)
for i in 1:3
produce(i + x)
end
end

ttask = TapedTask(f, 3)
ttask2 = copy(ttask)
@test consume(ttask2) == 4
ttask3 = copy(ttask; args=(4,))
@test consume(ttask3) == 5
end
end
end