rbbt-util 5.32.18 → 5.32.20

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: adee22216a6bbce0a4292f20e89f3c620fc47fcb28aaaf15082cd3ee54d2c093
4
- data.tar.gz: 920f61f95dce1acbecc279ae09731dab297d0eb57cffe7a08734297e917436f8
3
+ metadata.gz: 576b7bc079d39a3054c5bdaa3c0b3af5573a26aacd6181fe65e8d450fd3ed148
4
+ data.tar.gz: 2dc53972fc0e8504ca327de2f680d29ac5c3df63362359528b25ec21f2c10e9b
5
5
  SHA512:
6
- metadata.gz: f7fb0024e458db313ab31a46c4142092121d76efc5ca79c85876a8dc412e6483c12cf3058a1f9f5e6300a31ce672e87b60864eff46c2af8662df411e5680ac39
7
- data.tar.gz: 4216a058f4329d25ed573129c0b40408921566218267922f1b3831108ab2745fc36279fdf7ecedd580d71c0163fae44a8d36adfc2223fecad76ac5864ce90c5f
6
+ metadata.gz: 3cd48cedd0a1957996b59ac51bc56b2b3c8ce8aef54454b1ff10f8f86a08c9df63a60a1d1bad7c29a0741bf687c215f36b628e614b70aa9b8181d687a075364e
7
+ data.tar.gz: 8955e34256095ea4c2e66cc6937845f6b13cb4c87e2bc13f5f7bb4844135886407e50e31114c94e0bdba157f63aab4027c7d94add60f85f31e0646aab3bf124f
@@ -44,6 +44,7 @@ export BATCH_SYSTEM=SLURM
44
44
  time = Misc.format_seconds Misc.timespan(time) unless time.include? ":"
45
45
 
46
46
  sbatch_params = {"job-name" => batch_name,
47
+ "qos" => queue,
47
48
  "output" => fout,
48
49
  "error" => ferr,
49
50
  "cpus-per-task" => task_cpus,
@@ -77,15 +77,15 @@ module Workflow
77
77
  returns workflow.tasks[oname].result_description if workflow.tasks.include?(oname) unless @result_description
78
78
  task name do
79
79
  raise RbbtException, "dependency not found in dep_task" if dependencies.empty?
80
- Step.wait_for_jobs dependencies
80
+ Step.wait_for_jobs dependencies.select{|d| d.streaming? }
81
81
  dep = dependencies.last
82
82
  dep.join
83
83
  raise dep.get_exception if dep.error?
84
84
  raise Aborted, "Aborted dependency #{dep.path}" if dep.aborted?
85
85
  set_info :result_type, dep.info[:result_type]
86
- forget = config :forget_dep_tasks, "forget_dep_tasks", "key:forget_dep_tasks", :default => FORGET_DEP_TASKS
86
+ forget = config :forget_dep_tasks, "forget_dep_tasks", :default => FORGET_DEP_TASKS
87
87
  if forget
88
- remove = config :remove_dep_tasks, "remove_dep_tasks", "key:remove_dep_tasks", :default => REMOVE_DEP_TASKS
88
+ remove = config :remove_dep_tasks, "remove_dep_tasks", :default => REMOVE_DEP_TASKS
89
89
 
90
90
  self.archive_deps
91
91
  self.copy_files_dir
@@ -93,6 +93,7 @@ module Workflow
93
93
  Open.rm_rf self.files_dir if Open.exist? self.files_dir
94
94
  FileUtils.cp_r dep.files_dir, self.files_dir if Open.exist?(dep.files_dir)
95
95
  Open.ln_h dep.path, self.tmp_path
96
+
96
97
  case remove.to_s
97
98
  when 'true'
98
99
  dep.clean
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.32.18
4
+ version: 5.32.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-14 00:00:00.000000000 Z
11
+ date: 2021-07-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake