diff --git a/GPy/inference/latent_function_inference/inference_X.py b/GPy/inference/latent_function_inference/inference_X.py index e3a3d251..14b9b521 100644 --- a/GPy/inference/latent_function_inference/inference_X.py +++ b/GPy/inference/latent_function_inference/inference_X.py @@ -57,7 +57,8 @@ class Inference_X(Model): if isinstance(model, SSGPLVM): X = variational.SpikeAndSlabPosterior(param_to_array(model.X.mean[idx]), param_to_array(model.X.variance[idx]), param_to_array(model.X.gamma[idx])) if model.group_spike: - [X.gamma[:,i].tie_together() for i in xrange(X.gamma.shape[1])] # Tie columns together + #[X.gamma[:,i].tie_together() for i in xrange(X.gamma.shape[1])] # Tie columns together + X.gamma.fix() else: X = variational.NormalPosterior(param_to_array(model.X.mean[idx]), param_to_array(model.X.variance[idx])) diff --git a/GPy/kern/_src/rbf.py b/GPy/kern/_src/rbf.py index 86807fae..20976d7c 100644 --- a/GPy/kern/_src/rbf.py +++ b/GPy/kern/_src/rbf.py @@ -30,7 +30,13 @@ class RBF(Stationary): if flag: if isinstance(self.psicomp,PSICOMP_RBF): self.useGPU = True - self.psicomp = PSICOMP_RBF_GPU() + + from ...models import SSGPLVM,SSMRD + if isinstance(self._highest_parent_, SSGPLVM) or isinstance(self._highest_parent_, SSGPLVM): + from psi_comp.ssrbf_psi_gpucomp import PSICOMP_SSRBF_GPU + self.psicomp = PSICOMP_SSRBF_GPU() + else: + self.psicomp = PSICOMP_RBF_GPU() else: if isinstance(self.psicomp,PSICOMP_RBF_GPU): self.psicomp = PSICOMP_RBF()