From 558419b8995559da084711ff3413f35314663560 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@hotmail.com>
Date: Thu, 14 Jan 2021 12:02:59 -0500
Subject: [PATCH] rm owens-slurm cluster and torque related configs
---
form.yml | 1 -
submit.yml.erb | 9 ---------
2 files changed, 10 deletions(-)
diff --git a/form.yml b/form.yml
index b3d3aad..6504316 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 4adeaa3..475347e 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 %>
--
GitLab