removing AbstractContext def and importing from AbstractPPL (#382)

* removing AbstractContext def and importing from AbstractPPL

* Update Project.toml

* Update Project.toml

* Update to AbstractPPL 0.5 (PR to #382) (#385)

This PR updates #382.

It
- removes the `import` statement and instead qualifies all extended functions explicitly
- updates test/Project.toml

* Update bors.toml

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

Author: 3 people

Project.toml

@@ -1,6 +1,6 @@
 name = "DynamicPPL"
 uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
-version = "0.17.6"
+version = "0.17.7"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
@@ -18,7 +18,7 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
 
 [compat]
 AbstractMCMC = "2, 3.0"
-AbstractPPL = "0.3, 0.4"
+AbstractPPL = "0.5.1"
 BangBang = "0.3"
 Bijectors = "0.5.2, 0.6, 0.7, 0.8, 0.9, 0.10"
 ChainRulesCore = "0.9.7, 0.10, 1"

bors.toml

@@ -15,6 +15,6 @@ delete_merged_branches = true
 required_approvals = 1
 # Squash commits before merging.
 use_squash_merge = true
-# Uncomment this to use a three hour timeout.
+# Uncomment this to use a four hour timeout.
 # The default is one hour.
-timeout_sec = 10800
+timeout_sec = 14400

src/DynamicPPL.jl

@@ -2,18 +2,15 @@ module DynamicPPL
 
 using AbstractMCMC: AbstractSampler, AbstractChains
 using AbstractPPL
-using Distributions
 using Bijectors
+using Distributions
 
 using AbstractMCMC: AbstractMCMC
+using BangBang: BangBang, push!!, empty!!, setindex!!
 using ChainRulesCore: ChainRulesCore
 using MacroTools: MacroTools
-using ZygoteRules: ZygoteRules
-using BangBang: BangBang
 using Setfield: Setfield
-
-using Setfield: Setfield
-using BangBang: BangBang
+using ZygoteRules: ZygoteRules
 
 using Random: Random
 
@@ -32,8 +29,6 @@ import Base:
     keys,
     haskey
 
-using BangBang: push!!, empty!!, setindex!!
-
 # VarInfo
 export AbstractVarInfo,
     VarInfo,
@@ -137,7 +132,6 @@ log joint probability of the model.
 See also: [`VarInfo`](@ref)
 """
 abstract type AbstractVarInfo <: AbstractModelTrace end
-abstract type AbstractContext end
 
 include("utils.jl")
 include("selector.jl")

src/model.jl

@@ -397,15 +397,17 @@ Returns both the return-value of the original model, and the resulting varinfo.
 The method resets the log joint probability of `varinfo` and increases the evaluation
 number of `sampler`.
 """
-function evaluate!!(model::Model, varinfo::AbstractVarInfo, context::AbstractContext)
+function AbstractPPL.evaluate!!(
+    model::Model, varinfo::AbstractVarInfo, context::AbstractContext
+)
     return if use_threadsafe_eval(context, varinfo)
         evaluate_threadsafe!!(model, varinfo, context)
     else
         evaluate_threadunsafe!!(model, varinfo, context)
     end
 end
 
-function evaluate!!(
+function AbstractPPL.evaluate!!(
     model::Model,
     rng::Random.AbstractRNG,
     varinfo::AbstractVarInfo=VarInfo(),
@@ -415,21 +417,25 @@ function evaluate!!(
     return evaluate!!(model, varinfo, SamplingContext(rng, sampler, context))
 end
 
-evaluate!!(model::Model, context::AbstractContext) = evaluate!!(model, VarInfo(), context)
+function AbstractPPL.evaluate!!(model::Model, context::AbstractContext)
+    return evaluate!!(model, VarInfo(), context)
+end
 
-function evaluate!!(model::Model, args...)
+function AbstractPPL.evaluate!!(model::Model, args...)
     return evaluate!!(model, Random.GLOBAL_RNG, args...)
 end
 
 # without VarInfo
-function evaluate!!(
+function AbstractPPL.evaluate!!(
     model::Model, rng::Random.AbstractRNG, sampler::AbstractSampler, args...
 )
     return evaluate!!(model, rng, VarInfo(), sampler, args...)
 end
 
 # without VarInfo and without AbstractSampler
-function evaluate!!(model::Model, rng::Random.AbstractRNG, context::AbstractContext)
+function AbstractPPL.evaluate!!(
+    model::Model, rng::Random.AbstractRNG, context::AbstractContext
+)
     return evaluate!!(model, rng, VarInfo(), SampleFromPrior(), context)
 end
 

test/Project.toml

@@ -21,7 +21,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
 AbstractMCMC = "2.1, 3.0"
-AbstractPPL = "0.3, 0.4"
+AbstractPPL = "0.5.1"
 Bijectors = "0.9.5, 0.10"
 Distributions = "0.25"
 DistributionsAD = "0.6.3"