cleaned up

Author: amarquand

sp_covMTL.asv

@@ -42,7 +42,8 @@
 % configure input kernel from input arguments
 if dg % kss
   Kx = feval(cov{:}, hyp((lmaxi+1):end), x);
-  K  = (M*Kf*M').*Kx;
+  %K  = (M*Kf*M').*Kx;
+  K  = (Mte*Kf*Mte').*Kx;
   K  = diag(K);
 else
   if xeqz % K 
@@ -54,8 +55,9 @@
         error('Covariance function not initialized for testing'); 
     end
     Kx = feval(cov{:}, hyp((lmaxi+1):end), x, z);
-    K  = (Mte*Kf*M').*Kx;
-    K  = K'; % transpose because gpml expects K(train,test)
+    %K  = (Mte*Kf*M').*Kx;
+    %K  = K'; % transpose because gpml expects K(train,test)
+    K  = (M*Kf*Mte').*Kx;
   end
 end
 

sp_covMTL.m

@@ -6,6 +6,7 @@
 try opt.usecluster; catch, opt.usecluster = true; end
 try opt.walltime;   catch, opt.walltime = 300; end
 try opt.memory;     catch, opt.memory = 100*1024^2; end
+try opt.debug;      catch, opt.debug = false; end
 
 D   = size(X,2);
 T   = size(Y,2);  % number of tasks
@@ -50,6 +51,7 @@
 else % run sequentially
     nlmls = cell(Njobs,1); dnlmls = cell(Njobs,1); hyps = cell(Njobs,1); 
     for n = 1:Njobs
+        if opt.debug, fprintf('running job %d of %d...\n',n,Njobs'); end
         [nlmls{n},dnlmls{n},hyps{n}] = sp_gp_cluster_job(hypb{n},Xb{n},yb{n},optb{n});
     end
 end

sp_gp_cluster_batch.m

@@ -15,6 +15,7 @@
 %# function covGrid
 %# function infGrid
 %# function sp_infGrid
+%# function sp_covMTL
 
 T   = size(Y,2);  % number of tasks
 
@@ -31,6 +32,10 @@
 %     opt.inf       = @(varargin) infGrid(varargin{:},gopt);
 % end
 
+if iscell(opt.cov) && any(regexp(func2str(opt.cov{1}),'sp_covMTL'))
+   sp_covMTL('init', length(opt.hyp0.cov)); 
+end    
+    
 Hyp   = zeros(T,length(unwrap(hyp0)));
 NLML  = zeros(T,1); 
 DNLML = zeros(length(unwrap(hyp0)),T);