From cb5fcdef10eeca44220575db8f7d0f6bd8a9adc5 Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Fri, 12 Feb 2010 17:37:28 +0100 Subject: [PATCH] New input parallel_info for masterparallel --- matlab/McMCDiagnostics.m | 2 +- matlab/random_walk_metropolis_hastings.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matlab/McMCDiagnostics.m b/matlab/McMCDiagnostics.m index c449d9158..c90b67464 100644 --- a/matlab/McMCDiagnostics.m +++ b/matlab/McMCDiagnostics.m @@ -101,7 +101,7 @@ if isnumeric(options_.parallel), UDIAG = fout.UDIAG; clear fout else - [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, 1, npar,{},'McMCDiagnostics_core', localVars); + [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, 1, npar,{},'McMCDiagnostics_core', localVars, [], options_.parallel_info); UDIAG = fout(1).UDIAG; for j=2:totCPU, UDIAG = cat(3,UDIAG ,fout(j).UDIAG); diff --git a/matlab/random_walk_metropolis_hastings.m b/matlab/random_walk_metropolis_hastings.m index e061d99e2..825998d41 100644 --- a/matlab/random_walk_metropolis_hastings.m +++ b/matlab/random_walk_metropolis_hastings.m @@ -94,7 +94,7 @@ else % from where to get back results % NamFileOutput(1,:) = {[M_.dname,'/metropolis/'],'*.*'}; - [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, fblck, nblck,NamFileInput,'random_walk_metropolis_hastings_core', localVars, globalVars); + [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, fblck, nblck,NamFileInput,'random_walk_metropolis_hastings_core', localVars, globalVars, options_.parallel_info); for j=1:totCPU, offset = sum(nBlockPerCPU(1:j-1))+fblck-1; record.LastLogLiK(offset+1:sum(nBlockPerCPU(1:j)))=fout(j).record.LastLogLiK(offset+1:sum(nBlockPerCPU(1:j)));