Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pymc_extras/inference/laplace_approx/laplace.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ def model_to_laplace_approx(
else:
dims = (*batch_dims, *[f"{name}_dim_{i}" for i in range(batched_rv.ndim - 2)])
initval = initial_point.get(name, None)
dim_shapes = initval.shape if initval is not None else batched_rv.type.shape[2:]
dim_shapes = initval.shape if initval is not None else batched_rv.shape.eval()[2:]
laplace_model.add_coords(
{name: np.arange(shape) for name, shape in zip(dims[2:], dim_shapes)}
{name: pt.arange(shape) for name, shape in zip(dims[2:], dim_shapes)}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pt.arange doesn't sound correct for dims

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I switched back to np.arange I noticed a speed-up during tests. Can you help me understand why pt.arange should not be used for dims? Is it because that type of execution happens outside of the model graph?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

coordinates should be concrete valid values for Arviz. pt.arange is not a valid coord type. It's probably undefined behavior

)

pm.Deterministic(name, batched_rv, dims=dims)
Expand Down
38 changes: 38 additions & 0 deletions tests/inference/laplace_approx/test_laplace.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,44 @@ def test_fit_laplace_ragged_coords(rng):
assert (idata["posterior"].beta.sel(feature=1).to_numpy() > 0).all()


def test_fit_laplace_no_data_or_deterministic_dims(rng):
coords = {"city": ["A", "B", "C"], "feature": [0, 1], "obs_idx": np.arange(100)}
with pm.Model(coords=coords) as ragged_dim_model:
X = pm.Data("X", np.ones((100, 2)))
beta = pm.Normal(
"beta", mu=[[-100.0, 100.0], [-100.0, 100.0], [-100.0, 100.0]], dims=["city", "feature"]
)
mu = pm.Deterministic("mu", (X[:, None, :] * beta[None]).sum(axis=-1))
sigma = pm.Normal("sigma", mu=1.5, sigma=0.5, dims=["city"])

obs = pm.Normal(
"obs",
mu=mu,
sigma=sigma,
observed=rng.normal(loc=3, scale=1.5, size=(100, 3)),
dims=["obs_idx", "city"],
)

idata = fit_laplace(
optimize_method="Newton-CG",
progressbar=False,
use_grad=True,
use_hessp=True,
)

# These should have been dropped when the laplace idata was created
assert "laplace_approximation" not in list(idata.posterior.data_vars.keys())
assert "unpacked_var_names" not in list(idata.posterior.coords.keys())

assert idata["posterior"].beta.shape[-2:] == (3, 2)
assert idata["posterior"].sigma.shape[-1:] == (3,)

# Check that everything got unraveled correctly -- feature 0 should be strictly negative, feature 1
# strictly positive
assert (idata["posterior"].beta.sel(feature=0).to_numpy() < 0).all()
assert (idata["posterior"].beta.sel(feature=1).to_numpy() > 0).all()


def test_model_with_nonstandard_dimensionality(rng):
y_obs = np.concatenate(
[rng.normal(-1, 2, size=150), rng.normal(3, 1, size=350), rng.normal(5, 4, size=50)]
Expand Down