Changeset 3146

Timestamp:

03/02/10 00:29:41 (15 years ago)

Author:

Eric.Larour

Message:

Big reorganization of cluster remote job control. We now allow tunnels
to be used, pretty cool. We also simplified all the scripts. Everything
is now controlled in the ClusterLaunchCommand for launching jobs.
We need to do the same for creating the queue files. For tomorrow.

Location:

issm/trunk

Files:

• etc/cluster.rc (modified) (12 diffs)
• src/m/classes/public/queue/BuildQueueingScriptGeneric.m (modified) (1 diff)
• src/m/classes/public/queue/ClusterLaunchCommand.m (added)
• src/m/classes/public/queue/ClusterParameters.m (added)
• src/m/classes/public/queue/LaunchQueueJob.m (modified) (1 diff)
• src/m/classes/public/queue/LaunchQueueJobGeneric.m (deleted)
• src/m/classes/public/queue/LaunchQueueJobcosmos.m (deleted)
• src/m/classes/public/queue/LaunchQueueJobgemini.m (deleted)
• src/m/classes/public/queue/LaunchQueueJobgreenplanet.m (deleted)
• src/m/classes/public/queue/LaunchQueueJobpfe.m (deleted)
• src/m/classes/public/queue/old (added)
• src/m/classes/public/queue/old/LaunchQueueJobGeneric.m (added)
• src/m/classes/public/queue/old/LaunchQueueJobcosmos.m (added)
• src/m/classes/public/queue/old/LaunchQueueJobgemini.m (added)
• src/m/classes/public/queue/old/LaunchQueueJobgreenplanet.m (added)
• src/m/classes/public/queue/old/LaunchQueueJobpfe.m (added)

issm/trunk/etc/cluster.rc

@@ -26 +26 @@
 cluster_executionpath=/work00/edw/larour/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=mustang
@@ -31 +32 @@
 cluster_executionpath=/proj/ice/larour/Testing_ice/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=metro
@@ -36 +38 @@
 cluster_executionpath=/home/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=wilkes
@@ -41 +44 @@
 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=astrid
@@ -46 +50 @@
 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=larsen
@@ -51 +56 @@
 cluster_executionpath=/u/astrid-r1b/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=gemini
@@ -56 +62 @@
 cluster_executionpath=/workg/edw/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=castor
@@ -61 +68 @@
 cluster_executionpath=/workc/edw/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=greenplanet
@@ -66 +74 @@
 cluster_executionpath=/home/elarour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=pollux
@@ -71 +80 @@
 cluster_executionpath=/workp/edw/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 cluster_name=pfe
@@ -76 +86 @@
 cluster_executionpath=/nobackup/elarour/Testing
 cluster_login=elarour
+cluster_port=1025
 
 cluster_name=mearas
@@ -81 +92 @@
 cluster_executionpath=/proj/ice/larour/Testing/Execution
 cluster_login=larour
+cluster_port=0
 
 

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

@@ -24 +24 @@
 end
 
+
 fclose(fid);

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

@@ -1 @@
-function md=LaunchQueueJob(md,executionpath,options,login)
-%LAUNCHQUEUEJOB - ...
+function md=LaunchQueueJob(md,executionpath,login,port,options)
+%LAUNCHQUEUEJOB- Launch queue script for cluster
 %
 %   Usage:
-%      LaunchQueueJob(md,executionpath)
+%      md=LaunchQueueJob(md,executionpath,launchcommand,login,port,options)
 
-%First try and figure out if there is a special script for thie particular cluster
-function_name=['LaunchQueueJob' md.cluster];
 
-%some specific treatment of identical cluster, gemini, castor and pollux
-if strcmpi(md.cluster,'castor') || strcmpi(md.cluster,'pollux'),
-        function_name='LaunchQueueJobgemini';
+%first, check we have the binary file and the queueing script
+if ~exist([ md.name '.bin'],'file'),
+        error('LaunchQueueJobcosmos error message: Binary input file missing, cannot go forward');
 end
 
-if exist(function_name,'file'),
-        %Call this function:
-        eval(['md=' function_name '(md,executionpath,options,login);']);
+if ~exist([ md.name '.queue'],'file'),
+        error('LaunchQueueJobcosmos error message: queueing script missing, cannot go forward');
+end
+
+if md.qmu_analysis,
+        if ~exist([ md.name '.qmu.in'],'file'),
+                error('LaunchQueueJobcosmos error message: missing dakota input file, cannot go forward');
+        end
+end
+
+if ~strcmpi(options.batch,'yes'),
+        
+        %what files are we sending?
+        packages={[md.name '.bin'],[md.name '.queue']};
+        if md.qmu_analysis,
+                packages{end+1}=[md.name '.qmu.in'];
+        end
+
+        disp('uploading input file and queueing script');
+        issmscpout(md.cluster,executionpath,login,port,packages);
+
+        disp('launching solution sequence on remote cluster');
+        issmssh(md.cluster,login,port,ClusterLaunchCommand(md.cluster,md.name,executionpath));
+
 else
-        %Call the generic LaunchQueueJob:
-        md=LaunchQueueJobGeneric(md,executionpath,options,login);
+        disp('batch mode requested: not launching job interactively');
+        disp('launch solution sequence on remote cluster by hand');
 end