Changeset 3119

Timestamp:

02/24/10 13:20:40 (15 years ago)

Author:

Eric.Larour

Message:

Added queuing scripts for pleiades cluster.
Also, now ClusterParameters returns login name.
cluster.rc also now includes login name.

Location:

issm/trunk/src/m/classes/public

Files:

• ClusterParameters.m (modified) (4 diffs)
• loadmultipleresultsfromcluster.m (modified) (1 diff)
• loadresultsfromcluster.m (modified) (1 diff)
• peek.m (modified) (1 diff)
• queue/BuildQueueingScriptpfe.m (added)
• queue/LaunchMultipleQueueJobgemini.m (modified) (1 diff)
• queue/LaunchQueueJob.m (modified) (2 diffs)
• queue/LaunchQueueJobGeneric.m (modified) (2 diffs)
• queue/LaunchQueueJobcosmos.m (modified) (2 diffs)
• queue/LaunchQueueJobgemini.m (modified) (2 diffs)
• queue/LaunchQueueJobgreenplanet.m (modified) (1 diff)
• queue/LaunchQueueJobpfe.m (added)
• solveparallel.m (modified) (2 diffs)

issm/trunk/src/m/classes/public/ClusterParameters.m

@@ -1 @@
-function [cluster_codepath cluster_executionpath]=ClusterParameters(cluster_name,cluster_rc_location)
+function [cluster_codepath cluster_executionpath cluster_login]=ClusterParameters(cluster_name,cluster_rc_location)
 %CLUSTERPARAMETERS - from cluster_name, find out cluster parameters in cluster.rc file
 %
@@ -6 +6 @@
 %
 %   Usage:
-%      [cluster_codepath cluster_executionpath]=ClusterParameters(cluster_name,cluster_rc_location)
+%      [cluster_codepath cluster_executionpath cluster_login ]=ClusterParameters(cluster_name,cluster_rc_location)
 
-lines_per_cluster=3;
+lines_per_cluster=4;
 
 %open cluster.rc file
@@ -49 +49 @@
         if length(line)>12,
                 if strcmp(line(1:12),'cluster_name'),
-                        %ok, the next 2 lines deal with one cluster settings.
+                        %ok, the next 3 lines deal with one cluster settings.
                         %check if this is the cluster we are looking for.
                         splittedstring=strsplit(line,'=');
@@ -77 +77 @@
                                 cluster_executionpath=value;
 
+                                %Get next line for cluster loging name
+                                line=fgetl(fid);
+                                splittedstring=strsplit(line,'=');
+                                descriptor=splittedstring{1};
+                                value=splittedstring{2};
+                                if ~strcmp(descriptor,'cluster_login'),
+                                        error('cluster settings in cluster.rc don''t follow the correct syntax');
+                                end
+                                cluster_login=value;
+
                         else
                                 %Wrong cluster name, skip next lines_per_cluster lines and continue;

issm/trunk/src/m/classes/public/loadmultipleresultsfromcluster.m

@@ -11 +11 @@
 name=md_list{1}.name;
 cluster_rc_location=which('cluster.rc');
-[codepath,executionpath]=ClusterParameters(cluster,cluster_rc_location);
+[codepath,executionpath,login]=ClusterParameters(cluster,cluster_rc_location);
 
 %Remote tar: 

issm/trunk/src/m/classes/public/loadresultsfromcluster.m

@@ -9 +9 @@
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ClusterParameters(md.cluster,cluster_rc_location);
+[codepath,executionpath,login]=ClusterParameters(md.cluster,cluster_rc_location);
 
 %What packages are we picking up from remote cluster

issm/trunk/src/m/classes/public/peek.m

@@ -11 +11 @@
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ClusterParameters(md.cluster,cluster_rc_location);
+[codepath,executionpath,login]=ClusterParameters(md.cluster,cluster_rc_location);
 
 %peek at the queued job

issm/trunk/src/m/classes/public/queue/LaunchMultipleQueueJobgemini.m

