Skip to content

Commit af61cf7

Browse files
removed None default for minimizer_kwargs
1 parent d0aaae5 commit af61cf7

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

pymc_extras/inference/INLA/inla.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def fit_INLA(
1111
Q: TensorVariable,
1212
minimizer_seed: int = 42,
1313
model: pm.Model | None = None,
14-
minimizer_kwargs: dict | None = None,
14+
minimizer_kwargs: dict = {"method": "L-BFGS-B", "optimizer_kwargs": {"tol": 1e-8}},
1515
return_latent_posteriors: bool = True,
1616
**sampler_kwargs,
1717
) -> az.InferenceData:
@@ -23,7 +23,6 @@ def fit_INLA(
2323
Q = model.rvs_to_values[Q]
2424

2525
# Marginalize out the latent field
26-
minimizer_kwargs = {"method": "L-BFGS-B", "optimizer_kwargs": {"tol": 1e-8}}
2726
marginalize_kwargs = {
2827
"Q": Q,
2928
"minimizer_seed": minimizer_seed,

pymc_extras/model/marginal/distributions.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def __init__(
144144
*args,
145145
Q: TensorVariable,
146146
minimizer_seed: int,
147-
minimizer_kwargs: dict | None = None,
147+
minimizer_kwargs: dict = {"method": "L-BFGS-B", "optimizer_kwargs": {"tol": 1e-8}},
148148
**kwargs,
149149
) -> None:
150150
self.Q = Q
@@ -426,17 +426,11 @@ def laplace_marginal_rv_logp(op: MarginalLaplaceRV, values, *inputs, **kwargs):
426426
logp = pt.sum([pt.sum(logps_dict[k]) for k in logps_dict])
427427

428428
# Maximize log(p(x | y, params)) wrt x to find mode x0
429-
minimizer_kwargs = (
430-
op.minimizer_kwargs
431-
if op.minimizer_kwargs is not None
432-
else {"method": "L-BFGS-B", "optimizer_kwargs": {"tol": 1e-8}}
433-
)
434-
435429
# This step is currently bottlenecking the logp calculation.
436430
x0, _ = minimize(
437431
objective=-logp, # logp(x | y, params) = logp(y | x, params) + logp(x | params) + const (const omitted during minimization)
438432
x=marginalized_vv,
439-
**minimizer_kwargs,
433+
**op.minimizer_kwargs,
440434
)
441435

442436
# Set minimizer initialisation to be random

0 commit comments

Comments
 (0)