diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go index 179cb8cc4..4d227fc9d 100644 --- a/routers/repo/aisafety.go +++ b/routers/repo/aisafety.go @@ -352,6 +352,7 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) { t := time.Now() ctx.Data["PageIsCloudBrain"] = true ctx.Data["IsCreate"] = true + ctx.Data["datasetType"] = models.TypeCloudBrainOne ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName @@ -370,8 +371,12 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) { t := time.Now() ctx.Data["PageIsCloudBrain"] = true ctx.Data["IsCreate"] = true +<<<<<<< HEAD var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:] ctx.Data["display_job_name"] = displayJobName +======= + ctx.Data["datasetType"] = models.TypeCloudBrainTwo +>>>>>>> 6cd7f96040b300f1a10b1423312fee373511bc07 ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 1f6732174..b1020c082 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -51,8 +51,8 @@ const ( tplCloudBrainBenchmarkNew base.TplName = "repo/cloudbrain/benchmark/new" tplCloudBrainBenchmarkShow base.TplName = "repo/cloudbrain/benchmark/show" - tplCloudBrainModelSafetyNewGpu base.TplName = "repo/cloudbrain/modelsafety/newgpu" - tplCloudBrainModelSafetyNewNpu base.TplName = "repo/cloudbrain/modelsafety/newnpu" + tplCloudBrainModelSafetyNewGpu base.TplName = "repo/modelsafety/newgpu" + tplCloudBrainModelSafetyNewNpu base.TplName = "repo/modelsafety/newnpu" tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit" tplCloudBrainImageEdit base.TplName = "repo/cloudbrain/image/edit" diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl index 863edd2d0..13665c036 100755 --- a/templates/repo/cloudbrain/benchmark/new.tmpl +++ b/templates/repo/cloudbrain/benchmark/new.tmpl @@ -51,7 +51,7 @@ {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} 模型安全评测 + href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测
@@ -168,7 +168,7 @@ {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} 模型安全评测 + href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测
@@ -298,7 +298,7 @@ {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} 模型安全评测 + href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测 diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl new file mode 100644 index 000000000..3b6f7ff48 --- /dev/null +++ b/templates/repo/modelsafety/indicators_descr.tmpl @@ -0,0 +1,62 @@ + + + + + diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl new file mode 100644 index 000000000..1b6cccf46 --- /dev/null +++ b/templates/repo/modelsafety/new.tmpl @@ -0,0 +1,322 @@ +{{template "base/head" .}} + +{{template "custom/global_mask" .}} +
+ {{template "repo/header" .}} +
+ + {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}} +

+
+ +
+ {{.CsrfTokenHtml}} + + + +
+ +
+ {{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}} + {{.i18n.Tr "repo.cloudbrain.benchmark.model"}} + 模型安全评测 +
+
+
+ +
+ + + + + + CPU/GPU + + + + + + + Ascend NPU +
+
+
+
+ + {{template "custom/task_wait_count" .}} +
+
+ + + {{.i18n.Tr "repo.cloudbrain_jobname_err"}} +
+
+ + +
+ +
+
+ + +
+
+ +
+
+ +
+ + + +
+
+
+ + + + + + {{.i18n.Tr "cloudbrain.view_sample"}} +
+
+ + +
+
+ + +
+
+ + + + {{template "repo/modelsafety/indicators_descr".}} +
+
+ + + {{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} + + +
+
+
+ + + {{if .CloudBrainPaySwitch}} +
+ {{$.i18n.Tr "points.balance_of_points"}}{{.PointAccount.Balance}}{{$.i18n.Tr "points.points"}}{{$.i18n.Tr "points.expected_time"}}{{$.i18n.Tr "points.hours"}} + + + {{$.i18n.Tr "points.points_acquisition_instructions"}} + +
+ {{end}} +
+
+ + + {{.i18n.Tr "repo.cloudbrain.cancel"}} +
+
+
+
+
+
+{{template "base/footer" .}} + + + + diff --git a/templates/repo/modelsafety/newgpu.tmpl b/templates/repo/modelsafety/newgpu.tmpl new file mode 100644 index 000000000..d41c8f816 --- /dev/null +++ b/templates/repo/modelsafety/newgpu.tmpl @@ -0,0 +1 @@ +{{template "repo/modelsafety/new".}} diff --git a/templates/repo/modelsafety/newnpu.tmpl b/templates/repo/modelsafety/newnpu.tmpl new file mode 100644 index 000000000..d41c8f816 --- /dev/null +++ b/templates/repo/modelsafety/newnpu.tmpl @@ -0,0 +1 @@ +{{template "repo/modelsafety/new".}} diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 77d54033f..057298d13 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -1011,7 +1011,8 @@ export default { if ( location.href.indexOf("benchmark") !== -1 || location.href.indexOf("train-job") !== -1 || - location.href.indexOf("inference") !== -1 + location.href.indexOf("inference") !== -1 || + location.href.indexOf("modelsafety") !== -1 ) { this.benchmarkNew = true; } diff --git a/web_src/js/components/images/selectImages.vue b/web_src/js/components/images/selectImages.vue index add4553d0..506574655 100755 --- a/web_src/js/components/images/selectImages.vue +++ b/web_src/js/components/images/selectImages.vue @@ -505,7 +505,8 @@ export default { if ( location.href.indexOf("train-job") !== -1 || location.href.indexOf("inference-job") !== -1 || - location.href.indexOf("benchmark") !== -1 + location.href.indexOf("benchmark") !== -1 || + location.href.indexOf("modelsafety") !== -1 ) { this.benchmarkNew = true; }