lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.0.2 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.0.3
- old
+ new
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
# encoding: utf-8
-# Version = '20201109-225541'
+# Version = '20201218-155451'
require 'csv'
require 'fileutils'
require 'yaml'
require 'drb/drb'
@@ -236,10 +236,11 @@
@params['cores'] = nil
@params['ram'] = nil
@params['scratch'] = nil
@params['node'] = ''
@params['queue'] = ''
+ @params['partition'] = ''
@params['process_mode'] = 'SAMPLE'
@params['samples'] = ''
@job_ids = []
@required_columns = []
@module_source = MODULE_SOURCE
@@ -492,9 +493,10 @@
end
def submit_command(job_script)
gsub_options = []
gsub_options << "-c #{@params['cores']}" unless @params['cores'].to_s.empty?
gsub_options << "-n #{@params['node']}" unless @params['node'].to_s.empty?
+ gsub_options << "-p #{@params['partition']}" unless @params['partition'].to_s.empty?
gsub_options << "-r #{@params['ram']}" unless @params['ram'].to_s.empty?
gsub_options << "-s #{@params['scratch']}" unless @params['scratch'].to_s.empty?
command = "wfm_monitoring --server #{WORKFLOW_MANAGER} --user #{@user} --project #{@project.gsub(/p/,'')} --logdir #{@gstore_script_dir} #{job_script} #{gsub_options.join(' ')}"
puts "submit: #{command}"