allow ascend to use vis nodes and fix pitzer desktop gpus (#244)

OSC · Jul 31, 2023 · 7a2fd18 · 7a2fd18
1 parent 3fbea10
commit 7a2fd18
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/apps.awesim.org/apps/bc_desktop/ascend.yml.erb b/apps.awesim.org/apps/bc_desktop/ascend.yml.erb
@@ -73,7 +73,16 @@ attributes:
     widget: select
     label: "Node type"
     help: |
-      Need docs
+      - **any** - (*88 cores*) Chooses anyone of the available Ascend nodes.
+        This reduces the wait time as you have no requirements.
+      - **vis** - (*88 cores*) This node includes an NVIDIA Tesla A100 GPU with
+        an X server running in the background. This allows for Hardware
+        Rendering with the GPU typically needed for 3D visualization using
+        VirtualGL. There are currently only 10 of these nodes on Owens.
+      - **gpu** -  (*88 cores*) This node includes an NVIDIA Tesla A100 GPU
+        allowing for CUDA computations. There are currently only 96 of these
+        nodes on Ascend. These nodes don't start an X server, so visualization
+        with hardware rendering is not possible.
     options:
       - [ 
           "cpu", "any",
@@ -90,4 +99,11 @@ attributes:
           data-min-num-cores: 1,
           data-max-num-cores: 88,
         ]
+      - [
+          "vis", "vis",
+          data-min-gpus: 0,
+          data-max-gpus: 3,
+          data-min-num-cores: 1,
+          data-max-num-cores: 84,
+        ]
 submit: submit/slurm.yml.erb
diff --git a/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb b/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb
@@ -24,8 +24,6 @@
   def gpu_count
     if !gpus.nil? && !gpus.empty?
       gpus
-    elsif cluster == 'pitzer'
-      2
     else
       1
     end

diff --git a/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb b/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb
@@ -73,7 +73,16 @@ attributes:
     widget: select
     label: "Node type"
     help: |
-      Need docs
+      - **any** - (*88 cores*) Chooses anyone of the available Ascend nodes.
+        This reduces the wait time as you have no requirements.
+      - **vis** - (*88 cores*) This node includes an NVIDIA Tesla A100 GPU with
+        an X server running in the background. This allows for Hardware
+        Rendering with the GPU typically needed for 3D visualization using
+        VirtualGL. There are currently only 10 of these nodes on Owens.
+      - **gpu** -  (*88 cores*) This node includes an NVIDIA Tesla A100 GPU
+        allowing for CUDA computations. There are currently only 96 of these
+        nodes on Ascend. These nodes don't start an X server, so visualization
+        with hardware rendering is not possible.
     options:
       - [ 
           "cpu", "any",
@@ -90,4 +99,11 @@ attributes:
           data-min-num-cores: 1,
           data-max-num-cores: 88,
         ]
+      - [
+          "vis", "vis",
+          data-min-gpus: 0,
+          data-max-gpus: 3,
+          data-min-num-cores: 1,
+          data-max-num-cores: 84,
+        ]
 submit: submit/slurm.yml.erb
diff --git a/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb b/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb
@@ -24,8 +24,6 @@
   def gpu_count
     if !gpus.nil? && !gpus.empty?
       gpus
-    elsif cluster == 'pitzer'
-      2
     else
       1
     end