rbbt-util 5.33.1 → 5.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70ba4440be0bdca6f80b4aa78393ca4fbec5dbc8d8a1cc72b6393e73127b5340
-  data.tar.gz: 42021bd242233b5e4e3a268c27291953d84c8bad85b87d8feaf6389685f043bf
+  metadata.gz: 331adb8d6a45a7cc3ee18b17785ffe03d28585274e9b2d1cab5cd502cdc90821
+  data.tar.gz: 8580df0b38d805739fe3ad80e688c92a5c31305893ef1cf6cfccd88c0aaccc7a
 SHA512:
-  metadata.gz: d6a229aa39440cf3b0b42a505e32c699d791d8dd1e1328f42cd6500c947560b0d9343312080af78475a6f4835077e53c029d862e9d4c90addd84408925754b50
-  data.tar.gz: e31505e92ca6425095a90bdcd8fe95d435c8435bc929dcb1c0c77083a1286439c952d7a98af1091664fcee7a57ba3f86b99258a84958714d630ab4a3678f1ee3
+  metadata.gz: 6381f886a7282c03c8e8303ae148fe4a4fc3b82dad60d1d039953d83075aa85ccc19bb75f24811e2158a6715b9ed471288b2b23110c981a61ad167bc6593aac0
+  data.tar.gz: 1476c3fdf9fe56928a9dd85fc2384735b71a0a40a45359197fc203608f2933aa6a6f5ec94c1bd5ae4b5782b2cd2bbe752f2d06973f9989307d81e3a1f261eba2

data/lib/rbbt/hpc/orchestrate.rb

@@ -14,8 +14,14 @@ module HPC
       options.delete "detach"
       options.delete "jobname"
 
-      rules = YAML.load(Open.read(options[:orchestration_rules])) if options[:orchestration_rules]
-      rules ||= {}
+      if options[:orchestration_rules]
+        rules = YAML.load(Open.read(options[:orchestration_rules]))
+      elsif Rbbt.etc.slurm["default.yaml"].exists?
+        rules = YAML.load(Open.read(Rbbt.etc.slurm["default.yaml"]))
+      else
+        rules = {}
+      end
+
       IndiferentHash.setup(rules)
 
       batches = HPC::Orchestration.job_batches(rules, job)

data/lib/rbbt/workflow/step/dependencies.rb

@@ -512,6 +512,7 @@ class Step
     return true if @overriden
     return true if dependencies.select{|dep| dep.overriden? }.any?
     info[:archived_info].each do |f,i|
+      next if Symbol === i
       return true if i[:overriden] || i["overriden"]
     end if info[:archived_info]
     return false

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

@@ -84,7 +84,8 @@ module Workflow
 
     def self.candidates(workload, rules)
       if rules.empty?
-        candidates = workload.select{|k,v| v.empty? }.
+        candidates = workload.
+          select{|k,v| v.empty? }.
           collect{|k,v| k }.
           reject{|k| k.done? }
       else
@@ -204,7 +205,6 @@ module Workflow
             when (job.error? || job.aborted?)
               begin
                 if job.recoverable_error?
-                  iif [:CLEAN, job, job.status, job.info[:exception]]
                   job.clean
                   raise TryAgain
                 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.33.1
+  version: 5.33.2
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake