Skip to content

[Merged by Bors] - Fix for #371 #372

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
wants to merge 6 commits into from
Closed

[Merged by Bors] - Fix for #371 #372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8d8827
added resolve_varnames to fix #371
torfjelde Feb 13, 2022
17f5b3c
Apply suggestions from code review
torfjelde Feb 13, 2022
d763714
Merge branch 'master' into tor/fix-371
yebai Jun 8, 2022
b193140
fixed typo
torfjelde Jun 10, 2022
4492504
added some simple tests for conditioning for NamedDist
torfjelde Jun 10, 2022
51f07e2
version bump
torfjelde Jun 15, 2022
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
14 changes: 9 additions & 5 deletions src/compiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ function unwrap_right_left_vns(
return unwrap_right_left_vns(right, left, vns)
end

resolve_varnames(vn::VarName, _) = vn
resolve_varnames(vn::VarName, dist::NamedDist) = dist.name

#################
# Main Compiler #
#################
Expand Down Expand Up @@ -377,16 +380,17 @@ function generate_tilde(left, right)

# Otherwise it is determined by the model or its value,
# if the LHS represents an observation
@gensym vn isassumption value
@gensym vn isassumption value dist

# HACK: Usage of `drop_escape` is unfortunate. It's a consequence of the fact
# that in DynamicPPL we the entire function body. Instead we should be
# more selective with our escape. Until that's the case, we remove them all.
return quote
$vn = $(AbstractPPL.drop_escape(varname(left)))
$dist = $right
$vn = $(DynamicPPL.resolve_varnames)($(AbstractPPL.drop_escape(varname(left))), $dist)
$isassumption = $(DynamicPPL.isassumption(left, vn))
if $isassumption
$(generate_tilde_assume(left, right, vn))
$(generate_tilde_assume(left, dist, vn))
else
# If `vn` is not in `argnames`, we need to make sure that the variable is defined.
if !$(DynamicPPL.inargnames)($vn, __model__)
Expand All @@ -395,7 +399,7 @@ function generate_tilde(left, right)

$value, __varinfo__ = $(DynamicPPL.tilde_observe!!)(
__context__,
$(DynamicPPL.check_tilde_rhs)($right),
$(DynamicPPL.check_tilde_rhs)($dist),
$(maybe_view(left)),
$vn,
__varinfo__,
Expand Down Expand Up @@ -440,7 +444,7 @@ function generate_dot_tilde(left, right)
# if the LHS represents an observation
@gensym vn isassumption value
return quote
$vn = $(AbstractPPL.drop_escape(varname(left)))
$vn = $(DynamicPPL.resolve_varnames)($(AbstractPPL.drop_escape(varname(left))), right)
$isassumption = $(DynamicPPL.isassumption(left, vn))
if $isassumption
$(generate_dot_tilde_assume(left, right, vn))
Expand Down
5 changes: 5 additions & 0 deletions src/distribution_wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ end

NamedDist(dist::Distribution, name::Symbol) = NamedDist(dist, VarName{name}())

Distributions.logpdf(dist::NamedDist, x::Real)= Distributions.logpdf(dist.dist, x)
Distributions.logpdf(dist::NamedDist, x::AbstractArray{<:Real})= Distributions.logpdf(dist.dist, x)
Distributions.loglikelihood(dist::NamedDist, x::Real) = Distributions.loglikelihood(dist.dist, x)
Distributions.loglikelihood(dist::NamedDist, x::AbstractArray{<:Real})= Distributions.loglikelihood(dist.dist, x)

struct NoDist{variate,support,Td<:Distribution{variate,support}} <:
Distribution{variate,support}
dist::Td
Expand Down