support for next gen ascend (#35)

Author: johrstrom

form.yml

@@ -3,6 +3,7 @@ cluster:
   - "owens"
   - "pitzer"
   - "cardinal"
+  - "ascend-nextgen"
 form:
   - auto_accounts
   - jupyterlab_switch
@@ -43,12 +44,14 @@ attributes:
           data-max-num-workers-for-cluster-owens: 28,
           data-max-num-workers-for-cluster-pitzer: 48,
           data-max-num-workers-for-cluster-cardinal: 48,
+          data-max-num-workers-for-cluster-ascend-nextgen: 118,
         ]
       - [ 
           "hugemem", "hugemem",
           data-max-num-workers-for-cluster-owens: 48,
           data-max-num-workers-for-cluster-pitzer: 80,
           data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend-nextgen: false,
         ]
   spark_configuration_file:
     help: Override defaults with a new configuration file. Leave blank to use defaults.
@@ -77,19 +80,23 @@ attributes:
       - [
           "3.4.1", "3.4.1",
           data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend-nextgen: false,
         ]
       - [
         "3.0.1", "3.0.1",
         data-option-for-cluster-cardinal: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]
       - [
         "2.4.5", "2.4.5",
         data-option-for-cluster-owens: false,
         data-option-for-cluster-cardinal: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]
       - [
         "2.3.0", "2.3.0",
-        data-option-for-cluster-pitzer: false
+        data-option-for-cluster-pitzer: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]
   version:
     widget: "select"
@@ -101,12 +108,15 @@ attributes:
       - [
         "3.0", "app_jupyter/3.0.17",
         data-option-for-cluster-cardinal: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]
       - [
         "2.2", "app_jupyter/2.2.10",
         data-option-for-cluster-cardinal: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]
       - [
         "1.2", "app_jupyter/1.2.21",
         data-option-for-cluster-cardinal: false,
+        data-option-for-cluster-ascend-nextgen: false,
         ]

submit.yml.erb

@@ -2,13 +2,13 @@
 
   cores_lookup = {
                   "hugemem" => {"pitzer" => "80", "owens" => "48"},
-                  "any" => {"pitzer" => "40", "owens" => "28", "cardinal" => "48"}
+                  "any" => {"pitzer" => "40", "owens" => "28", "cardinal" => "48", "ascend-nextgen" => '118' }
                 }
 
   base_slurm_args = if bc_num_slots.blank?
-                      ["--nodes", "1", "--exclusive", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
+                      ["--nodes", "1", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
                     else
-                      ["--nodes", "#{bc_num_slots}", "--exclusive", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
+                      ["--nodes", "#{bc_num_slots}", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
                     end
 
   slurm_args =  case node_type

template/before.sh.erb

@@ -139,7 +139,7 @@ module purge
 runtime_env() {
   module purge
   module load xalt/latest
-  <%- if context.cluster != 'cardinal' -%>
+  <%- unless ['cardinal', 'ascend-nextgen'].include?(context.cluster) -%>
   module load python/3.6-conda5.2 spark/<%= context.spark_version %>
   <%- else -%>
   module load python/3.12 spark/<%= context.spark_version %>

template/script.sh.erb

@@ -42,7 +42,7 @@ cd "${NOTEBOOK_ROOT}"
 echo "TTT - $(date)"
 
 # Setup Jupyter Notebook environment
-<%- if context.cluster == 'cardinal' -%>
+<%- if ['cardinal', 'ascend-nextgen'].include?(context.cluster) -%>
 module load project/ondemand xalt/latest <%= context.version %>
 <%- else -%>
 module load ondemand/project xalt/latest <%= context.version %>