Merge remote-tracking branch 'origin/release-0.35' into mhauru/dot-tilde-to-loops

Author: mhauru

.github/workflows/CI.yml

@@ -7,10 +7,6 @@ on:
       - backport-*
       - release-0.35
   pull_request:
-    branches:
-      - master
-      - backport-*
-      - release-0.35
   merge_group:
     types: [checks_requested]
 

HISTORY.md

@@ -83,6 +83,8 @@ This release removes the feature of `VarInfo` where it kept track of which varia
   - `eltype(::VarInfo)` no longer accepts a sampler as an argument
   - `keys(::VarInfo)` no longer accepts a sampler as an argument
   - `VarInfo(::VarInfo, ::Sampler, ::AbstractVector)` no longer accepts the sampler argument.
+  - `push!!` and `push!` no longer accept samplers or `Selector`s as arguments
+  - `getgid`, `setgid!`, `updategid!`, `getspace`, and `inspace` no longer exist
 
 ### Reverse prefixing order
 

Project.toml

@@ -15,8 +15,6 @@ ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-# TODO(penelopeysm,mhauru) KernelAbstractions is only a dependency so that we can pin its version, see
-# https://github.com/TuringLang/DynamicPPL.jl/pull/781#event-16017866767
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LogDensityProblems = "6fdf6af0-433a-55f7-b3ed-c6c6e0b8df7c"
@@ -55,9 +53,7 @@ Compat = "4"
 ConstructionBase = "1.5.4"
 Distributions = "0.25"
 DocStringExtensions = "0.9"
-# TODO(penelopeysm,mhauru) See https://github.com/TuringLang/DynamicPPL.jl/pull/781#event-16017866767
-# for why KernelAbstractions is pinned like this.
-KernelAbstractions = "< 0.9.32"
+KernelAbstractions = "0.9.33"
 EnzymeCore = "0.6 - 0.8"
 ForwardDiff = "0.10"
 JET = "0.9"

docs/src/api.md

@@ -289,13 +289,6 @@ unset_flag!
 is_flagged
 ```
 
-For Gibbs sampling the following functions were added.
-
-```@docs
-setgid!
-updategid!
-```
-
 The following functions were used for sequential Monte Carlo methods.
 
 ```@docs

ext/DynamicPPLChainRulesCoreExt.jl

@@ -10,15 +10,7 @@ end
 
 # See https://github.com/TuringLang/Turing.jl/issues/1199
 ChainRulesCore.@non_differentiable BangBang.push!!(
-    vi::DynamicPPL.VarInfo,
-    vn::DynamicPPL.VarName,
-    r,
-    dist::Distributions.Distribution,
-    gidset::Set{DynamicPPL.Selector},
-)
-
-ChainRulesCore.@non_differentiable DynamicPPL.updategid!(
-    vi::DynamicPPL.AbstractVarInfo, vn::DynamicPPL.VarName, spl::DynamicPPL.Sampler
+    vi::DynamicPPL.VarInfo, vn::DynamicPPL.VarName, r, dist::Distributions.Distribution
 )
 
 # No need + causes issues for some AD backends, e.g. Zygote.

src/DynamicPPL.jl

@@ -63,8 +63,6 @@ export AbstractVarInfo,
     is_flagged,
     set_flag!,
     unset_flag!,
-    setgid!,
-    updategid!,
     setorder!,
     istrans,
     link,
@@ -74,7 +72,6 @@ export AbstractVarInfo,
     values_as,
     # VarName (reexport from AbstractPPL)
     VarName,
-    inspace,
     subsumes,
     @varname,
     # Compiler
@@ -148,9 +145,6 @@ macro prob_str(str)
     ))
 end
 
-# Used here and overloaded in Turing
-function getspace end
-
 """
     AbstractVarInfo
 
@@ -162,14 +156,8 @@ See also: [`VarInfo`](@ref), [`SimpleVarInfo`](@ref).
 """
 abstract type AbstractVarInfo <: AbstractModelTrace end
 
-const LEGACY_WARNING = """
-!!! warning
-    This method is considered legacy, and is likely to be deprecated in the future.
-"""
-
 # Necessary forward declarations
 include("utils.jl")
-include("selector.jl")
 include("chains.jl")
 include("model.jl")
 include("sampler.jl")

src/abstract_varinfo.jl

