rbbt-util 5.26.109 → 5.26.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7631a86ef9abbc364fa0ea3510d30b9c54681f86cb700c398b7c1f35515d246
-  data.tar.gz: 3796828805b1be113f077db4b11fe199aeaf90538277459fe1b4ae842f03c87d
+  metadata.gz: b657fc00a35c1639969f733d9b0c82aeab12217bb6c315b2e5e6b52835b9cc63
+  data.tar.gz: 6a6b00315447deb586accd24b2b3343398186bac96fff97690d99144b23d7608
 SHA512:
-  metadata.gz: cfb61f231fef400d226945bc6ebdb5a4494f07008ec41cfb15694778af6b035995e8d91e881f60560ca5cacdeef1959ab7402c37707c739655586e2cc06719c0
-  data.tar.gz: 51017d704f0c4a8a366100211370c65126057429e62ed50a05b787306d895ef316bf17529e8d0f7137e98e0ef9c9d8bdcb0437551e6d21b59a2cfdc1022a5c69
+  metadata.gz: a0b79bd5ac75de92ab7ce708d74be005d218dab0354a217465556d7a082920256f44a7daf6c90d9f76b614170a1702ec9672ab4da1b90144c3419aa22282c4eb
+  data.tar.gz: b30d54a1b95950b4e49923050bbb26bdbbda742a3b973beefe297336574201b7cab686986a20f4bbfe0b52485faa727b52b6f942d77aa41e50481219e7ab3fd5

data/share/rbbt_commands/workflow/trace

@@ -6,7 +6,7 @@ require 'rbbt-util'
 require 'fileutils'
 require 'rbbt/util/simpleopt'
 require 'rbbt/workflow/step'
-require 'rbbt/workflow/provenance'
+require 'rbbt/workflow/util/provenance'
 require 'rbbt/util/misc'
 
 require 'rbbt-util'
@@ -47,23 +47,33 @@ end
 
 step = get_step file
 
-data = TSV.setup({}, "Job~Workflow,Task,Start,End#:type=:list")
 
 jobs = step.rec_dependencies + [step]
 
+step.info[:archived_info].each do |path,ainfo|
+  archived_step = Step.new path
+  class << archived_step
+    self
+  end.define_method :info do
+    ainfo
+  end
+  jobs << archived_step
+end
+
 jobs = jobs.select{|job| job.info[:done]}.sort_by{|job| job.info[:started]}
 
+data = TSV.setup({}, "Job~Workflow,Task,Start,End#:type=:list")
 min_start = nil
 max_done = nil
 jobs.each do |job|
-  next unless job.done?
+  next unless job.info[:done]
   started = job.info[:started]
   ddone = job.info[:done]
 
   code = [job.workflow, job.task_name].compact.collect{|s| s.to_s} * "."
-  code = code + '.' + job.clean_name
+  code = code + '.' + job.name
 
-  data[code] = [job.workflow.to_s, job.task_name,started,ddone]
+  data[code] = [job.workflow.to_s, job.task_name, started, ddone]
   if min_start.nil?
     min_start = started
   else
@@ -90,7 +100,7 @@ if options[:fix_gap]
   data.through do |k,values|
     start, eend = values.values_at "Start.second", "End.second"
 
-    ranges << (start.floor..eend.ceil)
+    ranges << (start..eend)
   end
 
   gaps = {}
@@ -118,7 +128,7 @@ end
 tasks_info = {}
 
 jobs.each do |dep|
-  next unless dep.done?
+  next unless dep.info[:done]
   task = [dep.workflow, dep.task_name].compact.collect{|s| s.to_s} * "#"
   info = tasks_info[task] ||= {}
 
@@ -142,13 +152,14 @@ jobs.each do |dep|
   info[:shard] = shard
 end
 
-stats = TSV.setup({}, "Task~Calls,Time,Cpus,Spark,Shard#:type=:list")
+stats = TSV.setup({}, "Task~Calls,Avg. Time,Total Time,Cpus,Spark,Shard#:type=:list")
 
 tasks_info.each do |task, info|
   time_lists, cpus, spark, shard = info.values_at :time, :cpus, :spark, :shard
   avg_time = Misc.mean(time_lists).to_i
+  total_time = Misc.sum(time_lists)
   calls = time_lists.length
-  stats[task] = [calls,avg_time, cpus, spark, shard]
+  stats[task] = [calls, avg_time, total_time, cpus, spark, shard]
 end
 
 raise "No jobs to process" if data.size == 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.109
+  version: 5.26.110
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake