apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-10 20:42:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

caching bugfix for psi2 computations

Browse source
This commit is contained in:
Max Zwiessele 2013-07-18 15:39:58 +01:00
parent dcec9d2a25
commit 9b161b7440
2 changed files with 76 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/kern/parts/rbf.py
View file

@ -4,7 +4,6 @@
from kernpart import Kernpart
import numpy as np
import hashlib
from scipy import weave
from ...util.linalg import tdot
from ...util.misc import fast_array_equal
@ -225,7 +224,7 @@ class RBF(Kernpart):
def _K_computations(self, X, X2):
if not (fast_array_equal(X, self._X) and fast_array_equal(X2, self._X2) and fast_array_equal(self._params , self._get_params())):
self._X = X.copy()
self._params == self._get_params().copy()
self._params = self._get_params().copy()
if X2 is None:
self._X2 = None
X = X / self.lengthscale
@ -245,7 +244,6 @@ class RBF(Kernpart):
self._psi2_Zhat = 0.5 * (Z[:, None, :] + Z[None, :, :]) # M,M,Q
self._psi2_Zdist = 0.5 * (Z[:, None, :] - Z[None, :, :]) # M,M,Q
self._psi2_Zdist_sq = np.square(self._psi2_Zdist / self.lengthscale) # M,M,Q
self._Z = Z
if not (fast_array_equal(Z, self._Z) and fast_array_equal(mu, self._mu) and fast_array_equal(S, self._S)):
# something's changed. recompute EVERYTHING

3
GPy/kern/parts/rbf_inv.py
View file

@ -217,7 +217,7 @@ class RBFInv(RBF):
def _K_computations(self, X, X2):
if not (np.array_equal(X, self._X) and np.array_equal(X2, self._X2) and np.array_equal(self._params , self._get_params())):
self._X = X.copy()
self._params == self._get_params().copy()
self._params = self._get_params().copy()
if X2 is None:
self._X2 = None
X = X * self.inv_lengthscale
@ -237,7 +237,6 @@ class RBFInv(RBF):
self._psi2_Zhat = 0.5 * (Z[:, None, :] + Z[None, :, :]) # M,M,Q
self._psi2_Zdist = 0.5 * (Z[:, None, :] - Z[None, :, :]) # M,M,Q
self._psi2_Zdist_sq = np.square(self._psi2_Zdist * self.inv_lengthscale) # M,M,Q
self._Z = Z
if not (np.array_equal(Z, self._Z) and np.array_equal(mu, self._mu) and np.array_equal(S, self._S)):
# something's changed. recompute EVERYTHING