Changeset 26744 for issm/trunk/src/m/classes/clusters/maui.m

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/clusters/maui.m (modified) (2 diffs)

issm/trunk/src/m/classes/clusters/maui.m ¶

@@ -1 @@
-%MAUI class definition
+%MAUI cluster class definition
 %
 %   Usage:
@@ -7 +7 @@
 
 classdef maui
-    properties (SetAccess=public)  
-                 % {{{
-                 name           = 'maui'
-                 login          = '';
-                 numnodes       = 1;
-                 cpuspernode    = 8;
-                 port           = 0;
-                 projectaccount = '';
-                 partition      = 'nesi_research';
-                 codepath       = '';
-                 executionpath  = '';
-                 interactive    = 0;
-                 time           = 24*60;
-                 memory         = 2;
-         end
-         %}}}
-         methods
-                 function cluster=maui(varargin) % {{{
+        properties (SetAccess=public)
+                % {{{
+                name           = 'maui'
+                login          = '';
+                numnodes       = 1;
+                cpuspernode    = 8;
+                port           = 0;
+                projectaccount = '';
+                partition      = 'nesi_research';
+                codepath       = '';
+                executionpath  = '';
+                interactive    = 0;
+                time           = 24*60;
+                memory         = 2;
+        end
+        %}}}
+        methods
+                function cluster=maui(varargin) % {{{
 
-                         %initialize cluster using default settings if provided
-                         if (exist('maui_settings')==2), maui_settings; end
+                        %initialize cluster using default settings if provided
+                        if (exist('maui_settings')==2), maui_settings; end
 
-                         %use provided options to change fields
-                         cluster=AssignObjectFields(pairoptions(varargin{:}),cluster);
-                 end
-                 %}}}
-                 function disp(cluster) % {{{
-                         %  display the object
-                         disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1)));
-                         disp(sprintf('    name: %s',cluster.name));
-                         disp(sprintf('    login: %s',cluster.login));
-                         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('    projectaccount: %s',cluster.projectaccount));
-                         disp(sprintf('    partition: %s',cluster.partition));
-                         disp(sprintf('    codepath: %s',cluster.codepath));
-                         disp(sprintf('    executionpath: %s',cluster.executionpath));
-                         disp(sprintf('    interactive: %i',cluster.interactive));
-                         disp(sprintf('    time: %i',cluster.time));
-                         disp(sprintf('    memory: %i',cluster.memory));
-                 end
-                 %}}}
-                 function numprocs=np(cluster) % {{{
-                         %compute number of processors
-                         numprocs=cluster.numnodes*cluster.cpuspernode;
-                 end
-                 %}}}
-                 function md = checkconsistency(cluster,md,solution,analyses) % {{{
+                        %use provided options to change fields
+                        cluster=AssignObjectFields(pairoptions(varargin{:}),cluster);
+                end
+                %}}}
+                function disp(cluster) % {{{
+                        %  display the object
+                        disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1)));
+                        disp(sprintf('    name: %s',cluster.name));
+                        disp(sprintf('    login: %s',cluster.login));
+                        disp(sprintf('    numnodes: %i',cluster.numnodes));
+                        disp(sprintf('    cpuspernode: %i',cluster.cpuspernode));
+                        disp(sprintf('    np: %i',cluster.nprocs()));
+                        disp(sprintf('    port: %i',cluster.port));
+                        disp(sprintf('    projectaccount: %s',cluster.projectaccount));
+                        disp(sprintf('    partition: %s',cluster.partition));
+                        disp(sprintf('    codepath: %s',cluster.codepath));
+                        disp(sprintf('    executionpath: %s',cluster.executionpath));
+                        disp(sprintf('    interactive: %i',cluster.interactive));
+                        disp(sprintf('    time: %i',cluster.time));
+                        disp(sprintf('    memory: %i',cluster.memory));
+                end
+                %}}}
+                function numprocs=nprocs(cluster) % {{{
+                        %compute number of processors
+                        numprocs=cluster.numnodes*cluster.cpuspernode;
+                end
+                %}}}
+                function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-                         available_partitions={'nesi_research'}
-                         partition_requirements_time=[24*60];
-                         partition_requirements_np=[80];
+                        available_partitions={'nesi_research'}
+                        partition_requirements_time=[24*60];
+                        partition_requirements_np=[80];
 
-                         QueueRequirements(available_partitions,partition_requirements_time,partition_requirements_np,cluster.partition,cluster.np,1)
+                        QueueRequirements(available_partitions,partition_requirements_time,partition_requirements_np,cluster.partition,cluster.nprocs(),1)
 
-                         %Miscelaneous
-                         if isempty(cluster.login), md = checkmessage(md,'login empty'); end
-                         if isempty(cluster.codepath), md = checkmessage(md,'codepath empty'); end
-                         if isempty(cluster.executionpath), md = checkmessage(md,'executionpath empty'); end
-                 end
-                 %}}}
-                 function BuildKrigingQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
-                         error('not implemented yet');
-                 end
-                 %}}}
-                 function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
+                        %Miscellaneous
+                        if isempty(cluster.login), md = checkmessage(md,'login empty'); end
+                        if isempty(cluster.codepath), md = checkmessage(md,'codepath empty'); end
+                        if isempty(cluster.executionpath), md = checkmessage(md,'executionpath empty'); end
+                end
+                %}}}
+                function BuildKrigingQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
+                        error('not implemented yet');
+                end
+                %}}}
+                function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
 
-                         if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
-                         if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
+                        if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
+                        if(isgprof),    disp('gprof not supported by cluster, ignoring...'); end
 
-                         %write queuing script 
-                         fid=fopen([modelname '.queue'],'w');
-                         fprintf(fid,'#!/bin/bash\n');
-                         fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
-                         fprintf(fid,'#SBATCH --account=%s \n',cluster.projectaccount);
-                         fprintf(fid,'#SBATCH --partition=%s \n',cluster.partition);
-                         fprintf(fid,'#SBATCH --ntasks=%i  \n',cluster.numnodes);
-                         fprintf(fid,'#SBATCH --cpus-per-task=%i\n',cluster.cpuspernode);
-                         fprintf(fid,'#SBATCH --time=%i\n',cluster.time); %walltime is in minutes
-                         fprintf(fid,'#SBATCH --mem-per-cpu=%igb\n',cluster.memory);
-                         fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
-                         fprintf(fid,'#SBATCH -e %s.errlog \n\n',modelname);
-                         fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
-                         fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
-                         fprintf(fid,'module swap PrgEnv-cray PrgEnv-intel\n');
-                         fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-                         fprintf(fid,'srun -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
-                         if ~io_gather, %concatenate the output files:
-                                 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
-                         end
-                         fclose(fid);
+                        %write queuing script 
+                        fid=fopen([modelname '.queue'],'w');
+                        fprintf(fid,'#!/bin/bash\n');
+                        fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
+                        fprintf(fid,'#SBATCH --account=%s \n',cluster.projectaccount);
+                        fprintf(fid,'#SBATCH --partition=%s \n',cluster.partition);
+                        fprintf(fid,'#SBATCH --ntasks=%i  \n',cluster.numnodes);
+                        fprintf(fid,'#SBATCH --cpus-per-task=%i\n',cluster.cpuspernode);
+                        fprintf(fid,'#SBATCH --time=%i\n',cluster.time); %walltime is in minutes
+                        fprintf(fid,'#SBATCH --mem-per-cpu=%igb\n',cluster.memory);
+                        fprintf(fid,'#SBATCH -o %s.outlog \n',modelname);
+                        fprintf(fid,'#SBATCH -e %s.errlog \n\n',modelname);
+                        fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
+                        fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
+                        fprintf(fid,'module swap PrgEnv-cray PrgEnv-intel\n');
+                        fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
+                        fprintf(fid,'srun -n %i %s/issm.exe %s %s %s\n',cluster.nprocs(),cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                        if ~io_gather, %concatenate the output files:
+                                fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
+                        end
+                        fclose(fid);
 
-                         %in interactive mode, create a run file, and errlog and outlog file
-                         if cluster.interactive,
-                                 fid=fopen([modelname '.run'],'w');
-                                 fprintf(fid,'mpiexec -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
-                                 if ~io_gather, %concatenate the output files:
-                                         fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
-                                 end
-                                 fclose(fid);
-                                 fid=fopen([modelname '.errlog'],'w');
-                                 fclose(fid);
-                                 fid=fopen([modelname '.outlog'],'w');
-                                 fclose(fid);
-                         end
-                 end %}}}
-                 function UploadQueueJob(cluster,modelname,dirname,filelist)% {{{
+                        %in interactive mode, create a run file, and errlog and outlog file
+                        if cluster.interactive,
+                                fid=fopen([modelname '.run'],'w');
+                                fprintf(fid,'mpiexec -n %i %s/issm.exe %s %s %s\n',cluster.nprocs(),cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+                                if ~io_gather, %concatenate the output files:
+                                        fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
+                                end
+                                fclose(fid);
+                                fid=fopen([modelname '.errlog'],'w');
+                                fclose(fid);
+                                fid=fopen([modelname '.outlog'],'w');
+                                fclose(fid);
+                        end
+                end %}}}
+                function UploadQueueJob(cluster,modelname,dirname,filelist) % {{{
 
-                         %compress the files into one zip.
-                         compressstring=['tar -zcf ' dirname '.tar.gz '];
-                         for i=1:numel(filelist),
-                                 compressstring = [compressstring ' ' filelist{i}];
-                         end
-                         if cluster.interactive,
-                                 compressstring = [compressstring ' ' modelname '.errlog ' modelname '.outlog '];
-                         end
-                         system(compressstring);
+                        %compress the files into one zip.
+                        compressstring=['tar -zcf ' dirname '.tar.gz '];
+                        for i=1:numel(filelist),
+                                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']});
+                        disp('uploading input file and queueing script');
+                        issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
 
-                 end %}}}
-                 function LaunchQueueJob(cluster,modelname,dirname,filelist,restart,batch)% {{{
+                end %}}}
+                function LaunchQueueJob(cluster,modelname,dirname,filelist,restart,batch) % {{{
 
-                         disp('launching solution sequence on remote cluster');
-                         if ~isempty(restart)
-                                 launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && hostname && sbatch ' modelname '.queue '];
-                         else
-                                 launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
-                                         ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && sbatch ' modelname '.queue '];
-                         end
-                         issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
-                 end %}}}
-                 function Download(cluster,dirname,filelist)% {{{
+                        disp('launching solution sequence on remote cluster');
+                        if ~isempty(restart)
+                                launchcommand=['cd ' cluster.executionpath ' && cd ' dirname ' && hostname && sbatch ' modelname '.queue '];
+                        else
+                                launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                                        ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && hostname && sbatch ' modelname '.queue '];
+                        end
+                        issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
+                end %}}}
+                function Download(cluster,dirname,filelist) % {{{
 
-                         %copy files from cluster to current directory
-                         directory=[cluster.executionpath '/' dirname '/'];
-                         issmscpin(cluster.name,cluster.login,cluster.port,directory,filelist);
+                        %copy files from cluster to current directory
+                        directory=[cluster.executionpath '/' dirname '/'];
+                        issmscpin(cluster.name,cluster.login,cluster.port,directory,filelist);
 
-                 end %}}}
+                end %}}}
         end
 end