From 1b2cab9b5292170a8ba6d77df7d86d0628efb8f2 Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Fri, 24 Jun 2011 10:56:07 +0200 Subject: [PATCH] Fixed check of number of cpu's chen unix master calls windows slave --- .../parallel/AnalyseComputationalEnvironment.m | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/matlab/parallel/AnalyseComputationalEnvironment.m b/matlab/parallel/AnalyseComputationalEnvironment.m index 7f0019f3d..540e33131 100644 --- a/matlab/parallel/AnalyseComputationalEnvironment.m +++ b/matlab/parallel/AnalyseComputationalEnvironment.m @@ -109,7 +109,13 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' OScallerUnix=~ispc; OScallerWindows=ispc; OStargetUnix=strcmpi('unix',DataInput(Node).OperatingSystem); + if isempty(DataInput(Node).OperatingSystem), + OStargetUnix=OScallerUnix; + end OStargetWindows=strcmpi('windows',DataInput(Node).OperatingSystem); + if isempty(DataInput(Node).OperatingSystem), + OStargetWindows=OScallerWindows; + end Environment= (OScallerUnix || OStargetUnix); @@ -561,7 +567,11 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' end else if Environment, - [si0 de0]=system(['ssh ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' grep processor /proc/cpuinfo']); + if OStargetUnix, + [si0 de0]=system(['ssh ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' grep processor /proc/cpuinfo']); + else + [si0 de0]=system(['ssh ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' psinfo']); + end else [si0 de0]=system(['psinfo \\',DataInput(Node).ComputerName,' -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password]); end @@ -569,13 +579,14 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' RealCPUnbr=''; - RealCPUnbr=GiveCPUnumber(de0); + keyboard; + RealCPUnbr=GiveCPUnumber(de0,OStargetUnix); % Questo controllo penso che si possa MIGLIORARE!!!!! if isempty (RealCPUnbr) && Environment==0, [si0 de0]=system(['psinfo \\',DataInput(Node).ComputerName]); end - RealCPUnbr=GiveCPUnumber(de0); + RealCPUnbr=GiveCPUnumber(de0,OStargetUnix); if isempty (RealCPUnbr) % An error occurred when we try to know the Cpu/Cores