rbbt-util 5.33.5 → 5.33.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea55b2e4dd5972cf0e9646e84db4ce6ffd0556bb54796927640dbe3a3ba6611
-  data.tar.gz: 281d52e1685badaba8427e5ffd2226e1a1ab61d66df30cc7cd88acb79ef5aa18
+  metadata.gz: 7ef9895840235ea220e85895364588fca0c56b1ed8673483474465bfbf94a32b
+  data.tar.gz: 68ba6769881c9118256efd14c8d05ed1ca6f8ab56733800c45c25631016647d0
 SHA512:
-  metadata.gz: 459b75076980833dc1be3bd60d9fc98707270c626ab837e76a6c09180aaa2bd3328b4dea8776cf09c8fca0358e38258a30a90d17cd615450a38398c53bacfef0
-  data.tar.gz: 1bb336e1a592b64fbb3e87453042e3f6f220b76c92f5e9ff7550aa25401fd3e36a823f31bddb0e8be6878fa7646b28a010ac320d6fd8e00066bd1ebf2e9f774f
+  metadata.gz: 53c4c81fcfafd8e001f33886323829e230a93731ba23379e1f40358f3bcfae72931d3978d2db3a490b48f22c618462947d5f63a3cc7d135564588d4f6b48aae8
+  data.tar.gz: c53364bbc000b098d4b80afaab6fa8fb16802f9106bfcb8a0aa847b6b8d970e373f102a0fec6021e817a6ebec58d7dc7586c315c9f3aee67481d975d02558abc

data/lib/rbbt/hpc/orchestrate.rb

@@ -60,7 +60,9 @@ module HPC
 
         if options[:dry_run]
           puts Log.color(:magenta, "Manifest: ") + Log.color(:blue, job_options[:manifest] * ", ") + " - tasks: #{job_options[:task_cpus] || 1} - time: #{job_options[:time]} - config: #{job_options[:config_keys]}"
-          puts Log.color(:yellow, "Deps: ") + Log.color(:blue, job_options[:batch_dependencies]*", ")
+          puts Log.color(:magenta, "Deps: ") + Log.color(:blue, job_options[:batch_dependencies]*", ")
+          puts Log.color(:yellow, "Path: ") + top[:top_level].path
+          puts Log.color(:yellow, "Options: ") + Misc.fingerprint(job_options)
           batch_ids[top] = top[:top_level].task_signature
         else
           id = run_job(top[:top_level], job_options)

data/lib/rbbt/workflow/util/orchestrator.rb

@@ -5,10 +5,10 @@ module Workflow
 
     def self.job_workload(job)
       workload = {job => []}
-      return workload if job.done?
+      return workload if job.done? && ! job.dirty?
 
       job.dependencies.each do |dep|
-        next if dep.done?
+        next if dep.done? && ! job.dirty?
         workload.merge!(job_workload(dep))
         workload[job] += workload[dep]
         workload[job] << dep
@@ -16,7 +16,7 @@ module Workflow
       end
 
       job.input_dependencies.each do |dep|
-        next if dep.done?
+        next if dep.done? && ! job.dirty?
         workload.merge!(job_workload(dep))
         workload[job] += workload[dep]
         workload[job] << dep

data/share/Rlib/plot.R

@@ -38,3 +38,4 @@ geom_entity <- function (real.geom = NULL, mapping = NULL, data = NULL, stat = "
     rg
 }
 
+rbbt.ggplot2.rotate_x_labels <- function(){ theme(axis.text.x = element_text(angle = 45, vjust = 1, hjust=1)) }

data/share/rbbt_commands/workflow/prov

@@ -37,7 +37,7 @@ file = ARGV.shift
 $seen = []
 def get_step(file)
   file = File.expand_path(file)
-  file = file.sub(/\.(info|files)/,'')
+  file = file.sub(/\.(info|files)$/,'')
   $seen << file
   Workflow.load_step file
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.33.5
+  version: 5.33.6
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake