Fix more DynamicPPL stuff

Author: penelopeysm

perf/p0.jl

@@ -12,9 +12,17 @@ using BenchmarkTools
     y ~ Normal(μ, sqrt(σ))
 end
 
+function make_sampling_model_and_args(model, rng, sampler)
+    ctx = DynamicPPL.SamplingContext(rng, sampler, model.context)
+    spl_model = DynamicPPL.contextualize(model, ctx)
+    fargs, _ = DynamicPPL.make_evaluate_args_and_kwargs(spl_model, varinfo)
+    return (spl_model, fargs)
+end
+
 # Case 1: Sample from the prior.
-rng = MersenneTwister()
-m = Turing.Inference.TracedModel(gdemo(1.5, 2.0), SampleFromPrior(), VarInfo(), rng)
+spl, rng = SampleFromPrior(), MersenneTwister()
+spl_model, fargs = make_sampling_model_and_args(gdemo(1.5, 2.0), rng, spl)
+m = Turing.Inference.TracedModel(spl_model, spl, VarInfo(), fargs)
 f = m.evaluator[1];
 args = m.evaluator[2:end];
 
@@ -27,7 +35,9 @@ println("Run a tape...")
 @btime t.tf(args...)
 
 # Case 2: SMC sampler
-m = Turing.Inference.TracedModel(gdemo(1.5, 2.0), Sampler(SMC(50)), VarInfo(), rng)
+spl, rng = SMC(50), MersenneTwister()
+spl_model, fargs = make_sampling_model_and_args(gdemo(1.5, 2.0), rng, spl)
+m = Turing.Inference.TracedModel(spl_model, spl, VarInfo(), fargs)
 f = m.evaluator[1];
 args = m.evaluator[2:end];
 

perf/p2.jl

@@ -52,7 +52,9 @@ Random.seed!(rng, 2)
 iterations = 500
 model_fun = infiniteGMM(data)
 
-m = Turing.Inference.TracedModel(model_fun, Sampler(SMC(50)), VarInfo(), rng)
+spl = SMC(50)
+spl_model, fargs = make_sampling_model_and_args(model_fun, rng, spl)
+m = Turing.Inference.TracedModel(spl_model, spl, VarInfo(), fargs)
 f = m.evaluator[1]
 args = m.evaluator[2:end]