diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 4c500b5e6..97d968954 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -110,13 +110,6 @@ {{.DisplayJobName}} - {{else if eq .JobType "MODELSAFETY"}} - - {{.DisplayJobName}} - {{else if eq .JobType "INFERENCE"}} {{.DisplayJobName}} - {{else if eq .JobType "BENCHMARK"}} + {{else if eq .JobType "BENCHMARK" "MODELSAFETY"}} @@ -148,7 +141,7 @@
-
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index b8d403638..b9664458e 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -340,47 +340,76 @@ .form({ on: 'blur', fields: { - model_name:{ - identifier : 'model_name', + boot_file: { + identifier: "boot_file", rules: [ - { - type: 'empty', - } - ] + { + type: "regExp[/.+.py$/g]", + }, + ], }, - train_url:{ - identifier : 'train_url', + job_name: { + identifier: "job_name", rules: [ - { - type: 'empty', - } - ] + { + type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]", + }, + ], }, - ckpt_name:{ - identifier : 'ckpt_name', + display_job_name: { + identifier: "display_job_name", rules: [ - { - type: 'empty', - } - ] + { + type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]", + }, + ], + }, + attachment: { + identifier: "attachment", + rules: [ + { + type: "empty", + }, + ], + }, + spec_id: { + identifier: "spec_id", + rules: [{ type: "empty" }], + }, + evaluation_index:{ + identifier: 'evaluation_index', + rules: [{ type: 'empty', } ] + }, + model_name:{ + identifier: 'model_name', + rules: [{ type: 'empty', } ] + }, + train_url:{ + identifier: 'train_url', + rules: [{ type: 'empty', }] + }, + ckpt_name:{ + identifier: 'ckpt_name', + rules: [{ type: 'empty', }] }, }, onSuccess: function () { - // $('.ui.page.dimmer').dimmer('show') document.getElementById("mask").style.display = "block"; isValidate = true; }, onFailure: function (e) { + document.getElementById("mask").style.display = "none"; isValidate = false; + createFlag = false; return false; } }) } - // validate() + validate(); $('.ui.create_train_job.green.button').click(function (e) { - validate() - }) + validate(); + }); ;(function() { var SPECS = {{ .benchmark_specs }} || {{ .Specs }}; diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl index a51b8a7f5..de05cf5ea 100644 --- a/templates/repo/modelsafety/show.tmpl +++ b/templates/repo/modelsafety/show.tmpl @@ -220,7 +220,7 @@
-
+
@@ -752,7 +752,6 @@ } ]; } - console.log(option); chartHandle.setOption(option); window.addEventListener('resize', chartHandle.resize); } @@ -804,7 +803,7 @@ var resultData; function initData() { $.ajax({ - url: window.location.href.replace('/show', ''), + url: window.location.href.replace('cloudbrain/benchmark', 'modelsafety'), type: "get", data: {}, contentType: "application/json; charset=utf-8", diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index d91c783fc..5b7ab6aca 100755 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -85,20 +85,13 @@ {{.DisplayJobName}} - {{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}} + {{else if (eq .JobType "SNN4IMAGENET" "BRAINSCORE")}} {{.DisplayJobName}} - {{else if eq .JobType "MODELSAFETY"}} - - {{.DisplayJobName}} - {{else if eq .JobType "INFERENCE"}} {{.DisplayJobName}} - {{else if eq .JobType "BENCHMARK"}} + {{else if eq .JobType "BENCHMARK" "MODELSAFETY"}} @@ -130,7 +123,7 @@