@@ -20 +20 @@
 
 disp('launching solution sequence on remote cluster');
-issmssh(cluster,['"cd ' executionpath ' && source ' name '.queue "']);
+issmssh(cluster,login,['"cd ' executionpath ' && source ' name '.queue "']);

issm/trunk/src/m/classes/public/queue/LaunchQueueJob.m

@@ -1 @@
-function md=LaunchQueueJob(md,executionpath,options)
+function md=LaunchQueueJob(md,executionpath,options,login)
 %LAUNCHQUEUEJOB - ...
 %
@@ -15 +15 @@
 if exist(function_name,'file'),
         %Call this function:
-        eval(['md=' function_name '(md,executionpath,options);']);
+        eval(['md=' function_name '(md,executionpath,options,login);']);
 else
         %Call the generic LaunchQueueJob:
-        md=LaunchQueueJobGeneric(md,executionpath,options);
+        md=LaunchQueueJobGeneric(md,executionpath,options,login);
 end

issm/trunk/src/m/classes/public/queue/LaunchQueueJobGeneric.m

@@ -1 @@
-function md=LaunchQueueJobGeneric(md,executionpath,options)
+function md=LaunchQueueJobGeneric(md,executionpath,options,login)
 %LAUNCHQUEUEJOBGENERIC - Generic routine to launch queueing job
 %
@@ -26 +26 @@
         
         disp('launching solution sequence on remote cluster');
-        issmssh(md.cluster,['cd ' executionpath ' && source ' md.name '.queue ']);
+        issmssh(md.cluster,login,['cd ' executionpath ' && source ' md.name '.queue ']);
 
 else

issm/trunk/src/m/classes/public/queue/LaunchQueueJobcosmos.m

@@ -1 @@
-function md=LaunchQueueJobcosmos(md,executionpath,options)
+function md=LaunchQueueJobcosmos(md,executionpath,options,login)
 %LAUNCHQUEUEJOBCOSMOS- Launch queue script for Cosmos cluster
 %
@@ -24 +24 @@
 
         disp('launching solution sequence on remote cluster');
-        issmssh(md.cluster,['"cd ' executionpath ' && qsub -S/bin/sh ' md.name '.queue "']);
+        issmssh(md.cluster,login,['"cd ' executionpath ' && qsub -S/bin/sh ' md.name '.queue "']);
 else
         disp('batch mode requested: not launching job interactively');

issm/trunk/src/m/classes/public/queue/LaunchQueueJobgemini.m

@@ -1 @@
-function md=LaunchQueueJobgemini(md,executionpath,options)
+function md=LaunchQueueJobgemini(md,executionpath,options,login)
 %LAUNCHQUEUEJOBGEMINI - Launch queueing script on Gemini cluster
 %
@@ -24 +24 @@
         
         disp('launching solution sequence on remote cluster');
-        issmssh(md.cluster,['"cd ' executionpath ' && qsub ' md.name '.queue "']);
+        issmssh(md.cluster,login,['"cd ' executionpath ' && qsub ' md.name '.queue "']);
 else
         disp('batch mode requested: not launching job interactively');

issm/trunk/src/m/classes/public/queue/LaunchQueueJobgreenplanet.m

@@ -1 @@
-function md=LaunchQueueJobgreenplanet(md,executionpath,options)
+function md=LaunchQueueJobgreenplanet(md,executionpath,options,login)
 %LAUNCHQUEUEJOBGEMINI - ...
 %

issm/trunk/src/m/classes/public/solveparallel.m

@@ -10 +10 @@
 
 %Figure out parameters for this particular cluster
-[codepath,executionpath]=ClusterParameters(md.cluster,cluster_rc_location);
+[codepath,executionpath,login]=ClusterParameters(md.cluster,cluster_rc_location);
 
 %Append name of directory if specified in options: 
@@ -27 +27 @@
 
 %Now, launch the queueing script
-md=LaunchQueueJob(md,executionpath,options);
+md=LaunchQueueJob(md,executionpath,options,login);
 
 %Do we return, or just wait for results?