Skip to content

Commit 4d9480d

Browse files
authored
Merge branch 'pymc-devs:main' into DFM_draft_implementation
2 parents 98061ac + 5c9eee5 commit 4d9480d

40 files changed

+5566
-2427
lines changed

conda-envs/environment-test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- pymc>=5.21.1
6+
- pymc>=5.24.1
7+
- pytensor>=2.31.4
78
- scikit-learn
8-
- better-optimize>=0.1.2
9+
- better-optimize>=0.1.5
910
- dask<2025.1.1
1011
- xhistogram
1112
- statsmodels
1213
- numba
1314
- pytest
1415
- pytest-cov
1516
- pydantic>=2.0.0
16-
- preliz>=0.5.0
17+
- preliz>=0.20.0
1718
- pip
1819
- pip:
1920
- jax

notebooks/Structural Timeseries Modeling.ipynb

Lines changed: 415 additions & 363 deletions
Large diffs are not rendered by default.

pymc_extras/inference/laplace_approx/find_map.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,20 @@ def find_MAP(
335335
var.name: value for var, value in zip(unobserved_vars, unobserved_vars_values)
336336
}
337337

338-
idata = map_results_to_inference_data(optimized_point, frozen_model, include_transformed)
339-
idata = add_fit_to_inference_data(idata, raveled_optimized, H_inv)
338+
idata = map_results_to_inference_data(
339+
map_point=optimized_point, model=frozen_model, include_transformed=include_transformed
340+
)
341+
342+
idata = add_fit_to_inference_data(
343+
idata=idata, mu=raveled_optimized, H_inv=H_inv, model=frozen_model
344+
)
345+
340346
idata = add_optimizer_result_to_inference_data(
341-
idata, optimizer_result, method, raveled_optimized, model
347+
idata=idata, result=optimizer_result, method=method, mu=raveled_optimized, model=model
342348
)
349+
343350
idata = add_data_to_inference_data(
344-
idata, progressbar=False, model=model, compile_kwargs=compile_kwargs
351+
idata=idata, progressbar=False, model=model, compile_kwargs=compile_kwargs
345352
)
346353

347354
return idata

pymc_extras/inference/pathfinder/pathfinder.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
from pymc.initial_point import make_initial_point_fn
3939
from pymc.model import modelcontext
4040
from pymc.model.core import Point
41+
from pymc.progress_bar import CustomProgress, default_progress_theme
4142
from pymc.pytensorf import (
4243
compile,
4344
find_rng_nodes,
4445
reseed_rngs,
4546
)
4647
from pymc.util import (
47-
CustomProgress,
4848
RandomSeed,
4949
_get_seeds_per_chain,
50-
default_progress_theme,
5150
get_default_varnames,
5251
)
5352
from pytensor.compile.function.types import Function

0 commit comments

Comments
 (0)