Changeset 38186 for trunk

Timestamp:

Apr 24, 2015, 6:31:45 PM (11 years ago)

Author:

watersc1

Message:

I forgot the schedulers are different

Location:

trunk

Files:

• ippScripts/scripts/sc_prepare_run.pl (modified) (1 diff)
• ippScripts/scripts/sc_remote_exec.pl (modified) (1 diff)
• ippconfig/recipes/remote_hosts.config (modified) (2 diffs)

trunk/ippScripts/scripts/sc_prepare_run.pl

@@ -304 +304 @@
 print COMMAND "#!/bin/tcsh\n";
 print COMMAND "##### Moab controll lines\n";
-print COMMAND "#MSUB -l nodes=${node_req}:ppn=${proc_per_node},walltime=${time_req}:00:00\n"; ## CHECK RESOURCES
-print COMMAND "#MSUB -j oe\n";
-print COMMAND "#MSUB -V\n";
-print COMMAND "#MSUB -o ${remote_root}/stask_logs/${stage}.${remote_id}.out\n";
+if ($remote_recipe{SCHEDULER} eq 'MOAB') {
+    print COMMAND "#MSUB -l nodes=${node_req}:ppn=${proc_per_node},walltime=${time_req}:00:00\n"; ## CHECK RESOURCES
+    print COMMAND "#MSUB -j oe\n";
+    print COMMAND "#MSUB -V\n";
+    print COMMAND "#MSUB -o ${remote_root}/stask_logs/${stage}.${remote_id}.out\n";
+}
+elsif ($remote_recipe{SCHEDULER} eq 'SLURM') {
+    print COMMAND "###### sbatch control lines\n";
+    print COMMAND "#SBATCH --time ${time_req}:00:00\n";
+    print COMMAND "#SBATCH --nodes ${node_req}\n";
+    print COMMAND "#SBATCH --open-mode=append\n";
+    print COMMAND "#SBATCH --export=ALL\n";
+    print COMMAND "#SBATCH --exclusive\n";
+}
+else {
+    &my_die("No scheduler defined", $remote_id, 0, 'fail_state');
+}
+
 print COMMAND "date\n";
 print COMMAND 'srun -n $SLURM_JOB_NUM_NODES -m cyclic -l /bin/hostname | sort -n | awk \'{printf "%s\n", $2}\' > hosts.${SLURM_JOB_ID}' . "\n";

trunk/ippScripts/scripts/sc_remote_exec.pl

@@ -171 +171 @@
 # Run real command
 my (undef,$remote_command) = &uri_convert($uri_command);
-my $ssh_exec_stdout = &ssh_exec_command("msub -V $remote_command");
+my $ssh_exec_stdout;
+
+if ($remote_recipe{SCHEDULER} eq 'MOAB') {
+    $ssh_exec_stdout = &ssh_exec_command("msub -V $remote_command");
+}
+elsif ($remote_recipe{SCHEDULER} eq 'SLURM') {
+    $ssh_exec_stdout = &ssh_exec_command("sbatch $remote_command");
+}
+else {
+    &my_die("No scheduler defined", $remote_id, 0, 'pending');
+}
 if ($#{ $ssh_exec_stdout } != -1) { # Parse the output
     $job_id = ${ $ssh_exec_stdout }[0];

trunk/ippconfig/recipes/remote_hosts.config

@@ -18 +18 @@
 # This is used to decide if we bring back warp images, and if stack should ask for local copies.
      TRANSFER_WARP_IMAGES BOOL FALSE
+
+     SCHEDULER       STR     MOAB
 
      PROC_PER_NODE   S32     24
@@ -39 +41 @@
      TRANSFER_WARP_IMAGES BOOL FALSE
 
+     SCHEDULER       STR     SLURM
+
      PROC_PER_NODE   S32     20
      MIN_NODES       S32     1