Skip to content

Use view whenever possible #272

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

Merged
merged 11 commits into from
Jul 16, 2021
Merged

Use view whenever possible #272

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0fec7c
use views whenever possible
torfjelde Jul 9, 2021
4f76ceb
formatting
torfjelde Jul 9, 2021
5a065ec
dont view literals
torfjelde Jul 9, 2021
0215ca0
Merge branch 'tor/views' of github.com:TuringLang/DynamicPPL.jl into …
torfjelde Jul 10, 2021
2713a77
fixed the failing tests
torfjelde Jul 13, 2021
74acfda
added a bunch of get_sections to tests to avoid unnecessary warnings
torfjelde Jul 13, 2021
80ff053
formatting
torfjelde Jul 13, 2021
f05dc67
Merge branch 'master' into tor/views
torfjelde Jul 13, 2021
b18918d
added comment to describe maybe_unwrap_view
torfjelde Jul 13, 2021
38ec6b9
Merge branch 'tor/test-fix' into tor/views
torfjelde Jul 14, 2021
399c836
Merge branch 'master' into tor/views
yebai Jul 15, 2021
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
18 changes: 14 additions & 4 deletions src/compiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function isassumption(expr::Union{Symbol,Expr})
true
else
# Evaluate the LHS
$expr === missing
$(maybe_view(expr)) === missing
end
end
end
Expand All @@ -36,6 +36,16 @@ end
# failsafe: a literal is never an assumption
isassumption(expr) = :(false)

# If we're working with, say, a `Symbol`, then we're not going to `view`.
maybe_view(x) = x
maybe_view(x::Expr) = :($(DynamicPPL.maybe_unwrap_view)(@view($x)))

# If the result of a `view` is a zero-dim array then it's just a
# single element. Likely the rest is expecting type `eltype(x)`, hence
# we extract the value rather than passing the array.
maybe_unwrap_view(x) = x
maybe_unwrap_view(x::SubArray{<:Any,0}) = x[1]
Copy link
Member

@yebai yebai Jul 13, 2021

Choose a reason for hiding this comment

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

Maybe add a comment on why we need unwrap view here? Otherwise, happy to merge as-is.


"""
isliteral(expr)

Expand Down Expand Up @@ -325,7 +335,7 @@ function generate_tilde(left, right)
$(DynamicPPL.tilde_observe!)(
__context__,
$(DynamicPPL.check_tilde_rhs)($right),
$left,
$(maybe_view(left)),
$vn,
$inds,
__varinfo__,
Expand Down Expand Up @@ -360,7 +370,7 @@ function generate_dot_tilde(left, right)
$left .= $(DynamicPPL.dot_tilde_assume!)(
__context__,
$(DynamicPPL.unwrap_right_left_vns)(
$(DynamicPPL.check_tilde_rhs)($right), $left, $vn
$(DynamicPPL.check_tilde_rhs)($right), $(maybe_view(left)), $vn
)...,
$inds,
__varinfo__,
Expand All @@ -369,7 +379,7 @@ function generate_dot_tilde(left, right)
$(DynamicPPL.dot_tilde_observe!)(
__context__,
$(DynamicPPL.check_tilde_rhs)($right),
$left,
$(maybe_view(left)),
$vn,
$inds,
__varinfo__,
Expand Down