Skip to content
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

subset and merge for VarInfo #543

Closed
wants to merge 20 commits into from
Closed

subset and merge for VarInfo #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4de2a01
link and invlink should correctly work with Selector etc.
torfjelde Oct 7, 2023
1e4d9f1
more fixes to link and invlink
torfjelde Oct 7, 2023
bf4fcc6
formatting
torfjelde Oct 7, 2023
f1fde0b
added simple tests for usage of selectors
torfjelde Oct 7, 2023
67770d3
bumped patch version
torfjelde Oct 7, 2023
4bf5f7c
fied typos
torfjelde Oct 7, 2023
d15df29
added missing _getvns_link for UntypedVarInfo
torfjelde Oct 8, 2023
203aeb3
simplify `_getvns_link` for TypedVarInfo
torfjelde Oct 8, 2023
b170c0b
Update src/varinfo.jl
torfjelde Oct 8, 2023
1086731
added Compat as dep so we can make use of certain features, e.g. Returns
torfjelde Oct 9, 2023
69055b2
added `subset` which can extract a subset of the varinfo
torfjelde Oct 8, 2023
266c2d6
added testing of `subset` for `VarInfo`
torfjelde Oct 8, 2023
859edfb
formatting
torfjelde Oct 8, 2023
e2e1db7
added implementation of `merge` for `VarInfo` and tests for it
torfjelde Oct 8, 2023
a90f2b9
more tests
torfjelde Oct 8, 2023
1d8d507
formatting
torfjelde Oct 8, 2023
2882fbc
improved merge_metadata for NamedTuple inputs
torfjelde Oct 9, 2023
e281e1f
added proper handling of the `vals` in `subset`
torfjelde Oct 9, 2023
f54abd2
added docs for `subset` and `merge`
torfjelde Oct 9, 2023
cb61b1c
added `subset` and `merge` to documentation
torfjelde Oct 9, 2023
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
16 changes: 9 additions & 7 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name = "DynamicPPL"
uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
version = "0.23.18"
version = "0.23.19"

[deps]
AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
AbstractPPL = "7a57a42e-76ec-4ea3-a279-07e840d6d9cf"
BangBang = "198e06fe-97b7-11e9-32a5-e1d131e6ad66"
Bijectors = "76274a88-744f-5084-9051-94815aaf08c4"
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand All @@ -21,13 +22,20 @@ Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"

[weakdeps]
MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"

[extensions]
DynamicPPLMCMCChainsExt = ["MCMCChains"]

[compat]
AbstractMCMC = "2, 3.0, 4"
AbstractPPL = "0.6"
BangBang = "0.3"
Bijectors = "0.13"
ChainRulesCore = "0.9.7, 0.10, 1"
ConstructionBase = "1.5.4"
Compat = "4"
Distributions = "0.23.8, 0.24, 0.25"
DocStringExtensions = "0.8, 0.9"
LogDensityProblems = "2"
Expand All @@ -39,11 +47,5 @@ Setfield = "0.7.1, 0.8, 1"
ZygoteRules = "0.2"
julia = "1.6"

[extensions]
DynamicPPLMCMCChainsExt = ["MCMCChains"]

[extras]
MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"

[weakdeps]
MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
2 changes: 2 additions & 0 deletions docs/src/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ DynamicPPL.reconstruct
#### Utils

```@docs
Base.merge(::VarInfo, ::VarInfo)
DynamicPPL.subset
DynamicPPL.unflatten
DynamicPPL.tonamedtuple
DynamicPPL.varname_leaves
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 @@ -47,6 +47,7 @@ export AbstractVarInfo,
SimpleVarInfo,
push!!,
empty!!,
subset,
getlogp,
setlogp!!,
acclogp!!,
Expand Down
Loading