Changeset 6698 for branches/1.7

Timestamp:

Sep 7, 2018 11:06:01 AM (6 years ago)

Author:

clarksm

Message:

Added click and click-uq event reports
Added option to replace local uq sweep with Boinc uq sweep

File:

• branches/1.7/lang/tcl/scripts/task.tcl (modified) (12 diffs)

branches/1.7/lang/tcl/scripts/task.tcl

@@ -33 +33 @@
     private method LogSimulationUsage {}
     private method LogSubmittedSimulationUsage {}
+    private method LogUQSimulationUsage {}
     private method SetCpuResourceLimit {}
 
@@ -53 +54 @@
     protected method OnOutput {data}
     protected method Log {args}
-    protected method BuildSubmitCommand {cmd tfile params_file}
+    protected method BuildSubmitBoincCommand {tFile toolparamFile params_file}
+    protected method BuildSubmitLocalCommand {cmd tFile params_file}
     protected method GetParamsForUQ {}
 
@@ -206 +208 @@
     set _outputcb ""
     set _uq(type) ""
+    set _uq(tFile) ""
+    set _uq(toolparamFile) ""
+    set _uq(paramsFile) ""
     foreach {path val} $args {
         if {$path == "-output"} {
@@ -241 +246 @@
     if { !$cached } {
         if { $_uq(type) != "" } {
-            set _uq(tfile) [GetUQTemplateFile]
+            set _uq(tFile) [GetUQTemplateFile]
         }
         if { $_uq(type) == "" } {
@@ -260 +265 @@
             return [list 1 $_job(mesg)]
         }
-        if { [resources -jobprotocol] == "submit" } {
+        if { $_uq(type) != "" } {
+            LogUQSimulationUsage
+        } elseif { [resources -jobprotocol] == "submit" } {
             LogSubmittedSimulationUsage
         } else {
@@ -267 +274 @@
     } else {
         LogCachedSimulationUsage
+    }
+    if { $_uq(tFile) ne "" } {
+        file delete -force -- $_uq(tFile)
+    }
+    if { $_uq(toolparamFile) ne "" } {
+        file delete -force -- $_uq(toolparamFile)
+    }
+    if { $_uq(paramsFile) ne "" } {
+        file delete -force -- $_uq(paramsFile)
     }
     if { $_job(success) } {
@@ -286 +302 @@
 #  Turn the command string from tool.xml into the proper syntax to use
 #  with a submit parameter sweep with a temlate file.  Proper quoting
-# of the template file is necessary to prevent submit from being too smart
-# and converting it to a full pathname.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Task::BuildSubmitCommand {cmd tfile params_file} {
+#  of the template file is necessary to prevent submit from being too smart
+#  and converting it to a full pathname.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Task::BuildSubmitBoincCommand {tFile toolparamFile params_file} {
+    set toolId   [$_xmlobj get tool.id]
+    set toolVers [$_xmlobj get tool.version.application.revision]
+    set newcmd "submit --venue boinc --progress submit --runName=puq --inputfile @:$tFile --data $params_file --env TOOL_PARAMETERS=$toolparamFile ${toolId}_r${toolVers} -w headless"
+
+    return $newcmd
+}
+
+itcl::body Rappture::Task::BuildSubmitLocalCommand {cmd tFile params_file} {
     set quote_next 0
-    set newcmd "submit --progress submit --runName=puq -l -i @:$tfile -d $params_file"
+    set newcmd "submit --local --progress submit --runName=puq --inputfile @:$tFile --data $params_file"
     set cmds [split $cmd " "]
     for {set i 0} {$i < [llength $cmds]} {incr i} {
@@ -307 +331 @@
         }
         if {$arg == "@driver"} {
-            set arg "\"\\\"$tfile\\\"\""
+            set arg "\"\\\"$tFile\\\"\""
         }
         append newcmd " " $arg
     }
-    regsub -all @driver $newcmd $tfile newcmd
+    regsub -all @driver $newcmd $tFile newcmd
+
     return $newcmd
 }
@@ -561 +586 @@
         return ""
     }
-    set paramsFile [GetParamsForUQ]
-    set cmd [BuildSubmitCommand $cmd $_uq(tfile) $paramsFile]
+    set _uq(paramsFile) [GetParamsForUQ]
+#   set cmd [BuildSubmitBoincCommand $_uq(tFile) $_uq(toolparamFile) $_uq(paramsFile)]
+    set cmd [BuildSubmitLocalCommand $cmd $_uq(tFile) $_uq(paramsFile)]
+
     file delete -force puq
+
     return $cmd
 }
@@ -577 +605 @@
 
     # Return a list of the UQ variables and their PDFs.
-    # Also turns $uq(tfile) into a template file.
+    # Also turns $uq(tFile) into a template file.
     set _uq(varlist) [lindex [$_xmlobj uq_get_vars $templateFile] 0]
-    set _uq(tfile) $templateFile
+    set _uq(tFile) $templateFile
+
+    # Create toolparameter file
+    set toolParameterFile "toolParameter[pid].hz"
+    set f [open $toolParameterFile w]
+    puts $f "file(execute):$templateFile"
+    close $f
+
+    set _uq(toolparamFile) $toolParameterFile
+
     return $templateFile
 }
@@ -779 +816 @@
 #   }
         
+# [click] messages go here
+    if { [string length $jobstats] > 0} {
+        lappend args \
+            "job"      [incr jobnum] \
+            "event"    "\[click\]" \
+            "start"    $times(start) \
+            "walltime" 0 \
+            "cputime"  0 \
+            "status"   0
+        uplevel #0 $jobstats $args 
+    }
+        
     #
     # Scan through stderr channel and look for statements that
@@ -833 +882 @@
     incr jobnum $subjobs
 
-    # Add cputime info to run.xml file
+    # Add session info to run.xml file
     if { [catch {
         Rappture::library $_job(runfile)
     } xmlobj] != 0 } {
+        error "Can't create rappture library: $xmlobj"
+    }
+    global env
+    if {[info exists env(SESSION)]} {
+        $xmlobj put output.session $env(SESSION)
+    }
+    set _job(xmlobj) $xmlobj
+}
+
+itcl::body Rappture::Task::LogUQSimulationUsage {} {
+    array set times [Rappture::rusage measure]
+
+    if { [string length $jobstats] > 0} {
+        lappend args \
+            "job"      [incr jobnum] \
+            "event"    "\[click-uq\]" \
+            "start"    $times(start) \
+            "walltime" 0 \
+            "cputime"  0 \
+            "status"   0
+        uplevel #0 $jobstats $args 
+    }
+
+    # Add session info to run.xml file
+    if { [catch { Rappture::library $_job(runfile) } xmlobj] != 0 } {
         error "Can't create rappture library: $xmlobj"
     }