Move default model evaluation code to DynamicPPL (#1151)

* Remove distribution wrappers (~> DynamicPPL)

* Remove asssume/observer fallback code (~> DynamicPPL)

* Update imports/exports/qualified names

* Remove unnecessary code from utils (is in DPPL now)

* fix rebase

* bump DPPL compat version

Co-authored-by: mohamed82008 <mohamed82008@gmail.com>

Author: phipsgabler

Project.toml

@@ -40,7 +40,7 @@ BinaryProvider = "0.5.6"
 Distributions = "0.22, 0.23"
 DistributionsAD = "0.4.8"
 DocStringExtensions = "0.8"
-DynamicPPL = "0.4"
+DynamicPPL = "0.5"
 EllipticalSliceSampling = "0.2"
 ForwardDiff = "0.10.3"
 Libtask = "0.3.1"

src/Turing.jl

@@ -16,7 +16,7 @@ using Markdown, Libtask, MacroTools
 using Tracker: Tracker
 
 import Base: ~, ==, convert, hash, promote_rule, rand, getindex, setindex!
-import DynamicPPL: getspace, runmodel!
+import DynamicPPL: getspace, runmodel!, NoDist, NamedDist
 
 const PROGRESS = Ref(true)
 function turnprogress(switch::Bool)

src/inference/AdvancedSMC.jl

@@ -260,7 +260,7 @@ function AbstractMCMC.sample_end!(
     spl.state.average_logevidence = loge
 end
 
-function assume(spl::Sampler{<:Union{PG,SMC}}, dist::Distribution, vn::VarName, ::VarInfo)
+function DynamicPPL.assume(spl::Sampler{<:Union{PG,SMC}}, dist::Distribution, vn::VarName, ::VarInfo)
     vi = current_trace().vi
     if vn in getspace(spl)
         if ~haskey(vi, vn)
@@ -289,7 +289,7 @@ function assume(spl::Sampler{<:Union{PG,SMC}}, dist::Distribution, vn::VarName,
     return r, 0
 end
 
-function observe(spl::Sampler{<:Union{PG,SMC}}, dist::Distribution, value, vi)
+function DynamicPPL.observe(spl::Sampler{<:Union{PG,SMC}}, dist::Distribution, value, vi)
     produce(logpdf(dist, value))
     return 0
 end