From 4bf6c277c2ad3a73cfb4a47072e3a1d71c9db2c7 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 31 Jul 2023 16:33:22 -0400
Subject: [PATCH] Fix gpu (#245)

* vis needs at least 1 gpu

* ascend can use MATE installed on the host
---
 apps.awesim.org/apps/bc_desktop/ascend.yml.erb       |  6 +++---
 apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb | 12 ------------
 ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb      |  6 +++---
 .../apps/bc_desktop/submit/slurm.yml.erb             | 12 ------------
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/apps.awesim.org/apps/bc_desktop/ascend.yml.erb b/apps.awesim.org/apps/bc_desktop/ascend.yml.erb
index 7ad68c8..ce2cbd1 100644
--- a/apps.awesim.org/apps/bc_desktop/ascend.yml.erb
+++ b/apps.awesim.org/apps/bc_desktop/ascend.yml.erb
@@ -101,9 +101,9 @@ attributes:
         ]
       - [
           "vis", "vis",
-          data-min-gpus: 0,
-          data-max-gpus: 3,
+          data-min-gpus: 1,
+          data-max-gpus: 4,
           data-min-num-cores: 1,
-          data-max-num-cores: 84,
+          data-max-num-cores: 88,
         ]
 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
index 86d344c..d9c9a7e 100644
--- a/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb
+++ b/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb
@@ -75,18 +75,6 @@ batch_connect:
 
     # reset SLURM_EXPORT_ENV so that things like srun & sbatch work out of the box
     export SLURM_EXPORT_ENV=ALL
-  <%- if cluster == 'ascend' && desktop == 'mate' -%>
-  script_wrapper: |
-    cat << "CTRSCRIPT" > container.sh
-    module load turbovnc/2.2.7 novnc/1.3.0
-    %s  
-    CTRSCRIPT
-
-    # your bindpath will differ
-    export APPTAINER_BINDPATH="/run,/apps,/tmp"
-
-    apptainer run --nv <%= image %> /bin/bash container.sh
-  <%- end -%>
 script:
   accounting_id: "<%= account %>"
   native:
diff --git a/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb b/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb
index 7ad68c8..ce2cbd1 100644
--- a/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb
+++ b/ondemand.osc.edu/apps/bc_desktop/ascend.yml.erb
@@ -101,9 +101,9 @@ attributes:
         ]
       - [
           "vis", "vis",
-          data-min-gpus: 0,
-          data-max-gpus: 3,
+          data-min-gpus: 1,
+          data-max-gpus: 4,
           data-min-num-cores: 1,
-          data-max-num-cores: 84,
+          data-max-num-cores: 88,
         ]
 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
index 86d344c..d9c9a7e 100644
--- a/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb
+++ b/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb
@@ -75,18 +75,6 @@ batch_connect:
 
     # reset SLURM_EXPORT_ENV so that things like srun & sbatch work out of the box
     export SLURM_EXPORT_ENV=ALL
-  <%- if cluster == 'ascend' && desktop == 'mate' -%>
-  script_wrapper: |
-    cat << "CTRSCRIPT" > container.sh
-    module load turbovnc/2.2.7 novnc/1.3.0
-    %s  
-    CTRSCRIPT
-
-    # your bindpath will differ
-    export APPTAINER_BINDPATH="/run,/apps,/tmp"
-
-    apptainer run --nv <%= image %> /bin/bash container.sh
-  <%- end -%>
 script:
   accounting_id: "<%= account %>"
   native: