Skip to content

Commit f863a7d

Browse files
committed
Small simplification to Libtask extension
1 parent 4bf2ac5 commit f863a7d

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

ext/AdvancedPSLibtaskExt.jl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ function AdvancedPS.advance!(trace::LibtaskTrace, isref::Bool=false)
8484
rng = get_rng(trace)
8585
isref ? AdvancedPS.load_state!(rng) : AdvancedPS.save_state!(rng)
8686
AdvancedPS.inc_counter!(rng)
87-
set_rng!(trace, rng)
8887
# Move to next step
8988
return Libtask.consume(trace.model.ctask)
9089
end
@@ -98,15 +97,10 @@ function AdvancedPS.addreference!(trace::LibtaskTrace)
9897
return trace
9998
end
10099

101-
function AdvancedPS.update_rng!(trace::LibtaskTrace)
102-
set_rng!(trace, deepcopy(get_rng(trace)))
103-
return trace
104-
end
105-
106100
# Task copying version of fork for Trace.
107101
function AdvancedPS.fork(trace::LibtaskTrace, isref::Bool=false)
108102
newtrace = copy(trace)
109-
AdvancedPS.update_rng!(newtrace)
103+
set_rng!(newtrace, deepcopy(get_rng(newtrace)))
110104
isref && AdvancedPS.delete_retained!(newtrace.model.f)
111105
isref && delete_seeds!(newtrace)
112106
AdvancedPS.addreference!(newtrace)
@@ -119,7 +113,6 @@ function AdvancedPS.forkr(trace::LibtaskTrace)
119113
rng = get_rng(trace)
120114
newf = AdvancedPS.reset_model(trace.model.f)
121115
Random123.set_counter!(rng, 1)
122-
trace.rng = rng
123116

124117
ctask = Libtask.TapedTask(TapedGlobals(rng, get_other_global(trace)), newf)
125118
new_tapedmodel = AdvancedPS.LibtaskModel(newf, ctask)
@@ -143,7 +136,7 @@ function AdvancedPS.observe(dist::Distributions.Distribution, x)
143136
end
144137

145138
"""
146-
AbstractMCMC interface. We need libtask to sample from arbitrary callable AbstractModelext
139+
AbstractMCMC interface. We need libtask to sample from arbitrary callable AbstractModel
147140
"""
148141

149142
function AbstractMCMC.step(

src/rng.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,3 @@ Random123.set_counter!(r::TracedRNG, n::Integer) = r.count = n
118118
Increase the model step counter by `n`
119119
"""
120120
inc_counter!(r::TracedRNG, n::Integer=1) = r.count += n
121-
122-
function update_rng! end

0 commit comments

Comments
 (0)