From a02b5081b38f5c12210a923a7af9518cfe36b3aa Mon Sep 17 00:00:00 2001 From: Ricardo Pinho Date: Wed, 18 Nov 2026 10:23:00 -0500 Subject: [PATCH] Reallocate non-owning workspaces after pickling Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LKxc9GKLwnyeV2jaZBxH9N --- python/celerite2/terms.py | 8 ++++---- python/test/test_celerite2.py | 27 +++++++++++++++++++++++++++ python/test/test_terms.py | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/python/celerite2/terms.py b/python/celerite2/terms.py index cb9d2ccf..d6d2f5d1 100644 --- a/python/celerite2/terms.py +++ b/python/celerite2/terms.py @@ -151,19 +151,19 @@ def get_celerite_matrices( Jc = len(ac) J = Jr + 2 * Jc - if c is None: + if c is None or (c.size != J and not c.flags.owndata): c = np.empty(J) else: c.resize(J, refcheck=False) - if a is None: + if a is None or (a.size != N and not a.flags.owndata): a = np.empty(N) else: a.resize(N, refcheck=False) - if U is None: + if U is None or (U.size != N * J and not U.flags.owndata): U = np.empty((N, J)) else: U.resize((N, J), refcheck=False) - if V is None: + if V is None or (V.size != N * J and not V.flags.owndata): V = np.empty((N, J)) else: V.resize((N, J), refcheck=False) diff --git a/python/test/test_celerite2.py b/python/test/test_celerite2.py index 9c674024..043abc21 100644 --- a/python/test/test_celerite2.py +++ b/python/test/test_celerite2.py @@ -235,3 +235,30 @@ def test_errors(): with pytest.raises(ValueError): gp.predict(y, t=np.tile(t[:, None], (1, 5))) + + +@pytest.mark.parametrize("protocol", [4, 5]) +@pytest.mark.parametrize("computed", [False, True]) +def test_compute_after_pickle(protocol, computed): + import pickle + + x = np.linspace(0.0, 10.0, 16) + gp = celerite2.GaussianProcess(terms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5)) + if computed: + gp.compute(x, diag=0.1) + restored = pickle.loads(pickle.dumps(gp, protocol=protocol)) + + for t in [x, x[:-1]]: + restored.compute(t, diag=0.1) + gp.compute(t, diag=0.1) + np.testing.assert_allclose( + restored.log_likelihood(np.sin(t)), gp.log_likelihood(np.sin(t)) + ) + + restored.kernel += terms.SHOTerm(sigma=0.5, rho=3.0, Q=0.25) + gp.kernel += terms.SHOTerm(sigma=0.5, rho=3.0, Q=0.25) + restored.recompute() + gp.recompute() + np.testing.assert_allclose( + restored.log_likelihood(np.sin(t)), gp.log_likelihood(np.sin(t)) + ) diff --git a/python/test/test_terms.py b/python/test/test_terms.py index 774c27e4..1c8f0fa4 100644 --- a/python/test/test_terms.py +++ b/python/test/test_terms.py @@ -117,3 +117,26 @@ def test_consistency(oterm): y = np.vstack([x]).T value = term.dot(x, diag, y) np.testing.assert_allclose(value, np.dot(K, y)) + + +def test_reuse_preallocated_views(): + term = terms.SHOTerm(sigma=1.0, rho=2.0, Q=1.5) + x = np.linspace(0.0, 10.0, 8) + diag = np.full_like(x, 0.1) + expected = term.get_celerite_matrices(x, diag) + buffers = [np.empty(value.size + 2) for value in expected] + views = [ + buffer[1:-1].reshape(value.shape) + for buffer, value in zip(buffers, expected) + ] + for buffer in buffers: + buffer[:] = np.nan + actual = term.get_celerite_matrices( + x, diag, c=views[0], a=views[1], U=views[2], V=views[3] + ) + for result, reference, view, buffer in zip( + actual, expected, views, buffers + ): + assert np.shares_memory(result, view) + np.testing.assert_array_equal(result, reference) + assert np.isnan(buffer[0]) and np.isnan(buffer[-1])