rbbt-util 5.30.8 → 5.30.9
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 +4 -4
- data/lib/rbbt/hpc/orchestrate.rb +13 -2
- data/share/rbbt_commands/workflow/server +1 -0
- 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: 8985df2e0e2353224b5b075acb1bb04243d12351b8d904441009b93ccf490288
|
|
4
|
+
data.tar.gz: 3a1e7d8561fcc72a83c2b0006c49cf50f35a87cfa037c0186bdc3563435a0e8f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: baae9121f3d757bcda2add9f666c740e5647f38d4bbc511d3456e36d466fc443c8a04b0ae12431bbf226e4e0c75eec5700b28720c117954005fe836ad74b76e8
|
|
7
|
+
data.tar.gz: ea61b36cec82f6634546aecf5de356d7d3b3c9d28eccfad52282f309e5ad6e1e28c2bfb627a100970d6a553fdc90b3900a4247101210cfbaae461c35d8e0399a
|
data/lib/rbbt/hpc/orchestrate.rb
CHANGED
|
@@ -140,21 +140,30 @@ module HPC
|
|
|
140
140
|
job_rules.delete :tasks
|
|
141
141
|
job_rules.delete :workflow
|
|
142
142
|
|
|
143
|
-
config_keys = job_rules.delete(:config_keys)
|
|
144
143
|
|
|
145
144
|
job_options = IndiferentHash.setup(options.merge(job_rules).merge(:slurm_dependencies => dep_ids))
|
|
146
145
|
job_options.delete :orchestration_rules
|
|
146
|
+
|
|
147
|
+
config_keys = job_rules.delete(:config_keys)
|
|
147
148
|
if config_keys
|
|
148
149
|
config_keys.gsub!(/,\s+/,',')
|
|
149
150
|
job_options[:config_keys] = job_options[:config_keys] ? config_keys + "," + job_options[:config_keys] : config_keys
|
|
150
151
|
end
|
|
151
152
|
|
|
152
|
-
|
|
153
153
|
if options[:piggyback]
|
|
154
154
|
manifest = options[:piggyback].uniq
|
|
155
155
|
manifest += [job]
|
|
156
156
|
manifest.concat chain if chain
|
|
157
|
+
|
|
157
158
|
job = options[:piggyback].first
|
|
159
|
+
|
|
160
|
+
job_rules = self.job_rules(rules, job)
|
|
161
|
+
new_config_keys = self.job_rules(rules, job)[:config_keys]
|
|
162
|
+
if new_config_keys
|
|
163
|
+
new_config_keys = new_config_keys.gsub(/,\s+/,',')
|
|
164
|
+
job_options[:config_keys] = job_options[:config_keys] ? new_config_keys + "," + job_options[:config_keys] : new_config_keys
|
|
165
|
+
end
|
|
166
|
+
|
|
158
167
|
job_options.delete :piggyback
|
|
159
168
|
else
|
|
160
169
|
manifest = [job]
|
|
@@ -165,6 +174,8 @@ module HPC
|
|
|
165
174
|
|
|
166
175
|
job_options[:manifest] = manifest.collect{|j| j.workflow_short_path }
|
|
167
176
|
|
|
177
|
+
job_options[:config_keys] = job_options[:config_keys].split(",").uniq * "," if job_options[:config_keys]
|
|
178
|
+
|
|
168
179
|
if options[:dry_run]
|
|
169
180
|
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]}"
|
|
170
181
|
puts Log.color(:yellow, "Deps: ") + Log.color(:blue, job_options[:slurm_dependencies]*", ")
|
|
@@ -16,6 +16,7 @@ $ rbbt workflow server [options] <Workflow>
|
|
|
16
16
|
-B--Bind* Bind IP
|
|
17
17
|
-p--port* TCP port
|
|
18
18
|
-s--server* Server type: thin, webrick, unicorn, etc
|
|
19
|
+
-w--workers* Number of workers for cluster mode (puma)
|
|
19
20
|
-so--server_options* Additional options for server (e.g. option1=value1;option2=value2)
|
|
20
21
|
-f--finder Start server with finder functionality
|
|
21
22
|
-RS--Rserve_session* Rserve session to use, otherwise start new one
|