diff --git a/form.js b/form.js deleted file mode 100644 index 65d8c466299d0de068de75f22e96df9a31baeb47..0000000000000000000000000000000000000000 --- a/form.js +++ /dev/null @@ -1,61 +0,0 @@ -'use strict' - -/** - * Fix num cores, allowing blanks to remain - */ -function fix_num_cores() { - let node_type_input = $('#batch_connect_session_context_node_type'); - let node_type = node_type_input.val(); - let num_cores_input = $('#num_cores'); - - if(num_cores_input.val() === '') { - return; - } - - if(node_type === 'hugemem') { - set_ppn_owens_hugemem(num_cores_input); - } else { - set_ppn_owens_regular(num_cores_input); - } -} - -/** - * Sets the PPN limits available for Owens hugemem nodes. - * - * hugemem reservations are always assigned the full node - * - * @param {element} num_cores_input The input for num_cores - */ -function set_ppn_owens_hugemem(num_cores_input) { - const NUM_CORES = 48; - num_cores_input.attr('max', NUM_CORES); - num_cores_input.attr('min', NUM_CORES); - num_cores_input.val(NUM_CORES); -} - -/** - * Sets the PPN limits available for non hugemem Owens nodes. - * - * @param {element} num_cores_input The input for num_cores - */ -function set_ppn_owens_regular(num_cores_input) { - const NUM_CORES = 28; - num_cores_input.attr('max', NUM_CORES); - num_cores_input.attr('min', 1); - num_cores_input.val(Math.min(NUM_CORES, num_cores_input.val())); -} - - -/** - * Change the maximum number of cores selected. - */ -function set_node_type_change_handler() { - let node_type_input = $('#batch_connect_session_context_node_type'); - node_type_input.change(node_type_input, fix_num_cores); -} - -$(document).ready(function() { - // Set the max value to be what was set in the last session - fix_num_cores(); - set_node_type_change_handler(); -}); \ No newline at end of file diff --git a/form.yml b/form.yml index 92fcda1c3fc72037a09598149742933b2b8ef2bd..a7ba01f10c295334bcc81f336a7224b4404dd5ae 100644 --- a/form.yml +++ b/form.yml @@ -1,5 +1,5 @@ --- -cluster: "{{ cluster_name }}" +cluster: "SLURM_CLUSTER" attributes: bc_num_hours: value: 1 @@ -23,14 +23,26 @@ attributes: widget: select label: Partition options: - - [ "low", "low" ] + - [ "express", "express" ] + - [ "short", "short" ] + - [ "medium", "medium" ] + - [ "long", "long" ] + - [ "interactive", "interactive" ] + - [ "pascalnodes", "pascalnodes" ] + - [ "pascalnodes-medium", "pascalnodes-medium" ] + - [ "largemem", "largemem" ] + - [ "largemem-long", "largemem-long" ] + - [ "amd-hdr100", "amd-hdr100" ] version: widget: select label: "ANSYS version" help: "This defines the version of ANSYS you want to load." options: - - [ "19.1", "ANSYS/19.1" ] + - [ "2021R1", "ANSYS/2021R1" ] + - [ "2020R2", "ANSYS/2020R2" ] + - [ "2020R1", "ANSYS/2020R1" ] + form: - version - bc_num_hours diff --git a/submit.yml.erb b/submit.yml.erb index 8b17d3275aa66509b440f2f251a6350edc70dd96..db4d0e9381763a6ffbd9b08b2bf42bf0c3b4c1e1 100644 --- a/submit.yml.erb +++ b/submit.yml.erb @@ -1,6 +1,6 @@ --- batch_connect: - template: vnc + template: "vnc" script: native: - "-N 1" @@ -8,4 +8,7 @@ script: - "--mem-per-cpu=<%= bc_num_mems.blank? ? 4 : bc_num_mems.to_i %>G" - "--partition=<%= bc_partition %>" - "--time=<%= bc_num_hours.blank? ? 1 : bc_num_hours.to_i %>:00:00" - + - "--job-name=ood-{{ ansys_module_name|lower }}" +<%- if bc_partition.include? "pascalnodes" -%> + - "--gres=gpu:1" +<%- end -%>