Skip to content

Commit 597501b

Browse files
committed
Remove unneeded model argument to _optimize
1 parent f15a006 commit 597501b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ext/TuringOptimExt.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ end
7575

7676
function _mle_optimize(model::DynamicPPL.Model, args...; kwargs...)
7777
ctx = Optimisation.OptimizationContext(DynamicPPL.LikelihoodContext())
78-
return _optimize(model, Optimisation.OptimLogDensity(model, ctx), args...; kwargs...)
78+
return _optimize(Optimisation.OptimLogDensity(model, ctx), args...; kwargs...)
7979
end
8080

8181
"""
@@ -145,16 +145,14 @@ end
145145

146146
function _map_optimize(model::DynamicPPL.Model, args...; kwargs...)
147147
ctx = Optimisation.OptimizationContext(DynamicPPL.DefaultContext())
148-
return _optimize(model, Optimisation.OptimLogDensity(model, ctx), args...; kwargs...)
148+
return _optimize(Optimisation.OptimLogDensity(model, ctx), args...; kwargs...)
149149
end
150-
151150
"""
152-
_optimize(model::Model, f::OptimLogDensity, optimizer=Optim.LBFGS(), args...; kwargs...)
151+
_optimize(f::OptimLogDensity, optimizer=Optim.LBFGS(), args...; kwargs...)
153152
154153
Estimate a mode, i.e., compute a MLE or MAP estimate.
155154
"""
156155
function _optimize(
157-
model::DynamicPPL.Model,
158156
f::Optimisation.OptimLogDensity,
159157
init_vals::AbstractArray=DynamicPPL.getparams(f.ldf),
160158
optimizer::Optim.AbstractOptimizer=Optim.LBFGS(),
@@ -188,7 +186,7 @@ function _optimize(
188186
logdensity_optimum = Optimisation.OptimLogDensity(
189187
f.ldf.model, vi_optimum, f.ldf.context
190188
)
191-
vns_vals_iter = Turing.Inference.getparams(model, vi_optimum)
189+
vns_vals_iter = Turing.Inference.getparams(f.ldf.model, vi_optimum)
192190
varnames = map(Symbol first, vns_vals_iter)
193191
vals = map(last, vns_vals_iter)
194192
vmat = NamedArrays.NamedArray(vals, varnames)

0 commit comments

Comments
 (0)