Switch to Libtask.TapedTask (#43)

* Switch to Libtask.TapedTask

* Rename `ttask` to `task`

* Update Project.toml

Co-authored-by: Hong Ge <[email protected]>

Co-authored-by: Hong Ge <[email protected]>

Author: Rik Huijzer

Project.toml

@@ -1,7 +1,7 @@
 name = "AdvancedPS"
 uuid = "576499cb-2369-40b2-a588-c64705576edc"
 authors = ["TuringLang"]
-version = "0.3.0"
+version = "0.4"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"

src/container.jl

@@ -1,27 +1,27 @@
 struct Trace{F,R<:TracedRNG}
     f::F
-    ctask::Libtask.CTask
+    task::Libtask.TapedTask
     rng::R
 end
 
 const Particle = Trace
 
 function Trace(f, rng::TracedRNG)
-    ctask = Libtask.CTask(f, rng)
+    task = Libtask.TapedTask(f, rng)
 
     # add backward reference
-    newtrace = Trace(f, ctask, rng)
-    addreference!(ctask.task, newtrace)
+    newtrace = Trace(f, task, rng)
+    addreference!(task.task, newtrace)
 
     return newtrace
 end
 
-function Trace(f, ctask::Libtask.CTask)
-    return Trace(f, ctask, TracedRNG())
+function Trace(f, task::Libtask.TapedTask)
+    return Trace(f, task, TracedRNG())
 end
 
 # Copy task
-Base.copy(trace::Trace) = Trace(trace.f, copy(trace.ctask), deepcopy(trace.rng))
+Base.copy(trace::Trace) = Trace(trace.f, copy(trace.task), deepcopy(trace.rng))
 
 # step to the next observe statement and
 # return the log probability of the transition (or nothing if done)
@@ -30,7 +30,7 @@ function advance!(t::Trace, isref::Bool)
     inc_counter!(t.rng)
 
     # Move to next step
-    return Libtask.consume(t.ctask)
+    return Libtask.consume(t.task)
 end
 
 # reset log probability
@@ -45,7 +45,7 @@ function fork(trace::Trace, isref::Bool=false)
     isref && delete_retained!(newtrace.f)
 
     # add backward reference
-    addreference!(newtrace.ctask.task, newtrace)
+    addreference!(newtrace.task.task, newtrace)
 
     return newtrace
 end
@@ -56,11 +56,11 @@ function forkr(trace::Trace)
     newf = reset_model(trace.f)
     Random123.set_counter!(trace.rng, 1)
 
-    ctask = Libtask.CTask(newf, trace.rng)
+    task = Libtask.TapedTask(newf, trace.rng)
 
     # add backward reference
-    newtrace = Trace(newf, ctask, trace.rng)
-    addreference!(ctask.task, newtrace)
+    newtrace = Trace(newf, task, trace.rng)
+    addreference!(task.task, newtrace)
 
     return newtrace
 end

test/container.jl

@@ -111,15 +111,15 @@
         # Test task copy version of trace
         tr = AdvancedPS.Trace(f2, AdvancedPS.TracedRNG())
 
-        consume(tr.ctask)
-        consume(tr.ctask)
+        consume(tr.task)
+        consume(tr.task)
 
         a = AdvancedPS.fork(tr)
-        consume(a.ctask)
-        consume(a.ctask)
+        consume(a.task)
+        consume(a.task)
 
-        @test consume(tr.ctask) == 2
-        @test consume(a.ctask) == 4
+        @test consume(tr.task) == 2
+        @test consume(a.task) == 4
     end
 
     @testset "seed container" begin