Changeset 20316

Timestamp:

03/14/16 05:00:05 (9 years ago)

Author:

hakesson

Message:

chg: vilje cluster script update

File:

• issm/trunk-jpl/src/m/classes/clusters/vilje.m (modified) (6 diffs)

issm/trunk-jpl/src/m/classes/clusters/vilje.m

@@ -9 +9 @@
     properties (SetAccess=public)  
                  % {{{
-                 name          = 'vilje'
-                 login         = '';
-         accountname    ='';
-                 numnodes      = 20;
-                 cpuspernode   = '';
-                 port          = '';
-                 queue         = '';
-                 codepath      = '';
-                 executionpath = '';
-                 interactive   = 0;
-                 time          = '';
-                 memory        = 2;
+                 name           = 'vilje';
+                 login          = '';
+                 numnodes       = 2;
+                 cpuspernode    = 32;
+                 procspernodes  = 16;
+                 mem            = 28;
+                 queue          = 'workq';
+                 time           = 2*60;
+                 codepath       = '';
+                 executionpath  = '';
+                 interactive    = 0;
+                 port           = [];
+                 accountname    = '';
+
+
          end
          properties (SetAccess=private) 
-                 np=20*8;
+                 np=numnodes*procspernodes;
                  % }}}
          end
@@ -42 +45 @@
                          disp(sprintf('    login: %s',cluster.login));
                          disp(sprintf('    accountname: %s',cluster.accountname));
-                         disp(sprintf('    port: %i',cluster.port));
                          disp(sprintf('    numnodes: %i',cluster.numnodes));
                          disp(sprintf('    cpuspernode: %i',cluster.cpuspernode));
-                         disp(sprintf('    np: %i',cluster.cpuspernode*cluster.numnodes));
+                         disp(sprintf('    np: %i', ...
+                                      cluster.cpuspernode*cluster.numnodes));
+                         disp(sprintf('    procspernodes: %i',cluster.procspernodes));
                          disp(sprintf('    queue: %s',cluster.queue));
                          disp(sprintf('    codepath: %s',cluster.codepath));
@@ -51 +55 @@
                          disp(sprintf('    interactive: %i',cluster.interactive));
                          disp(sprintf('    time: %i',cluster.time));
-                         disp(sprintf('    memory: %i',cluster.memory));
+                         disp(sprintf('    memory: %i',cluster.mem));
                  end
                  %}}}
                  function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_queues={'c6145','default'};
-                         queue_requirements_time=[Inf Inf];
-                         queue_requirements_np=[80 80];
+                         available_queues={'workq'};
+                         queue_requirements_time=[5*24*60];
+                         queue_requirements_np=[30];
 
-                        % QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
+                         QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
 
                          %Miscelaneous
@@ -105 +109 @@
                          if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
 
+                         executable='issm.exe';
+                         if isdakota,
+                                 version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3));
+                                 if (version>=6),
+                                         executable='issm_dakota.exe';
+                                 end
+                         end
+
                          %compute number of processors
                          cluster.np=cluster.numnodes*cluster.cpuspernode;
+
+                         
+                         shortname = substring(modelname,1,min(12,length(modelname)));
 
                          %write queuing script 
                          fid=fopen([modelname '.queue'],'w');
                          fprintf(fid,'#PBS -S /bin/bash\n');
-                         fprintf(fid,'#PBS -N %s\n',modelname);
-%                        fprintf(fid,'#PBS -q %s \n',cluster.queue);
-             fprintf(fid,'#PBS -l select=%i:ncpus=%i:mpiprocs=%i\n',cluster.numnodes,cluster.cpuspernode,16);
-             %fprintf(fid,'#PBS -l select=%i:ncpus=%i\n',cluster.numnodes,cluster.cpuspernode);
-                         fprintf(fid,'#PBS -l walltime=%s\n',cluster.time); %walltime is in seconds.
+                         fprintf(fid,'#PBS -N %s\n',shortname);
+                         fprintf(fid,'#PBS -q %s \n',cluster.queue);
+             fprintf(fid,'#PBS -l select=%i:ncpus=%i:mpiprocs=%i\n',cluster.numnodes,cluster.cpuspernode,cluster.procspernodes);
+                         fprintf(fid,'#PBS -l walltime=%s\n',duration(0,cluster.time,0)); %walltime is in minutes.
                          fprintf(fid,'#PBS -A %s\n',cluster.accountname);
-%                        fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
-%                        fprintf(fid,'#PBS -M mmorligh@uci.edu\n');
-                         fprintf(fid,'#PBS -o %s.outlog \n',modelname);
-                         fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
+                         fprintf(fid,'#PBS -o %s.outlog \n',[cluster.executionpath '/' dirname '/' modelname]);
+                         fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
-                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                         fprintf(fid,'mpiexec_mpt -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+                         fprintf(fid,'cd %s/%s\n\n', ...
+                                 cluster.executionpath,dirname);
+                         fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+
                          if ~io_gather, %concatenate the output files:
                                  fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -144 +158 @@
                          end
                  end %}}}
-                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
+
+
+                 function UploadQueueJob(cluster,modelname,dirname,filelist)% {{{
 
                          %compress the files into one zip.
@@ -151 +167 @@
                                  compressstring = [compressstring ' ' filelist{i}];
                          end
-                         if cluster.interactive,
-                                 compressstring = [compressstring ' ' modelname '.errlog ' modelname '.outlog '];
-                         end
+                         
                          system(compressstring);
 
                          disp('uploading input file and queueing script');
-                         issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
+                        
+                         directory=cluster.executionpath;
+
+                         issmbbftpout(cluster.name,directory, ...
+                                      cluster.login,cluster.port,cluster.numstreams,{[dirname '.tar.gz']});
+
+                 end
+                 %}}}
+
+
+                 function LaunchQueueJob(cluster,modelname,dirname,filelist)% {{{
 
                          disp('launching solution sequence on remote cluster');