CHANGELOG.md

@@ -92,7 +92,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: 
+[Unreleased]:
 https://github.com/OSC/bc_osc_matlab/compare/v0.11.0...HEAD
 [0.11.0]: https://github.com/OSC/bc_osc_matlab/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/OSC/bc_osc_matlab/compare/v0.9.0...v0.10.0

form.js

+const table = {
+  "interactive": { "max_cpu": 48, "max_hour": 2, "max_gpu": 0 },
+  "express": { "max_cpu": 48, "max_hour": 2, "max_gpu": 0 },
+  "short": { "max_cpu": 48, "max_hour": 12, "max_gpu": 0 },
+  "pascalnodes": { "max_cpu": 28, "max_hour": 12, "max_gpu": 4 },
+  "pascalnodes-medium": { "max_cpu": 28, "max_hour": 48, "max_gpu": 4 },
+  "medium": { "max_cpu": 48, "max_hour": 50, "max_gpu": 0 },
+  "long": { "max_cpu": 48, "max_hour": 150, "max_gpu": 0 },
+  "intel-dcb": { "max_cpu": 24, "max_hour": 150, "max_gpu": 0 },
+  "amd-hdr100": { "max_cpu": 128, "max_hour": 150, "max_gpu": 0 },
+  "largemem": { "max_cpu": 24, "max_hour": 50, "max_gpu": 0 },
+  "largemem-long": { "max_cpu": 24, "max_hour": 150, "max_gpu": 0 },
+  "amperenodes": { "max_cpu": 128, "max_hour": 12, "max_gpu": 2 },
+  "amperenodes-medium": { "max_cpu": 128, "max_hour": 48, "max_gpu": 2 },
+}
+
+const gpu_part_regex = /pascal|ampere/;
+
+function set_max_value(form_id, value) {
+  const form_element = $(form_id);
+  form_element.attr({'max': value});
+  if (form_element.val() > value)
+    form_element.val(value)
+}
+
+function set_partition_change_handler() {
+  let partition_select = $("#batch_connect_session_context_bc_partition");
+  partition_select.change( function(e) {
+    toggle_gpu_visibility(e);
+  });
+}
+
+function toggle_gpu_visibility(event) {
+  const partition = event.target.value;
+  const cpu_selector = '#batch_connect_session_context_bc_num_slots';
+  const gpu_selector = '#batch_connect_session_context_bc_num_gpus';
+  const hour_selector = '#batch_connect_session_context_bc_num_hours';
+
+  toggle_visibilty_of_form_group(gpu_selector, gpu_part_regex.test(partition));
+  set_max_value(cpu_selector, table[partition]["max_cpu"]);
+  set_max_value(gpu_selector, table[partition]["max_gpu"]);
+  set_max_value(hour_selector, table[partition]["max_hour"]);
+}
+
+function toggle_visibilty_of_form_group(form_id, show) {
+  let form_element = $(form_id);
+  let parent = form_element;
+
+  while (
+    (! parent[0].classList.contains('form-group')) &&
+    (! parent.is('html')) // ensure that we don't loop infinitely
+  ) {
+    parent = parent.parent();
+  }
+
+  // If parent is HTML then something has gone wrong and visibility should not be changed
+  if ( parent.is('html') ) {
+    return;
+  }
+
+  if(show) {
+    parent.show();
+  } else {
+    parent.hide();
+  }
+}
+
+toggle_gpu_visibility(
+  // Fake the event
+  { target: document.querySelector('#batch_connect_session_context_bc_partition') }
+);
+set_partition_change_handler();

form.yml.erb

+<%-
+  partitions = OodAppkit.clusters[:SLURM_CLUSTER].custom_config[:partitions]
+-%>
 ---
-cluster: "SLURM_CLUSTER" 
+cluster: "SLURM_CLUSTER"
 attributes:
   custom_environment:
     widget: text_area
@@ -16,6 +19,7 @@ attributes:
     value: 1
 
   bc_num_slots:
+    widget: "number_field"
     label: Number of CPU
     value: 1
     min: 1
@@ -30,26 +34,28 @@ attributes:
     max: 128
     step: 1
 
+  bc_num_gpus:
+    widget: "number_field"
+    label: Number of GPUs
+    value: 1
+    min: 0
+    max: 4
+    step: 1
+
   bc_partition:
     widget: select
     label: Partition
     options:
-      - [ "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" ]
+    <%- partitions.each do |p| -%>
+      - [ "<%= p %>", "<%= p %>" ]
+    <%- end -%>
 
   version:
     widget: select
     label: "MATLAB version"
     help: "This defines the version of MATLAB you want to load."
     options:
+      - [ "R2023a", "rc/matlab/R2023a"]
       - [ "R2022a", "rc/matlab/R2022a"]
       - [ "R2021b", "rc/matlab/R2021b"]
       - [ "R2021a", "rc/matlab/R2021a"]
@@ -72,6 +78,7 @@ form:
   - version
   - bc_num_hours
   - bc_partition
+  - bc_num_gpus
   - bc_num_slots
   - bc_num_mems
   - bc_email_on_started

submit.yml.erb

+<%-
+  email = ENV['USER']
+  if !email.include? '@'
+    email = email + '@uab.edu'
+  end
+-%>
 ---
 batch_connect:
   template: "vnc"
 script:
+  job_environment:
+    USER: "<%= ENV['USER'] %>"
   native:
     - "-N 1"
     - "-n <%= bc_num_slots.blank? ? 1 : bc_num_slots.to_i %>"
@@ -9,6 +17,10 @@ script:
     - "--partition=<%= bc_partition %>"
     - "--time=<%= bc_num_hours.blank? ? 1 : bc_num_hours.to_i %>:00:00"
     - "--job-name=ood-matlab-<%= version.split("/")[-1] %>"
-<%- if bc_partition.include? "pascalnodes" -%>
-    - "--gres=gpu:1"
+<%- if bc_partition.include? "pascalnodes" or bc_partition.include? "amperenodes" -%>
+    - "--gres=gpu:<%= bc_num_gpus.blank? ? 1 : bc_num_gpus.to_i %>"
+<%- end -%>
+<%- if bc_email_on_started == "1" -%>
+    - "--mail-type=BEGIN"
+    - "--mail-user=<%= email %>"
 <%- end -%>

template/script.sh.erb

@@ -31,7 +31,7 @@ module load <%= context.cuda_toolkit %>
 # Load the required environment
 module load <%= context.version %>
 
-<%= context.custom_environment %>
+<%= context.custom_environment.gsub(/\r\n?/, "\n") %>
 # Launch MATLAB
 module list
 set -x