Skip to content

Commit fe93769

Browse files
committed
Remove residual OptimizationContext
1 parent 6c62c76 commit fe93769

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

src/optimisation/Optimisation.jl

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ end
153153
M<:DynamicPPL.Model,
154154
F<:Function,
155155
V<:DynamicPPL.AbstractVarInfo,
156-
C<:DynamicPPL.AbstractContext,
157156
AD<:ADTypes.AbstractADType,
158157
}
159158
@@ -169,9 +168,6 @@ or
169168
OptimLogDensity(model; adtype=adtype)
170169
```
171170
172-
Here, `ctx` must be a context that contains an `OptimizationContext` as its
173-
leaf.
174-
175171
If not specified, `adtype` defaults to `AutoForwardDiff()`.
176172
177173
An OptimLogDensity does not, in itself, obey the LogDensityProblems interface.
@@ -196,33 +192,26 @@ struct OptimLogDensity{
196192
}
197193
ldf::DynamicPPL.LogDensityFunction{M,F,V,AD}
198194

199-
# Inner constructors enforce that the model has an OptimizationContext as
200-
# its leaf context.
201195
function OptimLogDensity(
202196
model::DynamicPPL.Model,
203197
getlogdensity::Function,
204-
vi::DynamicPPL.VarInfo,
205-
ctx::OptimizationContext;
198+
vi::DynamicPPL.VarInfo;
206199
adtype::ADTypes.AbstractADType=Turing.DEFAULT_ADTYPE,
207200
)
208-
new_context = DynamicPPL.setleafcontext(model, ctx)
209-
new_model = contextualize(model, new_context)
210-
return new{typeof(new_model),typeof(getlogdensity),typeof(vi),typeof(adtype)}(
211-
DynamicPPL.LogDensityFunction(new_model, getlogdensity, vi; adtype=adtype)
201+
return new{typeof(model),typeof(getlogdensity),typeof(vi),typeof(adtype)}(
202+
DynamicPPL.LogDensityFunction(model, getlogdensity, vi; adtype=adtype)
212203
)
213204
end
214205
function OptimLogDensity(
215206
model::DynamicPPL.Model,
216-
getlogdensity::Function,
217-
ctx::OptimizationContext;
207+
getlogdensity::Function;
218208
adtype::ADTypes.AbstractADType=Turing.DEFAULT_ADTYPE,
219209
)
220210
# No varinfo
221211
return OptimLogDensity(
222212
model,
223213
getlogdensity,
224-
DynamicPPL.ldf_default_varinfo(model, getlogdensity),
225-
ctx;
214+
DynamicPPL.ldf_default_varinfo(model, getlogdensity);
226215
adtype=adtype,
227216
)
228217
end

0 commit comments

Comments
 (0)