From 3fc603f7780ccfcd714fc6ff4a8fd0c455dc91a8 Mon Sep 17 00:00:00 2001 From: James Hensman Date: Tue, 12 Aug 2014 12:02:16 +0100 Subject: [PATCH] more bugfix --- GPy/kern/_src/stationary.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/GPy/kern/_src/stationary.py b/GPy/kern/_src/stationary.py index fd7dfd90..67014ab5 100644 --- a/GPy/kern/_src/stationary.py +++ b/GPy/kern/_src/stationary.py @@ -169,17 +169,10 @@ class Stationary(Kern): #the lower memory way with a loop tmp = invdist*dL_dr ret = np.empty(X.shape, dtype=np.float64) -<<<<<<< HEAD - [np.sum(tmp*(X[:,q:q+1]-X2[:,q:q+1]), axis=1, out=ret[:,q]) for q in xrange(self.input_dim)] -======= if X2 is None: - [np.einsum('ij,ij->i', tmp, X[:,q][:,None]-X[:,q][None,:], out=ret[:,q]) for q in xrange(self.input_dim)] - ret2 = np.empty(X.shape, dtype=np.float64) - [np.einsum('ij,ji->j', tmp, X[:,q][:,None]-X[:,q][None,:], out=ret2[:,q]) for q in xrange(self.input_dim)] - ret += ret2 - else: - [np.einsum('ij,ij->i', tmp, X[:,q][:,None]-X2[:,q][None,:], out=ret[:,q]) for q in xrange(self.input_dim)] ->>>>>>> 1061bf52482aa3bf6769db810c955d5fbf51ceae + tmp = tmp + tmp.T + X2 = X + [np.einsum('ij,ij->i', tmp, X[:,q][:,None]-X2[:,q][None,:], out=ret[:,q]) for q in xrange(self.input_dim)] ret /= self.lengthscale**2 return ret