Support DPPL 0.37 #2550
Draft
Support DPPL 0.37 #2550
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -104,8 +105,8 @@ function Optim.optimize( | |||
| options::Optim.Options=Optim.Options(); | |||
| kwargs..., | |||
| ) | |||
| ctx = Optimisation.OptimizationContext(DynamicPPL.DefaultContext()) | |||
| f = Optimisation.OptimLogDensity(model, ctx) | |||
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |||
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |
| vi = DynamicPPL.setaccs!!( | |
| VarInfo(model), | |
| (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator()), | |
| ) |
| @@ -127,8 +128,8 @@ | |||
| options::Optim.Options=Optim.Options(); | |||
| kwargs..., | |||
| ) | |||
| ctx = Optimisation.OptimizationContext(DynamicPPL.DefaultContext()) | |||
| f = Optimisation.OptimLogDensity(model, ctx) | |||
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |||
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |
| vi = DynamicPPL.setaccs!!( | |
| VarInfo(model), | |
| (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator()), | |
| ) |
| @@ -144,9 +145,11 @@ | |||
| end | |||
|
|
|||
| function _map_optimize(model::DynamicPPL.Model, args...; kwargs...) | |||
| ctx = Optimisation.OptimizationContext(DynamicPPL.DefaultContext()) | |||
| return _optimize(Optimisation.OptimLogDensity(model, ctx), args...; kwargs...) | |||
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |||
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| vi = DynamicPPL.setaccs!!(VarInfo(model), (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator(),)) | |
| vi = DynamicPPL.setaccs!!( | |
| VarInfo(model), | |
| (LogPriorWithoutJacobianAccumulator(), DynamicPPL.LogLikelihoodAccumulator()), | |
| ) |
| logdensity_optimum = Optimisation.OptimLogDensity( | ||
| f.ldf.model, vi_optimum, f.ldf.context | ||
| ) | ||
| logdensity_optimum = Optimisation.OptimLogDensity(f.ldf.model, vi_optimum; adtype=f.ldf.adtype) |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| logdensity_optimum = Optimisation.OptimLogDensity(f.ldf.model, vi_optimum; adtype=f.ldf.adtype) | |
| logdensity_optimum = Optimisation.OptimLogDensity( | |
| f.ldf.model, vi_optimum; adtype=f.ldf.adtype | |
| ) |
| VarInfo(), | ||
| SamplingContext(rng, DynamicPPL.SampleFromPrior(), DynamicPPL.PriorContext()), | ||
| ), | ||
| DynamicPPL.evaluate!!(model, vi, SamplingContext(rng, DynamicPPL.SampleFromPrior())), |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| DynamicPPL.evaluate!!(model, vi, SamplingContext(rng, DynamicPPL.SampleFromPrior())), | |
| DynamicPPL.evaluate!!(model, vi, SamplingContext(rng, DynamicPPL.SampleFromPrior())) |
Comment on lines
149
to
151
| M<:DynamicPPL.Model, | ||
| V<:DynamicPPL.VarInfo, | ||
| C<:OptimizationContext, | ||
| V<:DynamicPPL.AbstractVarInfo, | ||
| AD<:ADTypes.AbstractADType, |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| M<:DynamicPPL.Model, | |
| V<:DynamicPPL.VarInfo, | |
| C<:OptimizationContext, | |
| V<:DynamicPPL.AbstractVarInfo, | |
| AD<:ADTypes.AbstractADType, | |
| M<:DynamicPPL.Model,V<:DynamicPPL.AbstractVarInfo,AD<:ADTypes.AbstractADType |
| return OptimLogDensity( | ||
| DynamicPPL.LogDensityFunction(model, DynamicPPL.VarInfo(model), ctx; adtype=adtype) | ||
| ) | ||
| function OptimLogDensity(model::DynamicPPL.Model, vi::DynamicPPL.AbstractVarInfo=DynamicPPL.VarInfo(model); adtype=AutoForwardDiff()) |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| function OptimLogDensity(model::DynamicPPL.Model, vi::DynamicPPL.AbstractVarInfo=DynamicPPL.VarInfo(model); adtype=AutoForwardDiff()) | |
| function OptimLogDensity( | |
| model::DynamicPPL.Model, | |
| vi::DynamicPPL.AbstractVarInfo=DynamicPPL.VarInfo(model); | |
| adtype=AutoForwardDiff(), | |
| ) |
Comment on lines
+62
to
+64
| vi_joint = DynamicPPL.setaccs!!(deepcopy(vi), (LogPriorWithoutJacobianAccumulator(), LogLikelihoodAccumulator())) | ||
| vi_prior = DynamicPPL.setaccs!!(deepcopy(vi), (LogPriorWithoutJacobianAccumulator(),)) | ||
| vi_likelihood = DynamicPPL.setaccs!!(deepcopy(vi), (LogLikelihoodAccumulator(),)) |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| vi_joint = DynamicPPL.setaccs!!(deepcopy(vi), (LogPriorWithoutJacobianAccumulator(), LogLikelihoodAccumulator())) | |
| vi_prior = DynamicPPL.setaccs!!(deepcopy(vi), (LogPriorWithoutJacobianAccumulator(),)) | |
| vi_likelihood = DynamicPPL.setaccs!!(deepcopy(vi), (LogLikelihoodAccumulator(),)) | |
| vi_joint = DynamicPPL.setaccs!!( | |
| deepcopy(vi), | |
| (LogPriorWithoutJacobianAccumulator(), LogLikelihoodAccumulator()), | |
| ) | |
| vi_prior = DynamicPPL.setaccs!!( | |
| deepcopy(vi), (LogPriorWithoutJacobianAccumulator(),) | |
| ) | |
| vi_likelihood = DynamicPPL.setaccs!!( | |
| deepcopy(vi), (LogLikelihoodAccumulator(),) | |
| ) |
Comment on lines
+150
to
152
| value, vi = DynamicPPL.tilde_assume( | ||
| DynamicPPL.childcontext(context), right, vn, vi | ||
| ) |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| value, vi = DynamicPPL.tilde_assume( | |
| DynamicPPL.childcontext(context), right, vn, vi | |
| ) | |
| value, vi = DynamicPPL.tilde_assume(DynamicPPL.childcontext(context), right, vn, vi) |
| function DynamicPPL.tilde_observe(context::ADTypeCheckContext, right, left, vi) | ||
| logp, vi = DynamicPPL.tilde_observe(DynamicPPL.childcontext(context), right, left, vi) | ||
| function DynamicPPL.tilde_observe!!(context::ADTypeCheckContext, right, left, vn, vi) | ||
| left, vi = DynamicPPL.tilde_observe(DynamicPPL.childcontext(context), right, left, vn, vi) |
There was a problem hiding this comment.
[JuliaFormatter v1.0.62] reported by reviewdog 🐶
Suggested change
| left, vi = DynamicPPL.tilde_observe(DynamicPPL.childcontext(context), right, left, vn, vi) | |
| left, vi = DynamicPPL.tilde_observe( | |
| DynamicPPL.childcontext(context), right, left, vn, vi | |
| ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently in a very unfinished state.