Merge pull request #112 from OSC/add-cardinal-cluster

Adds cardinal cluster
OSC · Apr 30, 2024 · 6265f39 · 6265f39
2 parents 6104427 + 0ead7d6
commit 6265f39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/form.yml.erb b/form.yml.erb
@@ -11,14 +11,15 @@ cluster:
   - "kubernetes"
   - "kubernetes-test"
   - "kubernetes-dev"
+  - "cardinal"
 form:
   - account
   - mode
   - bc_num_hours
   - node_type
   - cuda_version
   - num_cores
-  - version
+  - auto_modules_app_jupyter
   - bc_email_on_started
   - classroom
 attributes:
@@ -305,28 +306,4 @@ attributes:
           data-option-for-cluster-pitzer: false,
           data-option-for-cluster-ascend: false,
         ]
-  version:
-    widget: "select"
-    label: "JupyterLab Version"
-    options:
-      - [ 
-          "3.1",  "app_jupyter/3.1.18",
-          data-option-for-cluster-owens: false, 
-        ]
-      - [ 
-          "3.0",  "app_jupyter/3.0.17", 
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "2.3",  "app_jupyter/2.3.2", 
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "2.2",  "app_jupyter/2.2.10",
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "1.2",  "app_jupyter/1.2.21", 
-          data-option-for-cluster-ascend: false,
-        ]
-  classroom: 0
+  classroom: 0
diff --git a/submit.yml.erb b/submit.yml.erb
@@ -33,7 +33,7 @@
               end
 
 -%>
-<% if cluster =~ /owens|pitzer|ascend/ -%>
+<% if cluster =~ /owens|pitzer|ascend|cardinal/ -%>
 ---
 batch_connect:
   template: "basic"

diff --git a/template/script.sh.erb b/template/script.sh.erb
@@ -23,7 +23,7 @@ module load <%= context.cuda_version %>
 cd "${NOTEBOOK_ROOT}"
 
 # Setup Jupyter environment
-module load project/ondemand <%= context.version %>
+module load project/ondemand <%= context.auto_modules_app_jupyter %>
 
 module list
 export JUPYTER_PATH="${PWD}/share/jupyter:${OSC_JUPYTER_PATH}"