Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 4 additions & 2 deletions python/celerite2/jax/celerite2.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def _do_compute(self, quiet):
self._log_det = np.sum(np.log(self._d))

def _bad(_):
return -np.inf, np.inf
return -np.inf, -np.inf

def _good(_):
return self._log_det, -0.5 * (
Expand Down Expand Up @@ -66,7 +66,9 @@ def _do_norm(self, y):
alpha = ops.solve_lower(
self._t, self._c, self._U, self._W, y[:, None]
)[:, 0]
return np.sum(alpha**2 / self._d)
return np.where(
self._log_det == -np.inf, np.inf, np.sum(alpha**2 / self._d)
)

def numpyro_dist(self):
from celerite2.jax.distribution import CeleriteNormal
Expand Down
4 changes: 3 additions & 1 deletion python/celerite2/numpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _do_compute(self, quiet):
if not quiet:
raise
self._log_det = -np.inf
self._norm = np.inf
self._norm = -np.inf
else:
self._log_det = np.sum(np.log(self._d))
self._norm = -0.5 * (
Expand All @@ -102,6 +102,8 @@ def _do_dot_tril(self, y):
return driver.matmul_lower(self._t, self._c, self._U, self._W, z, z)

def _do_norm(self, y):
if self._log_det == -np.inf:
return np.inf
alpha = y[:, None]
alpha = driver.solve_lower(
self._t, self._c, self._U, self._W, alpha, alpha
Expand Down
10 changes: 8 additions & 2 deletions python/celerite2/pymc/celerite2.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ def _do_compute(self, quiet):
)
self._log_det = pt.sum(pt.log(self._d))

self._norm = -0.5 * (self._log_det + self._size * np.log(2 * np.pi))
self._norm = pt.switch(
pt.eq(self._log_det, -np.inf),
-np.inf,
-0.5 * (self._log_det + self._size * np.log(2 * np.pi)),
)

def _check_sorted(self, t):
return Assert()(t, pt.all(t[1:] - t[:-1] >= 0))
Expand All @@ -69,7 +73,9 @@ def _do_norm(self, y):
alpha = ops.solve_lower(
self._t, self._c, self._U, self._W, y[:, None]
)[0][:, 0]
return pt.sum(alpha**2 / self._d)
return pt.switch(
pt.eq(self._log_det, -np.inf), np.inf, pt.sum(alpha**2 / self._d)
)

def _add_citations_to_pymc_model(self, **kwargs):
import pymc as pm
Expand Down
23 changes: 23 additions & 0 deletions python/test/jax/test_jax_celerite2.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,26 @@ def test_errors():

with pytest.raises(ValueError):
gp.predict(y, t=np.tile(t[:, None], (1, 5)))


@pytest.mark.parametrize("computed", [False, True])
def test_quiet_log_likelihood(computed):
from jax import jit

x = np.linspace(0.0, 10.0, 8)
kernel = terms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5)
gp = GaussianProcess(kernel)
if computed:
gp.compute(x, diag=0.1)
gp.compute(np.zeros_like(x), quiet=True)
assert jit(gp.log_likelihood)(np.zeros_like(x)) == -np.inf
assert jit(gp.log_likelihood)(np.ones_like(x)) == -np.inf

gp.compute(x, diag=0.1)
reference = celerite2.GaussianProcess(
pyterms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5), t=x, diag=0.1
)
np.testing.assert_allclose(
jit(gp.log_likelihood)(np.sin(x)),
reference.log_likelihood(np.sin(x)),
)
20 changes: 20 additions & 0 deletions python/test/pymc/test_pymc_celerite2.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,23 @@ def test_citations(data):
gp = GaussianProcess(term, t=x, diag=diag)
gp.marginal("obs", observed=y)
assert model.__citations__["celerite2"] == CITATIONS


def test_quiet_log_likelihood():
x = np.linspace(0.0, 10.0, 8)
gp = GaussianProcess(
terms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5),
t=np.zeros_like(x),
quiet=True,
)
assert gp.log_likelihood(np.zeros_like(x)).eval() == -np.inf
assert gp.log_likelihood(np.ones_like(x)).eval() == -np.inf

gp.compute(x, diag=0.1)
reference = celerite2.GaussianProcess(
pyterms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5), t=x, diag=0.1
)
np.testing.assert_allclose(
gp.log_likelihood(np.sin(x)).eval(),
reference.log_likelihood(np.sin(x)),
)
21 changes: 21 additions & 0 deletions python/test/test_celerite2.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,24 @@ def test_errors():

with pytest.raises(ValueError):
gp.predict(y, t=np.tile(t[:, None], (1, 5)))


@pytest.mark.parametrize("computed", [False, True])
def test_quiet_log_likelihood(computed):
x = np.linspace(0.0, 10.0, 8)
gp = celerite2.GaussianProcess(terms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5))
if computed:
gp.compute(x, diag=0.1)
gp.compute(np.zeros_like(x), quiet=True)
assert gp.log_likelihood(np.zeros_like(x)) == -np.inf
assert gp.log_likelihood(np.ones_like(x)) == -np.inf

gp.compute(x, diag=0.1)
K = gp.kernel.to_dense(x, np.full_like(x, 0.1))
y = np.sin(x)
expected = -0.5 * (
np.linalg.slogdet(K)[1]
+ len(x) * np.log(2 * np.pi)
+ y @ np.linalg.solve(K, y)
)
np.testing.assert_allclose(gp.log_likelihood(y), expected)