-
Notifications
You must be signed in to change notification settings - Fork 31
AbstractPPL 0.11 + change prefixing behaviour #830
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.
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
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## breaking #830 +/- ##
============================================
- Coverage 84.87% 84.85% -0.02%
============================================
Files 34 34
Lines 3815 3817 +2
============================================
+ Hits 3238 3239 +1
- Misses 577 578 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
73d000b
to
e6d84db
Compare
Benchmark Report for Commit 68e8c8eComputer Information
Benchmark Results
|
82462cd
to
5d52f6b
Compare
5d52f6b
to
cab48c6
Compare
src/contexts.jl
Outdated
prefix(ctx::AbstractContext, vn::VarName) = prefix(NodeTrait(ctx), ctx, vn) | ||
prefix(::IsLeaf, ::AbstractContext, vn::VarName) = vn | ||
prefix(::IsParent, ctx::AbstractContext, vn::VarName) = prefix(childcontext(ctx), vn) | ||
function prefix_with_context(ctx::AbstractContext, vn::VarName) | ||
return prefix_with_context(NodeTrait(ctx), ctx, vn) | ||
end | ||
prefix_with_context(::IsLeaf, ::AbstractContext, vn::VarName) = vn | ||
function prefix_with_context(::IsParent, ctx::AbstractContext, vn::VarName) | ||
return prefix_with_context(childcontext(ctx), vn) | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had to change the name of this function because Aqua was complaining about method ambiguities. I'm not entirely sure why but I think it's because AbstractPPL defines prefix(::VarName, ::VarName)
and if we also defined prefix(::AbstractContext, ::VarName)
here, it's probably something to do with the fact that AbstractContext
is an abstract type. I still don't entirely see why this is a problem but changing the name did fix it 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we actually need
DynamicPPL.jl/src/DynamicPPL.jl
Line 25 in cab48c6
import AbstractPPL: predict, prefix |
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I am thinking that maybe we don't need to extend AbstractPPL.prefix
? Otherwise, the name prefix_with_context
is fine.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ehhh, I think that's fair. I think I tried that route as well, and the only thing I didn't entirely like is that it means that in DynamicPPL we have to be explicit every time we write prefix
- we would have to write either DynamicPPL.prefix
or AbstractPPL.prefix
. Do you have a preference?
(Personally, I actually think it's better if they are separate - semantically they are different things. Also, it's a nightmare trying to pull up docstrings for the right function when packages just keep extending it - this is the case with sample
for example. But historically we have done a lot of this overloading-functions-from-base-packages thing so extending it was kind of in line with that.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer they have separate names -- not a huge fun of name overloading, I think this is abusing multiple dispatch. So totally agree with you.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool, we'll go with DynamicPPL.prefix
:)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
otherwise looks good to me
a30a088
to
68e8c8e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great!
Thanks :) |
* Release 0.36 * AbstractPPL 0.11 + change prefixing behaviour (#830) * AbstractPPL 0.11; change prefixing behaviour * Use DynamicPPL.prefix rather than overloading * Remove VarInfo(VarInfo, params) (#870) * Unify `{untyped,typed}_{vector_,}varinfo` constructor functions (#879) * Unify {Untyped,Typed}{Vector,}VarInfo constructors * Update invocations * NTVarInfo * Fix tests * More fixes * Fixes * Fixes * Fixes * Use lowercase functions, don't deprecate VarInfo * Rewrite VarInfo docstring * Fix methods * Fix methods (really) * Link varinfo by default in AD testing utilities; make test suite run on linked varinfos (#890) * Link VarInfo by default * Tweak interface * Fix tests * Fix interface so that callers can inspect results * Document * Fix tests * Fix changelog * Test linked varinfos Closes #891 * Fix docstring + use AbstractFloat * Fix `condition` and `fix` in submodels (#892) * Fix conditioning in submodels * Simplify contextual_isassumption * Add documentation * Fix some tests * Add tests; fix a bunch of nested submodel issues * Fix fix as well * Fix doctests * Add unit tests for new functions * Add changelog entry * Update changelog Co-authored-by: Hong Ge <3279477+yebai@users.noreply.github.com> * Finish docs * Add a test for conditioning submodel via arguments * Clean new tests up a bit * Fix for VarNames with non-identity lenses * Apply suggestions from code review Co-authored-by: Markus Hauru <markus@mhauru.org> * Apply suggestions from code review * Make PrefixContext contain a varname rather than symbol (#896) --------- Co-authored-by: Hong Ge <3279477+yebai@users.noreply.github.com> Co-authored-by: Markus Hauru <markus@mhauru.org> --------- Co-authored-by: Markus Hauru <mhauru@turing.ac.uk> Co-authored-by: Hong Ge <3279477+yebai@users.noreply.github.com> Co-authored-by: Markus Hauru <markus@mhauru.org>
Update to AbstractPPL 0.11.
This version of AbstractPPL also lets us prefix variables in submodels differently (and, imo, more intuitively). Excerpt from the release notes:
In previous versions, the inner variable
x
would be saved asa.x
.However, this was represented as a single symbol
Symbol("a.x")
:Now, the inner variable is stored as a field
x
on the VarNamea
: