Changeset 13631

Timestamp:

10/11/12 20:44:58 (12 years ago)

Author:

Eric.Larour

Message:

NEW: cloud cluster class, to control Amazon cloud computing.
Needed equivalents of ssh and scp using the starcluster commands put and get.
waitonlock also needed to not depend on the port value of the cluster so much.

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/cloud.m (modified) (3 diffs)
• os/issmstscpin.m (modified) (2 diffs)
• os/issmstscpout.m (added)
• os/issmstssh.m (added)
• os/starcluster.m (added)
• solve/waitonlock.m (modified) (1 diff)

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

@@ -19 +19 @@
                 function cluster=cloud(varargin) % {{{
 
-                        %use provided options to change fields
-                        options=pairoptions(varargin{:});
-
                         %initialize cluster using user settings if provided
-                        if (exist([cluster.name '_settings'])==2), eval([cluster.name '_settings']); end
+                        if (exist('cloud_settings')==2), 
+                                eval('cloud_settings'); 
+                        end
 
                         %OK get other fields
@@ -74 +73 @@
 
                         disp('uploading input file and queueing script');
-                        issmstscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[dirname '.tar.gz']});
+                        issmstscpout(cluster.name,cluster.executionpath,cluster.login,{[dirname '.tar.gz']});
 
                         disp('launching solution sequence on remote cluster');
-                        launchcommand=['source ' codepath '/etc/environment.sh && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                        launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
                                 ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && source  ' modelname '.queue '];
-                        issmstssh(cluster.name,cluster.login,cluster.port,launchcommand);
+                        issmstssh(cluster.name,cluster.login,launchcommand);
                 end %}}}
                 function Download(cluster,dirname,filelist)% {{{
@@ -85 +84 @@
                         %copy files from cluster to current directory
                         directory=[cluster.executionpath '/' dirname '/'];
-                        issmstscpin(cluster.name,cluster.login,cluster.port,directory,filelist);
+                        issmstscpin(cluster.name,cluster.login,directory,filelist);
                 end %}}}
         end

issm/trunk-jpl/src/m/os/issmstscpin.m

@@ -5 +5 @@
 %
 %
-
-%first get hostname
-hostname=oshostname();
 
 %get initial warning mode
@@ -24 +21 @@
         string=packages{1};
 else
-        string='\{';
+        string='';
         for i=1:numel(packages)-1,
-                string=[string packages{i} ','];
+                string=[string ' ' path packages{i} ' '];
         end
-        string=[string packages{end} '\}'];
+        string=[string path packages{end}];
 end
 
-eval(['!starcluster get ' host ' --user ' login ' ' path '/' string  ' ./']);
+system([starcluster() ' get ' host ' --user ' login ' ' string  ' ./']);
 
 %check starcluster get  worked

issm/trunk-jpl/src/m/solve/waitonlock.m

@@ -12 +12 @@
 cluster=md.cluster.name;
 login=md.cluster.login;
-port=md.cluster.port;
+if any(strcmp(properties(md.cluster), 'port')) 
+        port=md.cluster.port;
+end
 timelimit=md.settings.waitonlock;
 filename=[executionpath '/' md.private.runtimename '/' md.miscellaneous.name '.lock'];