Fix more imports

Author: penelopeysm

Project.toml

@@ -5,6 +5,7 @@ version = "0.39.1"
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
+AbstractPPL = "7a57a42e-76ec-4ea3-a279-07e840d6d9cf"
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
 AdvancedHMC = "0bf59076-c3b1-5ca4-86bd-e02cd72cde3d"
 AdvancedMH = "5b7e9947-ddc0-4b3f-9b55-0d8042f74170"
@@ -49,6 +50,7 @@ TuringOptimExt = "Optim"
 [compat]
 ADTypes = "1.9"
 AbstractMCMC = "5.5"
+AbstractPPL = "0.11.0"
 Accessors = "0.1"
 AdvancedHMC = "0.3.0, 0.4.0, 0.5.2, 0.6, 0.7, 0.8"
 AdvancedMH = "0.8"

src/mcmc/Inference.jl

@@ -44,6 +44,7 @@ using Accessors: Accessors
 
 import ADTypes
 import AbstractMCMC
+import AbstractPPL
 import AdvancedHMC
 const AHMC = AdvancedHMC
 import AdvancedMH

src/mcmc/gibbs.jl

@@ -124,7 +124,7 @@ function get_conditioned_gibbs(context::GibbsContext, vns::AbstractArray{<:VarNa
 end
 
 function is_target_varname(ctx::GibbsContext, vn::VarName)
-    return any(Base.Fix2(subsumes, vn), ctx.target_varnames)
+    return any(Base.Fix2(AbstractPPL.subsumes, vn), ctx.target_varnames)
 end
 
 function is_target_varname(context::GibbsContext, vns::AbstractArray{<:VarName})

src/mcmc/mh.jl

@@ -289,7 +289,7 @@ end
 
 function maybe_link!!(varinfo, sampler, proposal, model)
     return if should_link(varinfo, sampler, proposal)
-        link!!(varinfo, model)
+        DynamicPPL.link!!(varinfo, model)
     else
         varinfo
     end