Changeset 38168 for trunk/ippTasks

Timestamp:

Apr 23, 2015, 3:12:58 PM (11 years ago)

Author:

watersc1

Message:

Updated remote code with ff support and ippconfig recipes.

File:

• trunk/ippTasks/remote.pro (modified) (10 diffs)

trunk/ippTasks/remote.pro

@@ -20 +20 @@
 $remoteExec_DB = 0
 $remotePoll_DB = 0
+$REMOTE_RECIPE = 0
+
 
 list STAGES
@@ -94 +96 @@
     active true
   end
+end
+
+macro set.remote.recipe
+  if ($0 != 2)
+     echo "USAGE: set.remote.recipe (recipe_name)"
+     break
+  end
+  $REMOTE_RECIPE = $1
 end
 
@@ -273 +283 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($REMOTE_RECIPE == 0) break
 
     book getpage remotePrepCompRuns 0 -var pageName -key pantaskState INIT
@@ -287 +298 @@
 
     if ("$STAGE" == "chip")
-      $command = sc_prepare_chip.pl --camera GPC1 --chip_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_chip.pl --chip_id $STAGE_ID
     end
     if ("$STAGE" == "camera")
-      $command = sc_prepare_camera.pl --camera GPC1 --cam_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_camera.pl --cam_id $STAGE_ID
     end
     if ("$STAGE" == "warp")
-      $command = sc_prepare_warp.pl --camera GPC1 --warp_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_warp.pl --warp_id $STAGE_ID
     end
     if ("$STAGE" == "stack")
-      $command = sc_prepare_stack.pl --camera GPC1 --stack_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_stack.pl --stack_id $STAGE_ID
     end
     if ("$STAGE" == "staticsky")
-      $command = sc_prepare_staticsky.pl --camera GPC1 --sky_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_staticsky.pl --sky_id $STAGE_ID
     end
     if ("$STAGE" == "diff")
-      $command = sc_prepare_diff.pl --camera GPC1 --diff_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
-    end
+      $command = sc_prepare_diff.pl --diff_id $STAGE_ID
+    end
+    if ("$STAGE" == "ff")
+      $command = sc_prepare_ff.pl --ff_id $STAGE_ID
+    end
+
+# Common elements
+    $command = $command --recipe $REMOTE_RECIPE --camera GPC1 --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
 
     options $pageName
@@ -391 +408 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($REMOTE_RECIPE == 0) break
 
     book getpage remotePrepRuns 0 -var pageName -key pantaskState INIT
@@ -404 +422 @@
     sprintf outroot "%s/remote_%s.%s" $PATH_BASE $STAGE $REMOTE_ID
 
-    $command = sc_prepare_run.pl --camera GPC1 --remote_id $REMOTE_ID --stage $STAGE --path_base $outroot --dbname $DBNAME
+    $command = sc_prepare_run.pl --camera GPC1 --remote_id $REMOTE_ID --stage $STAGE --path_base $outroot --dbname $DBNAME --recipe $REMOTE_RECIPE
 
     options $pageName
@@ -491 +509 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($REMOTE_RECIPE == 0) break
 
     book getpage remoteExecRuns 0 -var pageName -key pantaskState INIT
@@ -505 +524 @@
     sprintf outroot "%s/remote_%s.%s" $PATH_BASE $STAGE $REMOTE_ID
 
-    $command = sc_remote_exec.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1
+    $command = sc_remote_exec.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1 --recipe $REMOTE_RECIPE
 
     options $pageName
@@ -593 +612 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($REMOTE_RECIPE == 0) break
 
     book getpage remotePollRuns 0 -var pageName -key pantaskState INIT
@@ -609 +629 @@
     # This can't have an invalid job_id
     if ($JOB_ID == -1) break
-    $command = sc_remote_poll.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1 --job_id $JOB_ID
+    $command = sc_remote_poll.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1 --job_id $JOB_ID --recipe $REMOTE_RECIPE
 
     options $pageName