@@ -169,51 +169,6 @@ See also: [`getindex(vi::AbstractVarInfo, vn::VarName, dist::Distribution)`](@re
 """
 function getindex_internal end
 
-"""
-    push!!(vi::AbstractVarInfo, vn::VarName, r, dist::Distribution)
-
-Push a new random variable `vn` with a sampled value `r` from a distribution `dist` to
-the `VarInfo` `vi`, mutating if it makes sense.
-"""
-function BangBang.push!!(vi::AbstractVarInfo, vn::VarName, r, dist::Distribution)
-    return BangBang.push!!(vi, vn, r, dist, Set{Selector}([]))
-end
-
-"""
-    push!!(vi::AbstractVarInfo, vn::VarName, r, dist::Distribution, spl::AbstractSampler)
-
-Push a new random variable `vn` with a sampled value `r` sampled with a sampler `spl`
-from a distribution `dist` to `VarInfo` `vi`, if it makes sense.
-
-The sampler is passed here to invalidate its cache where defined.
-
-$(LEGACY_WARNING)
-"""
-function BangBang.push!!(
-    vi::AbstractVarInfo, vn::VarName, r, dist::Distribution, spl::Sampler
-)
-    return BangBang.push!!(vi, vn, r, dist, spl.selector)
-end
-function BangBang.push!!(
-    vi::AbstractVarInfo, vn::VarName, r, dist::Distribution, spl::AbstractSampler
-)
-    return BangBang.push!!(vi, vn, r, dist)
-end
-
-"""
-    push!!(vi::AbstractVarInfo, vn::VarName, r, dist::Distribution, gid::Selector)
-
-Push a new random variable `vn` with a sampled value `r` sampled with a sampler of
-selector `gid` from a distribution `dist` to `VarInfo` `vi`.
-
-$(LEGACY_WARNING)
-"""
-function BangBang.push!!(
-    vi::AbstractVarInfo, vn::VarName, r, dist::Distribution, gid::Selector
-)
-    return BangBang.push!!(vi, vn, r, dist, Set([gid]))
-end
-
 @doc """
     empty!!(vi::AbstractVarInfo)
 
@@ -768,7 +723,6 @@ end
 # Legacy code that is currently overloaded for the sake of simplicity.
 # TODO: Remove when possible.
 increment_num_produce!(::AbstractVarInfo) = nothing
-setgid!(vi::AbstractVarInfo, gid::Selector, vn::VarName) = nothing
 
 """
     from_internal_transform(varinfo::AbstractVarInfo, vn::VarName[, dist])

src/context_implementations.jl

@@ -239,11 +239,11 @@ function assume(
         r = init(rng, dist, sampler)
         if istrans(vi)
             f = to_linked_internal_transform(vi, vn, dist)
-            push!!(vi, vn, f(r), dist, sampler)
+            push!!(vi, vn, f(r), dist)
             # By default `push!!` sets the transformed flag to `false`.
             settrans!!(vi, true, vn)
         else
-            push!!(vi, vn, r, dist, sampler)
+            push!!(vi, vn, r, dist)
         end
     end
 

src/sampler.jl

@@ -18,8 +18,6 @@ Sampling algorithm that samples unobserved random variables from their prior dis
 """
 struct SampleFromPrior <: AbstractSampler end
 
-getspace(::Union{SampleFromPrior,SampleFromUniform}) = ()
-
 # Initializations.
 init(rng, dist, ::SampleFromPrior) = rand(rng, dist)
 function init(rng, dist, ::SampleFromUniform)
@@ -31,6 +29,8 @@ function init(rng, dist, ::SampleFromUniform, n::Int)
     return istransformable(dist) ? inittrans(rng, dist, n) : rand(rng, dist, n)
 end
 
+# TODO(mhauru) Could we get rid of Sampler now that it's just a wrapper around `alg`?
+# (Selector has been removed).
 """
     Sampler{T}
 
@@ -47,12 +47,7 @@ By default, values are sampled from the prior.
 """
 struct Sampler{T} <: AbstractSampler
     alg::T
-    selector::Selector # Can we remove it?
-    # TODO: add space such that we can integrate existing external samplers in DynamicPPL
 end
-Sampler(alg) = Sampler(alg, Selector())
-Sampler(alg, model::Model) = Sampler(alg, model, Selector())
-Sampler(alg, model::Model, s::Selector) = Sampler(alg, s)
 
 # AbstractMCMC interface for SampleFromUniform and SampleFromPrior
 function AbstractMCMC.step(