From 5f8b99586e336f8c4e3ef8b4496609cd0e40f41a Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 7 Jul 2022 11:54:41 +0800 Subject: [PATCH] fix isssue --- options/locale/locale_en-US.ini | 3 +- options/locale/locale_zh-CN.ini | 4 +- templates/custom/select_dataset_train.tmpl | 2 +- templates/repo/cloudbrain/inference/new.tmpl | 479 ++++++++++++++++++ templates/repo/cloudbrain/new.tmpl | 5 + templates/repo/cloudbrain/trainjob/new.tmpl | 1 + .../repo/modelarts/inferencejob/new.tmpl | 110 ++-- templates/repo/modelarts/notebook/new.tmpl | 1 + templates/repo/modelarts/trainjob/new.tmpl | 2 + web_src/js/components/images/selectImages.vue | 1 + web_src/less/openi.less | 14 + 11 files changed, 577 insertions(+), 45 deletions(-) create mode 100644 templates/repo/cloudbrain/inference/new.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 39a892cc7..92c4f5728 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -997,7 +997,8 @@ image_delete_fail=Failed to delete image, please try again later. image_overwrite=You had submitted the same name image before, are you sure to overwrite the original image? download=Download score=Score - +wait_count_start = There are currently +wait_count_end = tasks queued images.name = Image Tag images.name_placerholder = Please enter the image name image.label_tooltips = Example Python 3.7, Tensorflow 2.0, cuda 10, pytorch 1.6 diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b9acb6ec0..e90a09b68 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -997,8 +997,8 @@ image_delete_fail=删除镜像失败，请稍后再试。 image_overwrite=您已经提交过相同名称的镜像，您确定要覆盖原来提交的镜像吗？ download=模型下载 score=评分 - - +wait_count_start = 当前有 +wait_count_end = 个任务正在排队 images.name = 镜像Tag images.name_placerholder = 请输入镜像Tag image.label_tooltips = 如Python 3.7, Tensorflow 2.0, cuda 10, pytorch 1.6 diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl index a6ad0d873..4dc500052 100755 --- a/templates/custom/select_dataset_train.tmpl +++ b/templates/custom/select_dataset_train.tmpl @@ -1,7 +1,7 @@
- {{if or (.benchmarkMode) (.newInference)}} + {{if .benchmarkMode}}       {{else}}{{.i18n.Tr "dataset.dataset"}}    {{end}} {{else}} diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl new file mode 100644 index 000000000..6dee1b38e --- /dev/null +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -0,0 +1,479 @@ +{{template "base/head" .}} + +
+
+
+
+
+
+
+
+
+
+ {{template "repo/header" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.modelarts.train_job.new_infer"}} +

+
+ +
+ {{.CsrfTokenHtml}} + + + + {{if $.model_version}} + + {{else}} + + {{end}} + {{if $.label_names}} + + {{else}} + + {{end}} +

{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:

+
+ +
+ + + + + + CPU/GPU + + + + + + + Ascend NPU +
+
+
+ + + {{.i18n.Tr "cloudbrain.job_name_rule"}} +
+ +
+ + +
+
+ + +

{{.i18n.Tr "repo.modelarts.train_job.parameter_setting"}}:

+
+
+ +
+ {{if $.ckpt_name}} + +
{{$.model_name}}
+ {{else}} + +
+ {{end}} + + +
+
+
+ +
+
+ + +
+ + + +
+ +
+ +
+ +
+ + +
+ + {{template "custom/select_dataset_train" .}} + {{.i18n.Tr "cloudbrain.dataset_path_rule"}} +
+ + {{if .bootFile}} + + {{else}} + + {{end}} + + + + {{.i18n.Tr "cloudbrain.view_sample"}} +
+ + +
+ + {{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}} + +
+ {{if ne 0 (len .params)}} + {{range $k ,$v := .params}} +
+
+ +
+
+ +
+ + + + +
+ {{end}} + {{end}} +
+
+ + + +
+ + +
+ +
+ + +
+ +
+ {{.i18n.Tr "cloudbrain.inference_output_path_rule"}} +
+ +
+ + + {{.i18n.Tr "repo.cloudbrain.cancel"}} +
+ +
+
+
+
+{{template "base/footer" .}} + + diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 295fe0435..0b6f12759 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -154,6 +154,10 @@ Ascend NPU
+
+ + {{.i18n.Tr "repo.wait_count_start"}}{{.WaitCount}}{{.i18n.Tr "repo.wait_count_end"}} +
@@ -286,6 +290,7 @@
{{template "base/footer" .}}