rbbt-util 5.33.1 → 5.33.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 70ba4440be0bdca6f80b4aa78393ca4fbec5dbc8d8a1cc72b6393e73127b5340
4
- data.tar.gz: 42021bd242233b5e4e3a268c27291953d84c8bad85b87d8feaf6389685f043bf
3
+ metadata.gz: 331adb8d6a45a7cc3ee18b17785ffe03d28585274e9b2d1cab5cd502cdc90821
4
+ data.tar.gz: 8580df0b38d805739fe3ad80e688c92a5c31305893ef1cf6cfccd88c0aaccc7a
5
5
  SHA512:
6
- metadata.gz: d6a229aa39440cf3b0b42a505e32c699d791d8dd1e1328f42cd6500c947560b0d9343312080af78475a6f4835077e53c029d862e9d4c90addd84408925754b50
7
- data.tar.gz: e31505e92ca6425095a90bdcd8fe95d435c8435bc929dcb1c0c77083a1286439c952d7a98af1091664fcee7a57ba3f86b99258a84958714d630ab4a3678f1ee3
6
+ metadata.gz: 6381f886a7282c03c8e8303ae148fe4a4fc3b82dad60d1d039953d83075aa85ccc19bb75f24811e2158a6715b9ed471288b2b23110c981a61ad167bc6593aac0
7
+ data.tar.gz: 1476c3fdf9fe56928a9dd85fc2384735b71a0a40a45359197fc203608f2933aa6a6f5ec94c1bd5ae4b5782b2cd2bbe752f2d06973f9989307d81e3a1f261eba2
@@ -14,8 +14,14 @@ module HPC
14
14
  options.delete "detach"
15
15
  options.delete "jobname"
16
16
 
17
- rules = YAML.load(Open.read(options[:orchestration_rules])) if options[:orchestration_rules]
18
- rules ||= {}
17
+ if options[:orchestration_rules]
18
+ rules = YAML.load(Open.read(options[:orchestration_rules]))
19
+ elsif Rbbt.etc.slurm["default.yaml"].exists?
20
+ rules = YAML.load(Open.read(Rbbt.etc.slurm["default.yaml"]))
21
+ else
22
+ rules = {}
23
+ end
24
+
19
25
  IndiferentHash.setup(rules)
20
26
 
21
27
  batches = HPC::Orchestration.job_batches(rules, job)
@@ -512,6 +512,7 @@ class Step
512
512
  return true if @overriden
513
513
  return true if dependencies.select{|dep| dep.overriden? }.any?
514
514
  info[:archived_info].each do |f,i|
515
+ next if Symbol === i
515
516
  return true if i[:overriden] || i["overriden"]
516
517
  end if info[:archived_info]
517
518
  return false
@@ -84,7 +84,8 @@ module Workflow
84
84
 
85
85
  def self.candidates(workload, rules)
86
86
  if rules.empty?
87
- candidates = workload.select{|k,v| v.empty? }.
87
+ candidates = workload.
88
+ select{|k,v| v.empty? }.
88
89
  collect{|k,v| k }.
89
90
  reject{|k| k.done? }
90
91
  else
@@ -204,7 +205,6 @@ module Workflow
204
205
  when (job.error? || job.aborted?)
205
206
  begin
206
207
  if job.recoverable_error?
207
- iif [:CLEAN, job, job.status, job.info[:exception]]
208
208
  job.clean
209
209
  raise TryAgain
210
210
  else
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.33.1
4
+ version: 5.33.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-02-22 00:00:00.000000000 Z
11
+ date: 2022-02-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake