From 2647f258d418e30a35735d3ac8c7bbfe321d4797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= <stephane.adjemian@univ-lemans.fr> Date: Thu, 25 Jan 2018 11:34:54 +0100 Subject: [PATCH] Cosmetic changes (code factorization). --- .../AnalyseComputationalEnvironment.m | 119 +++++------------- 1 file changed, 34 insertions(+), 85 deletions(-) diff --git a/matlab/parallel/AnalyseComputationalEnvironment.m b/matlab/parallel/AnalyseComputationalEnvironment.m index a1e5c53261..be01f3c8d0 100644 --- a/matlab/parallel/AnalyseComputationalEnvironment.m +++ b/matlab/parallel/AnalyseComputationalEnvironment.m @@ -251,10 +251,7 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' % computer! if Environment - - % This check can be removed ... according to the dynare parser - % strategy. - + % This check can be removed ... according to the dynare parser strategy. if isempty(DataInput(Node).RemoteDirectory) disp('The field RemoteDirectory is empty!') skipline() @@ -263,10 +260,7 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' ErrorCode=5; return end - - % This check can be removed ... according to the dynare parser - % strategy. - + % This check can be removed ... according to the dynare parser strategy. if (~isempty(DataInput(Node).RemoteDrive)) disp('[WARNING] The fields RemoteDrive should be empty under unix or mac!') skipline() @@ -276,40 +270,14 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' skipline(2) ErrorCode=5; end - - si2=[]; - de2=[]; if ~isempty(DataInput(Node).Port) ssh_token = ['-p ',DataInput(Node).Port]; else ssh_token = ''; end - command_string=['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' ls ',DataInput(Node).RemoteDirectory,'/',RemoteTmpFolder,'/']; - [si2 de2]=system(command_string); - - if (si2) - disp ('Remote Directory does not exist or is not reachable!') - skipline() - disp('ErrorCode 5.') - skipline(2) - disp('The command causing the error was:') - disp(command_string) - disp('The system returned:') - disp(de2) - skipline(2) - ErrorCode=5; - return - end - - disp('Check on RemoteDirectory Variable ..... Ok!') - skipline(2) - disp('Check on RemoteDrive Variable ..... Ok!') - skipline(2) - + command_string = ['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' ls ',DataInput(Node).RemoteDirectory,'/',RemoteTmpFolder,'/']; else - % This check can be removed ... according to the dynare parser - % strategy. - + % This check can be removed ... according to the dynare parser strategy. if (isempty(DataInput(Node).RemoteDrive)||isempty(DataInput(Node).RemoteDirectory)) disp('Remote RemoteDrive and/or RemoteDirectory is/are empty!') skipline() @@ -318,38 +286,31 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' ErrorCode=5; return end + command_string = ['dir \\',DataInput(Node).ComputerName,'\',DataInput(Node).RemoteDrive,'$\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder]; + end + [si2, de2] = system(command_string); - si2=[]; - de2=[]; - command_string=['dir \\',DataInput(Node).ComputerName,'\',DataInput(Node).RemoteDrive,'$\',DataInput(Node).RemoteDirectory,'\',RemoteTmpFolder]; - [si2 de2]=system(command_string); - - if (si2) - disp ('Remote Directory does not exist or it is not reachable!') - skipline() - disp('ErrorCode 5.') - skipline(2) - disp('The command causing the error was:') - disp(command_string) - disp('The system returned:') - disp(de2) - skipline(2) - ErrorCode=5; - return - end - - disp('Check on RemoteDirectory Variable ..... Ok!') + if (si2) + disp ('Remote Directory does not exist or is not reachable!') + skipline() + disp('ErrorCode 5.') skipline(2) - disp('Check on RemoteDrive Variable ..... Ok!') + disp('The command causing the error was:') + disp(command_string) + disp('The system returned:') + disp(de2) skipline(2) - + ErrorCode=5; + return end + disp('Check on RemoteDirectory Variable ..... Ok!') + skipline(2) + disp('Check on RemoteDrive Variable ..... Ok!') + skipline(2) - % Now we verify if it possible to exchange data with the remote - % computer: - + % Now we verify if it possible to exchange data with the remote computer. % Build a command file to test the matlab execution and dynare path ... @@ -517,13 +478,8 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' % Now we verify if it is possible delete remote computational traces! - dynareParallelRmDir(RemoteTmpFolder,DataInput(Node)); - - si3=[]; - - si3=dynareParallelDir('Tracing.m', RemoteTmpFolder,DataInput(Node)); - + si3 = dynareParallelDir('Tracing.m', RemoteTmpFolder,DataInput(Node)); if (isempty(si3)) disp ('Check on Delete Remote Computational Traces ..... Ok!') skipline(2) @@ -561,22 +517,18 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' % We look for the information on local computer hardware. - - si0=[]; - de0=[]; - - Environment1=Environment; + Environment1 = Environment; disp('Checking Hardware please wait ...'); if (DataInput(Node).Local == 1) if Environment if ~ismac - [si0 de0]=system('grep processor /proc/cpuinfo'); + [si0, de0] = system('grep processor /proc/cpuinfo'); else - [si0 de0]=system('sysctl -n hw.ncpu'); - Environment1=2; + [si0, de0] = system('sysctl -n hw.ncpu'); + Environment1 = 2; end else - [si0 de0]=system(['psinfo \\']); + [si0, de0] = system(['psinfo \\']); end else if Environment @@ -587,21 +539,18 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' end if OStargetUnix if RemoteEnvironment ==1 - command_string=['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' grep processor /proc/cpuinfo']; - [si0 de0]=system(command_string); + command_string = ['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' grep processor /proc/cpuinfo']; else % it is MAC - command_string=['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' sysctl -n hw.ncpu']; - [si0 de0]=system(command_string); - Environment1=2; + command_string = ['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' sysctl -n hw.ncpu']; + Environment1 = 2; end else - command_string=['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' psinfo']; - [si0 de0]=system(command_string); + command_string = ['ssh ',ssh_token,' ',DataInput(Node).UserName,'@',DataInput(Node).ComputerName,' psinfo']; end else - command_string=['psinfo \\',DataInput(Node).ComputerName,' -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password]; - [si0 de0]=system(command_string); + command_string = ['psinfo \\',DataInput(Node).ComputerName,' -u ',DataInput(Node).UserName,' -p ',DataInput(Node).Password]; end + [si0, de0] = system(command_string); end if (si0) -- GitLab