From fedaa5e1f1b6876ca6c41b7923a1e4b347a48f2d Mon Sep 17 00:00:00 2001 From: Neil Lawrence Date: Thu, 21 Nov 2013 22:15:20 +0000 Subject: [PATCH] Fixed bug in sympy kernel and added sympolic.py back into utils __init__.py --- GPy/kern/parts/sympykern.py | 6 +++--- GPy/util/__init__.py | 1 + GPy/util/symbolic.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/GPy/kern/parts/sympykern.py b/GPy/kern/parts/sympykern.py index d109fea7..bcd52fe2 100644 --- a/GPy/kern/parts/sympykern.py +++ b/GPy/kern/parts/sympykern.py @@ -345,8 +345,8 @@ class spkern(Kernpart): # Code to use when only X is provided. self._dK_dtheta_code_X = self._dK_dtheta_code.replace('Z[', 'X[') - self._dK_dX_code_X = self._dK_dX_code.replace('Z[', 'X[').replace('+= partial[', '+= 2*partial[') - self._dK_dtheta_code_X = self._dK_dtheta_code.replace('Z2(', 'X2(') + self._dK_dX_code_X = self._dK_dX_code.replace('Z[', 'X[').replace('+= PARTIAL2(', '+= 2*PARTIAL2(') + self._dK_dtheta_code_X = self._dK_dtheta_code_X.replace('Z2(', 'X2(') self._dK_dX_code_X = self._dK_dX_code_X.replace('Z2(', 'X2(') @@ -402,7 +402,7 @@ class spkern(Kernpart): self._weave_inline(self._dK_dX_code, X, target, Z, partial) def dKdiag_dX(self,partial,X,target): - self._weave.inline(self._dKdiag_dX_code, X, target, Z, partial) + self._weave_inline(self._dKdiag_dX_code, X, target, Z=None, partial=partial) def compute_psi_stats(self): #define some normal distributions diff --git a/GPy/util/__init__.py b/GPy/util/__init__.py index db9b7362..629b3f48 100644 --- a/GPy/util/__init__.py +++ b/GPy/util/__init__.py @@ -14,5 +14,6 @@ import visualize import decorators import classification import latent_space_visualizations +import symbolic import netpbmfile diff --git a/GPy/util/symbolic.py b/GPy/util/symbolic.py index 4b660c7f..49c8c33a 100644 --- a/GPy/util/symbolic.py +++ b/GPy/util/symbolic.py @@ -1,4 +1,4 @@ -from sympy import Function, S, oo, I, cos, sin, asin, log, erf,pi,exp,sqrt,sign +from sympy import Function, S, oo, I, cos, sin, asin, log, erf, pi, exp, sqrt, sign class ln_diff_erf(Function):