From b73932c35034bbc5a37cc374edd070f18a0d42ca Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Thu, 3 Sep 2015 13:32:59 +0300 Subject: [PATCH] Small edits for linear kernel --- GPy/kern/_src/psi_comp/linear_psi_comp.py | 2 +- GPy/models/sparse_gp_minibatch.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/GPy/kern/_src/psi_comp/linear_psi_comp.py b/GPy/kern/_src/psi_comp/linear_psi_comp.py index cd5d8fa0..a24b263a 100644 --- a/GPy/kern/_src/psi_comp/linear_psi_comp.py +++ b/GPy/kern/_src/psi_comp/linear_psi_comp.py @@ -22,7 +22,7 @@ def psicomputations(variance, Z, variational_posterior, return_psi2_n=False): psi0 = (variance*(np.square(mu)+S)).sum(axis=1) psi1 = np.dot(mu,(variance*Z).T) - if sum_N_psi2: + if return_psi2_n: psi2 = np.dot(S.sum(axis=0)*np.square(variance)*Z,Z.T)+ tdot(psi1.T) else: raise NotImplementedError diff --git a/GPy/models/sparse_gp_minibatch.py b/GPy/models/sparse_gp_minibatch.py index 1eebeeca..92b2baf5 100644 --- a/GPy/models/sparse_gp_minibatch.py +++ b/GPy/models/sparse_gp_minibatch.py @@ -303,6 +303,8 @@ class SparseGPMiniBatch(SparseGP): self.posterior = Posterior(woodbury_inv=woodbury_inv, woodbury_vector=woodbury_vector, K=posterior._K, mean=None, cov=None, K_chol=posterior.K_chol) self._outer_values_update(self.full_values) + if self.has_uncertain_inputs(): + self.kern.return_psi2_n = False def _outer_loop_without_missing_data(self): self._log_marginal_likelihood = 0