Skip to content

Adopting DensityInterface #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
phipsgabler wants to merge 6 commits into from
Closed

Adopting DensityInterface #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
084ce89
Depend on DensityInterface.jl and corresponding APPL version
phipsgabler Nov 28, 2021
d5f79ac
First code changes
phipsgabler Nov 28, 2021
380c8a7
Merge branch 'master' into phg/densityinterface
yebai Feb 2, 2023
d0eee3d
Merge branch 'master' into phg/densityinterface
yebai Feb 24, 2023
0351101
Merge branch 'master' into phg/densityinterface
yebai Jul 4, 2023
3760e45
Merge branch 'master' into phg/densityinterface
devmotion May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ BangBang = "198e06fe-97b7-11e9-32a5-e1d131e6ad66"
Bijectors = "76274a88-744f-5084-9051-94815aaf08c4"
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
DensityInterface = "b429d917-457f-4dbc-8f4c-0cc954292b1d"
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand Down Expand Up @@ -51,6 +52,7 @@ Bijectors = "0.13.9"
ChainRulesCore = "1"
Compat = "4"
ConstructionBase = "1.5.4"
DensityInterface = "0.4"
Distributions = "0.25"
DocStringExtensions = "0.9"
EnzymeCore = "0.6, 0.7"
Expand Down
1 change: 1 addition & 0 deletions src/DynamicPPL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ using OrderedCollections: OrderedDict
using AbstractMCMC: AbstractMCMC
using ADTypes: ADTypes
using BangBang: BangBang, push!!, empty!!, setindex!!
using DensityInterface: DensityInterface
using MacroTools: MacroTools
using ConstructionBase: ConstructionBase
using Accessors: Accessors
Expand Down
9 changes: 6 additions & 3 deletions src/compiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,18 @@ isliteral(e::Expr) = !isempty(e.args) && all(isliteral, e.args)
Check if the right-hand side `x` of a `~` is a `Distribution` or an array of
`Distributions`, then return `x`.
"""
function check_tilde_rhs(@nospecialize(x))
check_tilde_rhs(x) = check_tilde_rhs(x, DensityInterface.DensityKind(x))
check_tilde_rhs(x::Distribution) = x
check_tilde_rhs(x::AbstractArray{<:Distribution}) = x
Comment on lines +172 to +174

@devmotion devmotion Nov 28, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this could be simplified and generalized to

Suggested change
check_tilde_rhs(x) = check_tilde_rhs(x, DensityInterface.DensityKind(x))
check_tilde_rhs(x::Distribution) = x
check_tilde_rhs(x::AbstractArray{<:Distribution}) = x
check_tilde_rhs(x) = check_tilde_rhs(x, DensityInterface.DensityKind(x))
check_tilde_rhs(x::AbstractArray) = check_tilde_rhs(x, DensityInterface.DensityKind(first(x)))

or, if DensityKind works with types, to

Suggested change
check_tilde_rhs(x) = check_tilde_rhs(x, DensityInterface.DensityKind(x))
check_tilde_rhs(x::Distribution) = x
check_tilde_rhs(x::AbstractArray{<:Distribution}) = x
check_tilde_rhs(x) = check_tilde_rhs(x, DensityInterface.DensityKind(x))
check_tilde_rhs(x::AbstractArray) = check_tilde_rhs(x, DensityInterface.DensityKind(eltype(x)))

# check_tilde_rhs(x::AbstractArray{T}) where {T} = check_tilde_rhs(x, DensityInterface.DensityKind(T))
check_tilde_rhs(x, ::DensityInterface.IsOrHasDensity) = x
function check_tilde_rhs(@nospecialize(x), ::DensityInterface.NoDensity)
return throw(
ArgumentError(
"the right-hand side of a `~` must be a `Distribution` or an array of `Distribution`s",
),
)
end
check_tilde_rhs(x::Distribution) = x
check_tilde_rhs(x::AbstractArray{<:Distribution}) = x

"""
unwrap_right_vn(right, vn)
Expand Down