Changeset 336 for trunk/src

Timestamp:

Dec 16, 2011, 3:17:09 PM (12 years ago)

Author:

gostiaux

Message:

Number of cores can now be chosen

File:

• trunk/src/civ.m (modified) (4 diffs)

trunk/src/civ.m

@@ -1481 +1481 @@
         case 'oar'
             
-            oar_modes={'oar-dispatch','mpilauncher'};
+            oar_modes={'oar-dispatch','mpilauncher','oar-parexec'};
             text={'Batch processing on servcalcul3 LEGI';...
                 'Please choose one of the followint modes';...
-                '* oar-dispatch : jobs in a container';...
-                '* mpilauncher : one single job using several cores';...
+                '* oar-dispatch : jobs in a container of several cores';...
+                '* mpilauncher : one single parallel mpi job using several cores';...
+                '* oar-parexec (under development) ';...
                 '**********************************'...
                 };
@@ -1491 +1492 @@
                 'SelectionMode','single','ListSize',[400 100],'Name','LEGI job mode');
             switch oar_modes{S}
-                
+                case 'oar-parexec' %oar-dispatch.pl
+                    ncores=str2double(...
+                        inputdlg('Number of cores (max 36)','oarsub parameter',1,{'12'})...
+                        );
+                    walltime_onejob=600;%seconds
+                    filename_joblist=fullfile(Rootbat,'job_list.txt');
+                    fid=fopen(filename_joblist,'w');
+                    for p=1:length(batch_file_list)
+                        fprintf(fid,[batch_file_list{p} '\n']);
+                    end
+                    fclose(fid)
+                    oar_command=['oarsub -n test '...
+                         '-l /core=' num2str(ncores) ','...
+                        'walltime=' datestr(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,13) ' '...
+                        '-E ' regexprep(filename_joblist,'\.txt\>','.errors') ' '...
+                        '-O ' regexprep(filename_joblist,'\.txt\>','.log') ' '...
+                        '"oar-parexec -f ' filename_joblist ' -l ' filename_joblist '.log"'];
+                    filename_oarcommand=fullfile(Rootbat,'oar_command');
+                    fid=fopen(filename_oarcommand,'w');
+                    fprintf(fid,[oar_command '\n']);
+                    fclose(fid);
+                    display(oar_command);
+                    eval(['! . ' filename_oarcommand])
                 case 'oar-dispatch' %oar-dispatch.pl
+                    ncores=str2double(...
+                        inputdlg('Number of cores (max 36)','oarsub parameter',1,{'12'})...
+                        );
                     walltime_onejob=600;%seconds
                     filename_joblist=fullfile(Rootbat,'job_list.txt');
@@ -1503 +1529 @@
                     end
                     fclose(fid);
-                    ncores=36;
                     oar_command=['oarsub -t container -n civx-container '...
                         '-l /core=' num2str(ncores)...
-                        ',walltime=' datestr(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,13)...
-                        ' "oar-dispatch -f ' filename_joblist '"'];
+                        ',walltime=' datestr(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,13) ' '...
+                        '-E ' regexprep(filename_joblist,'\.txt\>','.errors') ' '...
+                        '-O ' regexprep(filename_joblist,'\.txt\>','.log') ' '...
+                        '"oar-dispatch -f ' filename_joblist '"'];
                     filename_oarcommand=fullfile(Rootbat,'oar_command');
                     fid=fopen(filename_oarcommand,'w');
@@ -1526 +1553 @@
                         '#OAR -n Mylauncher \n'...
                         '#OAR -l node=4/core=5,walltime=0:15:00 \n'...
-                        '#OAR -E stderrfile.log \n'...
-                        '#OAR -O stdoutfile.log \n'...
+                        '#OAR -E ' fullfile(Rootbat,'stderrfile.log') ' \n'...
+                        '#OAR -O ' fullfile(Rootbat,'stdoutfile.log') ' \n'...
                         '# ========================================================= \n'...
                         '# This simple program launch a multinode parallel OpenMPI mpilauncher \n'...