From 2d0fb9ced37266e25b3a4a747f9974994bf01796 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Sun, 9 Oct 2022 17:52:48 +0800 Subject: [PATCH] update --- templates/repo/modelsafety/new.tmpl | 10 + templates/repo/modelsafety/show.tmpl | 366 ++++++++++++++------------- web_src/js/features/cloudrbanin.js | 4 +- 3 files changed, 198 insertions(+), 182 deletions(-) diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index d15aa377a..9653034bb 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -58,6 +58,8 @@ {{.CsrfTokenHtml}} + +
@@ -158,6 +160,14 @@
+ {{if not $Grampus}} {{if eq .datasetType 0}}
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl index 01af374a6..50661c387 100644 --- a/templates/repo/modelsafety/show.tmpl +++ b/templates/repo/modelsafety/show.tmpl @@ -69,7 +69,7 @@ } .tab_2_content { - min-height: 425px; + min-height: 600px; margin-left: 10px; } @@ -217,14 +217,12 @@ {{$.i18n.Tr "repo.modelarts.evaluate_job"}}
/
-
{{.displayJobName}}
+
- {{range $k ,$v := .version_list_task}} -
- -
+
+ +
@@ -232,35 +230,30 @@
- {{TimeSinceUnix1 .CreatedUnix}} + - {{$.i18n.Tr "repo.modelarts.status"}}： - {{.Status}} + + + + - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： - {{$.duration}} - + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}： +
-
+
- {{$.i18n.Tr "repo.modelarts.train_job.config"}} - - {{$.i18n.Tr "repo.modelarts.log"}} + {{$.i18n.Tr "repo.modelarts.train_job.config"}} + {{$.i18n.Tr "repo.modelarts.log"}} + 评测结果
-
+
@@ -272,79 +265,49 @@ {{$.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}} -
+
@@ -353,107 +316,85 @@ -
+
- {{.Image}} - +
- {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}} - + {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}} - -
- {{.BenchmarkType}} -
+
- {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}} - + {{$.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"}} + {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} -
- {{if .Description}} - {{.Description}} - {{else}} - -- - {{end}} -
+
+
+
+
+ + + + + + + + + - @@ -462,59 +403,60 @@ - - - + + + + + + + + + + + +
+ {{$.i18n.Tr "repo.modelarts.code_version"}} + +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.description"}} + +
{{$.i18n.Tr "cloudbrain.gpu_type"}}
{{$.i18n.Tr "repo.modelarts.train_job.standard"}}
- {{$.i18n.Tr "repo.model_manager"}} + {{$.i18n.Tr "repo.modelarts.model_name"}} -
- {{.DatasetName}} -
+
- {{$.i18n.Tr "repo.cloudbrain_creator"}} + {{$.i18n.Tr "repo.modelconvert.modelversion"}} -
- {{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}} + {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}} -
- - {{if $.BenchmarkChildTypeName}} - {{$.BenchmarkChildTypeName}} - {{else}} - -- - {{end}} -
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}} + +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} + +
+
+ 评测指标 + +
--
+
@@ -523,49 +465,92 @@
-
+
-
+ + {{$.i18n.Tr "repo.modelarts.download_log"}} + +
+
+ class="log_top" data-version=""> - + - - - -
+
+
+
+
+
+
+
+
ACC-fgsm_cifar10_1000
+
Accuracy: 精确度，计算模型预测精准率，该指标越高，说明评测结果越好。
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ACCparams1params2params3params4params5params6params7
非定向100100100100100100100
定向100100100100100100100
+
+
+
+
+
- {{end}} {{template "base/paginate" .}} + {{template "base/paginate" .}}
@@ -587,11 +572,11 @@
- -
{{template "base/footer" .}} + + \ No newline at end of file diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 2df780233..698523d11 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -8,6 +8,7 @@ export default async function initCloudrain() { function loadJobStatus() { $(".job-status").each((index, job) => { const ID = job.dataset.jobid; + if (!ID) return; const repoPath = job.dataset.repopath; // const computeResource = job.dataset.resource const versionname = job.dataset.version; @@ -144,6 +145,7 @@ export default async function initCloudrain() { function loadShowJobStatus() { $(".ui.accordion.border-according").each((index, job) => { const jobID = job.dataset.jobid; + if (!jobID) return; const repoPath = job.dataset.repopath; const versionname = job.dataset.version; // ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'] @@ -152,7 +154,7 @@ export default async function initCloudrain() { // || job.textContent.trim() == 'CANCELED' || job.textContent.trim() == 'LOST') { // return // } - let status = $(`#${versionname}-status-span`).text(); + let status = $(`#${versionname}-status-span`).text().trim(); if ( [