From 29d61baab1fbc35b354503968b9f06932af9f9f1 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Sun, 9 Oct 2022 10:49:24 +0800 Subject: [PATCH] update modelsafety --- .../repo/cloudbrain/benchmark/index.tmpl | 56 +- templates/repo/modelsafety/new.tmpl | 101 ++- templates/repo/modelsafety/newgrampusgpu.tmpl | 1 + templates/repo/modelsafety/newgrampusnpu.tmpl | 1 + templates/repo/modelsafety/show.tmpl | 661 ++++++++++++++++++ .../components/images/selectGrampusImages.vue | 3 +- 6 files changed, 784 insertions(+), 39 deletions(-) create mode 100644 templates/repo/modelsafety/newgrampusgpu.tmpl create mode 100644 templates/repo/modelsafety/newgrampusnpu.tmpl create mode 100644 templates/repo/modelsafety/show.tmpl diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index 8a2fbd51b..69a8167ef 100755 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -102,9 +102,15 @@
+ {{if eq .JobType "MODELSAFETY"}} + + {{.DisplayJobName}} + + {{else}} {{.DisplayJobName}} + {{end}}
@@ -113,13 +119,19 @@
- {{.BenchmarkType}} + {{.BenchmarkType}}
+ {{if eq .JobType "MODELSAFETY"}} +
+ {{.BenchmarkTypeName}} +
+ {{else}}
- {{.BenchmarkTypeName}} + {{.BenchmarkTypeName}}
+ {{end}}
{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}} @@ -142,9 +154,36 @@
-
- -
+
+ {{if eq .JobType "MODELSAFETY"}} + + + {{$.CsrfTokenHtml}} + {{if .CanDel}} + + {{$.i18n.Tr "repo.stop"}} + + {{else}} + {{$.i18n.Tr "repo.stop"}} + {{end}} + + +
+ + {{$.CsrfTokenHtml}} + {{if .CanDel}} + + {{$.i18n.Tr "repo.delete"}} + + {{else}} + + {{$.i18n.Tr "repo.delete"}} + + {{end}} +
+ {{else}} + +
{{$.CsrfTokenHtml}} {{if .CanDel}} @@ -162,8 +201,8 @@ {{$.i18n.Tr "repo.score"}} {{end}} - - + + {{$.CsrfTokenHtml}} {{if .CanDel}} @@ -175,7 +214,8 @@ {{$.i18n.Tr "repo.delete"}} {{end}} -
+ + {{end}}
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index 31525b27c..db1cce846 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -46,7 +46,8 @@
{{template "repo/header" .}}
- + {{$Grampus := (or (eq (index (SubJumpablePath .Link) 1) "create_grampus_gpu") (eq (index (SubJumpablePath .Link) 1) "create_grampus_npu"))}} + {{template "base/alert" .}}

{{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}} @@ -69,10 +70,23 @@ href="{{.Link}}">模型安全评测

+
+ +
+ + + {{.i18n.Tr "cloudbrain.resource_cluster_openi"}} + + + + {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta) + +
+
-
- +
+ @@ -81,7 +95,7 @@ CPU/GPU - + @@ -145,41 +159,68 @@
- - {{if eq .datasetType 0}} -
- {{else}} -
- -
- -
-
- + {{range .engines}} + + {{end}} + +
+
+ +
+
+ {{end}} + {{else}} + {{if eq .datasetType 0}} +
+ {{else}} +
+ +
-
- {{end}} + {{end}} + {{end}}
@@ -311,7 +352,7 @@ }) ;(function() { - var SPECS = {{ .benchmark_specs }}; + var SPECS = {{ .benchmark_specs }} || {{ .Specs }}; var showPoint = {{ .CloudBrainPaySwitch }}; window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, { gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}}, diff --git a/templates/repo/modelsafety/newgrampusgpu.tmpl b/templates/repo/modelsafety/newgrampusgpu.tmpl new file mode 100644 index 000000000..d41c8f816 --- /dev/null +++ b/templates/repo/modelsafety/newgrampusgpu.tmpl @@ -0,0 +1 @@ +{{template "repo/modelsafety/new".}} diff --git a/templates/repo/modelsafety/newgrampusnpu.tmpl b/templates/repo/modelsafety/newgrampusnpu.tmpl new file mode 100644 index 000000000..d41c8f816 --- /dev/null +++ b/templates/repo/modelsafety/newgrampusnpu.tmpl @@ -0,0 +1 @@ +{{template "repo/modelsafety/new".}} diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl new file mode 100644 index 000000000..01af374a6 --- /dev/null +++ b/templates/repo/modelsafety/show.tmpl @@ -0,0 +1,661 @@ +{{template "base/head" .}} + +
+
+
+
+
+
+
+
+
+
+ {{template "repo/header" .}} +
+

+
+ + {{$.i18n.Tr "repo.cloudbrain"}} + +
/
+ + {{$.i18n.Tr "repo.modelarts.evaluate_job"}} + +
/
+
{{.displayJobName}}
+
+

+ {{range $k ,$v := .version_list_task}} +
+ +
+
+
+ + + +
+ + {{TimeSinceUnix1 .CreatedUnix}} + + + {{$.i18n.Tr "repo.modelarts.status"}}： + {{.Status}} + + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： + {{$.duration}} + +
+ + +
+
+
+
+
+
+ {{$.i18n.Tr "repo.modelarts.train_job.config"}} + + {{$.i18n.Tr "repo.modelarts.log"}} +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{$.i18n.Tr "repo.cloudbrain_task"}} + +
+ {{.DisplayJobName}} +
+
+ {{$.i18n.Tr "repo.modelarts.status"}} + +
+ {{.Status}} +
+
+ {{$.i18n.Tr "repo.modelarts.createtime"}} + +
+ + {{TimeSinceUnix1 .CreatedUnix}} + +
+
+ {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} + +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} + +
+ {{$.duration}} +
+
+ {{$.i18n.Tr "cloudbrain.mirror"}} + +
+ + {{.Image}} + +
+
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}} + + +
+ {{.BenchmarkType}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}} + + +
+ {{.BenchmarkTypeName}} +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}} + +
+ {{if eq .JobType "BENCHMARK"}} + train.py + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}} + +
+ {{if eq .JobType "BENCHMARK"}} + test.py + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.description"}} + +
+ {{if .Description}} + {{.Description}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "cloudbrain.gpu_type"}} + +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+
+ {{$.i18n.Tr "repo.model_manager"}} + +
+ {{.DatasetName}} +
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}} + +
+ {{if .User}} + {{.User.Name}} + {{else}} + -- + {{end}} +
+
+ {{if eq .BenchmarkTypeName "BRAINSCORE"}} + {{$.i18n.Tr "cloudbrain.brain_area"}} + {{else}} + {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}} + {{end}} + +
+ + {{if $.BenchmarkChildTypeName}} + {{$.BenchmarkChildTypeName}} + {{else}} + -- + {{end}} +
+
+
+
+
+ +
+
+
+ +
+ + + + + + + +
+
+
+
+ + + 

+                             

+ 
+                         

+                         
+ 
+                     

+
+                

+            

+        

+        {{end}} {{template "base/paginate" .}}
+    

+    
+    

+        

+            

+                 {{$.i18n.Tr "cloudbrain.delete_task"}}
+            

+
+            

+                
{{$.i18n.Tr "cloudbrain.task_delete_confirm"}}

+            

+            

+                

+                     {{$.i18n.Tr "cloudbrain.operate_cancel"}}
+                

+                

+                     {{$.i18n.Tr "cloudbrain.operate_confirm"}}
+                

+            

+        

+    

+
+
+

+{{template "base/footer" .}}
+
+
+
+
\ No newline at end of file
diff --git a/web_src/js/components/images/selectGrampusImages.vue b/web_src/js/components/images/selectGrampusImages.vue
index f7af01e9f..eced8cf88 100755
--- a/web_src/js/components/images/selectGrampusImages.vue
+++ b/web_src/js/components/images/selectGrampusImages.vue
@@ -242,7 +242,8 @@ export default {
     this.getImageListPublic();
     if (
       location.href.indexOf("benchmark") !== -1 ||
-      location.href.indexOf("train-job") !== -1
+      location.href.indexOf("train-job") !== -1 ||
+      location.href.indexOf("modelsafety") !== -1
     ) {
       this.benchmarkNew = true;
     }