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

This commit is contained in:
Max Zwiessele 2015-09-09 08:07:31 +01:00
commit 5e8a3aef26
3 changed files with 1 additions and 3 deletions

View file

@ -171,7 +171,6 @@ class Laplace(LatentFunctionInference):
#define the objective function (to be maximised) #define the objective function (to be maximised)
def obj(Ki_f, f): def obj(Ki_f, f):
ll = -0.5*np.sum(np.dot(Ki_f.T, f)) + np.sum(likelihood.logpdf(f, Y, Y_metadata=Y_metadata)) ll = -0.5*np.sum(np.dot(Ki_f.T, f)) + np.sum(likelihood.logpdf(f, Y, Y_metadata=Y_metadata))
print(ll)
if np.isnan(ll): if np.isnan(ll):
import ipdb; ipdb.set_trace() # XXX BREAKPOINT import ipdb; ipdb.set_trace() # XXX BREAKPOINT
return -np.inf return -np.inf

View file

@ -34,4 +34,3 @@ class GPVariationalGaussianApproximation(GP):
self.link_parameter(self.alpha) self.link_parameter(self.alpha)
self.link_parameter(self.beta) self.link_parameter(self.beta)

View file

@ -23,7 +23,7 @@ def ismac():
if ismac(): if ismac():
compile_flags = [ '-O3', ] compile_flags = [ '-O3', ]
link_args = [''] link_args = []
else: else:
compile_flags = [ '-fopenmp', '-O3', ] compile_flags = [ '-fopenmp', '-O3', ]
link_args = ['-lgomp'] link_args = ['-lgomp']