Merge branch 'devel' of github.com:SheffieldML/GPy into devel

This commit is contained in:
Max Zwiessele 2014-10-08 12:03:54 +01:00
commit a63278c234
2 changed files with 3 additions and 3 deletions

View file

@ -92,7 +92,7 @@ class GP(Model):
logger.info("adding kernel and likelihood as parameters")
self.link_parameter(self.kern)
self.link_parameter(self.likelihood)
def set_X(self,X):
# TODO: it does not work with BGPLVM
if isinstance(X, ObsAr):
@ -107,7 +107,7 @@ class GP(Model):
self.Y = Y
else:
self.Y = ObsAr(Y)
self.Y_normalized = self.Y
self.Y_normalized = self.Y
def parameters_changed(self):
self.posterior, self._log_marginal_likelihood, self.grad_dict = self.inference_method.inference(self.kern, self.X, self.likelihood, self.Y_normalized, self.Y_metadata)

View file

@ -528,7 +528,7 @@ def symmetrify(A, upper=False):
symmetrify_weave(A, upper)
except:
print "\n Weave compilation failed. Falling back to (slower) numpy implementation\n"
config.set('weave', 'working', False)
config.set('weave', 'working', 'False')
symmetrify_numpy(A, upper)
else:
symmetrify_numpy(A, upper)