diff --git a/form.yml b/form.yml index b3d3aad1dfcde5d7868a1359e8a7d01b48f7e831..65043161bad3ab9466e7e7328f8265fedc9be05e 100644 --- a/form.yml +++ b/form.yml @@ -1,7 +1,6 @@ --- cluster: - "owens" - - "owens-slurm" form: - version - bc_account diff --git a/submit.yml.erb b/submit.yml.erb index 4adeaa3f7a5d4119cd647fb800b7cbda81ad419f..475347e6b79f938c90374882720334017f0f6d95 100644 --- a/submit.yml.erb +++ b/submit.yml.erb @@ -1,20 +1,16 @@ <%- ppn = num_cores.blank? ? 28 : num_cores.to_i nodes = bc_num_slots.blank? ? 1 : bc_num_slots.to_i - torque_cluster = OodAppkit.clusters[cluster].job_config[:adapter] == 'torque' case node_type when "hugemem" ppn = 48 partition = bc_num_slots.to_i > 1 ? "hugemem-parallel" : "hugemem" slurm_args = [ "--nodes", "#{nodes}", "--ntasks-per-node", "#{ppn}", "--partition", partition ] - torque_args = "#{nodes}:ppn=#{ppn}:#{node_type}" when "vis" slurm_args = ["--nodes", "#{nodes}", "--ntasks-per-node", "#{ppn}", "--gpus-per-node", "1", "--gres", "vis" ] - torque_args = "#{nodes}:ppn=#{ppn}:#{node_type}:gpus=1" else slurm_args = ["--nodes", "#{nodes}", "--ntasks-per-node", "#{ppn}" ] - torque_args = "#{nodes}:ppn=#{ppn}" end %> --- @@ -22,11 +18,6 @@ batch_connect: template: vnc script: native: - <%- if torque_cluster %> - resources: - nodes: "<%= torque_args %>" - <%- else %> <%- slurm_args.each do |arg| %> - "<%= arg %>" <%- end %> - <%- end %>