rbbt-util 5.31.0 → 5.31.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/hpc/batch.rb +0 -2
- data/lib/rbbt/workflow/step/accessor.rb +11 -7
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 61b346a2806a9f5c6f32dd2e972386ad2ebd5d748b4d71ac89fdeabc0250567b
|
4
|
+
data.tar.gz: faa0e2b8eee1eb1271406f16bf8b030ee4ecd3d83e6dfce205a5129e6676e2c9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 57f76043890f5ad9ecdf7b397f7803d59556bc39fe8110fd719db68192cda82542ccf072899f37f23fd497a03fe79b9d1119146c268e7571843dee9a35eeb506
|
7
|
+
data.tar.gz: 8b4b959e19804a206abb1a080d81866aa73388eee85d1c031021ed79e239df570b055a3f9d007fbe406eb372edd76ade85a556bf9d38dca16011b326efbf8117
|
data/lib/rbbt/hpc/batch.rb
CHANGED
@@ -11,8 +11,6 @@ module HPC
|
|
11
11
|
env_cmd = Misc.process_options options, :env_cmd
|
12
12
|
development = Misc.process_options options, :development
|
13
13
|
|
14
|
-
job_cmd = self.rbbt_job_exec_cmd(job, options)
|
15
|
-
|
16
14
|
if options[:singularity]
|
17
15
|
|
18
16
|
group, user, user_group, scratch_group_dir, projects_group_dir = options.values_at :group, :user, :user_group, :scratch_group_dir, :projects_group_dir
|
@@ -99,7 +99,8 @@ class Step
|
|
99
99
|
if String === value && File.exists?(value)
|
100
100
|
Open.ln_s(value, path)
|
101
101
|
else
|
102
|
-
|
102
|
+
value = "#{value}" if Path === value
|
103
|
+
Open.write(path + '.yaml', value.to_yaml)
|
103
104
|
end
|
104
105
|
when Array === value
|
105
106
|
Open.write(path, value.collect{|v| Step === v ? v.path : v.to_s} * "\n")
|
@@ -122,15 +123,18 @@ class Step
|
|
122
123
|
workflow = job.workflow
|
123
124
|
workflow = Kernel.const_get workflow if String === workflow
|
124
125
|
if workflow
|
125
|
-
task_info = workflow.task_info(task_name)
|
126
|
-
input_types = task_info[:input_types]
|
127
|
-
task_inputs = task_info[:inputs]
|
128
|
-
input_defaults = task_info[:input_defaults]
|
126
|
+
task_info = IndiferentHash.setup(workflow.task_info(task_name))
|
127
|
+
input_types = IndiferentHash.setup(task_info[:input_types])
|
128
|
+
task_inputs = IndiferentHash.setup(task_info[:inputs])
|
129
|
+
input_defaults = IndiferentHash.setup(task_info[:input_defaults])
|
129
130
|
else
|
130
|
-
task_info =
|
131
|
+
task_info = IndiferentHash.setup({})
|
132
|
+
input_types = IndiferentHash.setup({})
|
133
|
+
task_inputs = IndiferentHash.setup({})
|
134
|
+
input_defaults = IndiferentHash.setup({})
|
131
135
|
end
|
132
136
|
|
133
|
-
inputs = {}
|
137
|
+
inputs = IndiferentHash.setup({})
|
134
138
|
real_inputs = job.real_inputs || job.info[:real_inputs]
|
135
139
|
job.recursive_inputs.zip(job.recursive_inputs.fields).each do |value,name|
|
136
140
|
next unless task_inputs.include? name.to_sym
|