[Feature]-Device and output path validation

UQ-RCC · Apr 18, 2023 · 05076ef · 05076ef
1 parent b179d6e
commit 05076ef
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/src/api/DeconvolutionAPI.js b/src/api/DeconvolutionAPI.js
@@ -35,6 +35,18 @@ export default {
     return data
   },
 
+  async validate_devices(jobs,mem,gpus){
+    const { data } = await request.get(`${Vue.prototype.$Config.endpoints.wiener}/api/execute/validateDevices`, {
+      params: {
+        jobs: jobs,
+        mem: mem,
+        gpus: gpus
+      }
+  })
+  return data
+
+  },
+
   // execute
   async execute_microvolution(output, instances, mem, devices, executioninfo, jobs, is_test=false) {
     let _requestUrl = ""

diff --git a/src/views/Deconvolution.vue b/src/views/Deconvolution.vue
@@ -903,6 +903,7 @@
             },
             /****************************************************************************** */
 
+            
 
             /**
              * load decon
@@ -1050,7 +1051,7 @@
             },
 
             
-            nextStep(){
+            async nextStep(){
                 this.workingItem.step = parseInt(this.workingItem.step)
                 
                 if(this.workingItem.step === 1) {
@@ -1068,7 +1069,7 @@
                                     group: 'errornotif',
                                     type: 'error',
                                     title: 'Input Error',
-                                    text: "Input Error - Jobs with the same name/path must have unique Output paths/folders to avoid overwrite",
+                                    text: "Jobs with the same name/path must have unique Output paths/folders to avoid overwrite",
                                     closeOnClick: true
                                 })
                                 flag = true
@@ -1144,6 +1145,34 @@
                         }
                     } 
                 }
+                if(this.workingItem.step === 7) { /* validate devices in device tab */
+                    let msg 
+                    let jobs = this.workingItem.setting.instances
+                    let mem = this.workingItem.setting.mem
+                    let gpus = this.workingItem.setting.gpus
+                    let response = await DeconvolutionAPI.validate_devices(jobs,mem,gpus)
+                    let output = response.commandResult
+                    if (output.length > 0) {
+                        let json_output =  JSON.parse(output[0].out)
+                        if(!json_output.results.success){
+                            let limit_test =  json_output.results.limits_test.success
+                            let slurm_test = json_output.results.slurm_test.success
+                            if (!limit_test && !slurm_test || !limit_test && slurm_test){
+                                msg = json_output.results.limits_test.msg
+                            }
+                            else if (limit_test && !slurm_test) {
+                                msg = json_output.results.slurm_test.msg
+                            }
+                            Vue.notify({
+                                group: 'errornotif',
+                                type: 'error',
+                                title: 'Device Selection Error',
+                                text: msg.charAt(0).toUpperCase() + msg.slice(1)
+                            })
+                            return 
+                        }
+                    }
+                }
                 if(this.workingItem.step === 8)
                     return
                 //even if current step is invalid, next will allow it to go if it has been visited