manual merge in plot_latent

This commit is contained in:
James Hensman 2013-04-12 22:44:11 +01:00
commit 1d094229df
11 changed files with 380 additions and 84 deletions

View file

@ -52,7 +52,7 @@ class kern(parameterised):
parameterised.__init__(self)
def plot_ARD(self):
def plot_ARD(self, ax=pb.gca()):
"""
If an ARD kernel is present, it bar-plots the ARD parameters
@ -60,17 +60,17 @@ class kern(parameterised):
"""
for p in self.parts:
if hasattr(p, 'ARD') and p.ARD:
pb.figure()
pb.title('ARD parameters, %s kernel' % p.name)
ax.set_title('ARD parameters, %s kernel' % p.name)
if p.name == 'linear':
ard_params = p.variances
else:
ard_params = 1./p.lengthscale
pb.bar(np.arange(len(ard_params))-0.4, ard_params)
ax.bar(np.arange(len(ard_params)) - 0.4, ard_params)
ax.set_xticks(np.arange(len(ard_params)),
["${}$".format(i + 1) for i in range(len(ard_params))])
return ax
def _transform_gradients(self,g):
x = self._get_params()

View file

@ -227,9 +227,8 @@ class rbf(kernpart):
def weave_psi2(self,mu,Zhat):
weave_options = {'headers' : ['<omp.h>'],
'extra_compile_args': ['-fopenmp -march=native'],
'extra_link_args' : ['-lgomp'],
'compiler' : 'gcc'}
'extra_compile_args': ['-fopenmp -O3'], #-march=native'],
'extra_link_args' : ['-lgomp']}
N,Q = mu.shape
M = Zhat.shape[0]