From 3862ba6f0d0c18981f860fdf02979e535b40f3c4 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:10:21 +0800 Subject: [PATCH 01/30] fix issue --- options/locale/locale_en-US.ini | 4 ++-- options/locale/locale_zh-CN.ini | 4 ++-- templates/custom/task_wait_count.tmpl | 2 +- templates/repo/cloudbrain/trainjob/show.tmpl | 10 ++++++++++ templates/repo/grampus/trainjob/show.tmpl | 11 +++++++++++ templates/repo/modelarts/trainjob/show.tmpl | 11 +++++++++++ 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 702c17bce..84fd12d16 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1091,8 +1091,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 +wait_count_start = Your current queue position is +wait_count_end = file_limit_100 = Display up to 100 files or folders in a single directory images.name = Image Tag images.name_placerholder = Please enter the image name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index bf609ba14..dc85c5d27 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1090,8 +1090,8 @@ image_delete_fail=删除镜像失败，请稍后再试。 image_overwrite=您已经提交过相同名称的镜像，您确定要覆盖原来提交的镜像吗？ download=模型下载 score=评分 -wait_count_start = 当前有 -wait_count_end = 个任务正在排队 +wait_count_start = 您当前排队位置是第 +wait_count_end = 位 file_limit_100 = 单目录下最多显示100个文件或文件夹 images.name = 镜像Tag images.name_placerholder = 请输入镜像Tag diff --git a/templates/custom/task_wait_count.tmpl b/templates/custom/task_wait_count.tmpl index fb8ee71fb..4791327c5 100644 --- a/templates/custom/task_wait_count.tmpl +++ b/templates/custom/task_wait_count.tmpl @@ -12,7 +12,7 @@ var specsSelEl = $('select#__specs__'); var seldOption = specsSelEl.find('option:selected'); var queueCode = seldOption.attr('queueCode'); - $('span.__task_wait_count__').text(queuesDetail[queueCode] || 0); + $('span.__task_wait_count__').text(queuesDetail[queueCode]+1); }; $('body').on('change', 'select#__specs__', function(e) { changeSpecs(); diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 2a46d747e..6a83d3117 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -123,7 +123,17 @@ + + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + +
+ {{.User.Name}} +
+ + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 608bfd875..df8fbdb0e 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -123,6 +123,17 @@ + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + {{$.i18n.Tr "repo.modelarts.run_version"}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index a8ac1c4bf..57e97ba5c 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -159,6 +159,17 @@ + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + {{$.i18n.Tr "repo.modelarts.run_version"}} From 63f374b0199cbc5159c09565f59f7c2c116f9359 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:36:28 +0800 Subject: [PATCH 02/30] fix issue --- routers/repo/grampus.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index 14db1a50d..8f0871581 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -1239,7 +1239,7 @@ func GrampusTrainJobShow(ctx *context.Context) { return } task.ContainerIp = "" - + task.User, _ = models.GetUserByID(task.UserID) if task.DeletedAt.IsZero() { //normal record result, err := grampus.GetJob(task.JobID) if err != nil { @@ -1308,6 +1308,7 @@ func GrampusTrainJobShow(ctx *context.Context) { taskList := make([]*models.Cloudbrain, 0) taskList = append(taskList, task) prepareSpec4Show(ctx, task) + ctx.Data["version_list_task"] = taskList ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, task.DatasetName, false) ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task) From a88ab8a2ac434eb89cd24c10a141f8d286a09565 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 15:39:27 +0800 Subject: [PATCH 03/30] fix issue --- models/user.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/user.go b/models/user.go index dad252d92..cb57b05e5 100755 --- a/models/user.go +++ b/models/user.go @@ -495,6 +495,9 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { + if u.Avatar != "" { + return u.CustomAvatarPath() + } return u.SizedRelAvatarLink(base.DefaultAvatarSize) } From 8c45b5865c50b5bc31d19bc5a2e6d021fd604d62 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:05:56 +0800 Subject: [PATCH 04/30] fix issue --- models/user.go | 3 --- templates/repo/cloudbrain/inference/new.tmpl | 2 +- templates/repo/cloudbrain/new.tmpl | 3 ++- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- templates/repo/grampus/notebook/gpu/new.tmpl | 2 +- templates/repo/modelsafety/new.tmpl | 2 +- web_src/js/features/cloudrbanin.js | 37 ---------------------------- 7 files changed, 6 insertions(+), 45 deletions(-) diff --git a/models/user.go b/models/user.go index cb57b05e5..dad252d92 100755 --- a/models/user.go +++ b/models/user.go @@ -495,9 +495,6 @@ func (u *User) RealSizedAvatarLink(size int) string { // may either be a sub-URL to this site, or a full URL to an external avatar // service. func (u *User) RelAvatarLink() string { - if u.Avatar != "" { - return u.CustomAvatarPath() - } return u.SizedRelAvatarLink(base.DefaultAvatarSize) } diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index feeac67cb..cab2035bc 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -40,7 +40,7 @@ {{template "base/alert" .}} {{end}} {{template "custom/alert_cb" .}} - +

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

diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index b925f0e1b..e1ef73c85 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -23,7 +23,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -38,6 +38,7 @@
{{.CsrfTokenHtml}} +

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

diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index c572f72a6..804f2bde5 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -56,7 +56,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index 4a752ec26..73878bf7b 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -5,7 +5,7 @@ {{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index d261c4dde..4fee33745 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -49,7 +49,7 @@ {{template "repo/header" .}}
{{$Grampus := (or (eq (index (SubJumpablePath .Link) 1) "create_grampus_gpu") (eq (index (SubJumpablePath .Link) 1) "create_grampus_npu"))}} - + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 840ea4940..775f63133 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -483,43 +483,6 @@ export default async function initCloudrain() { const redirect_to = this.dataset.linkpath; debugAgain(ID, repoPath, redirect_to); }); - - function setWaitNums() { - if ($(".cloudbrain-type").length === 0 && $(".gpu-type").length === 0) { - return; - } - if ( - $(".cloudbrain-type").length !== 0 && - !$(".cloudbrain-type").data("queue") - ) { - return; - } - let waitNums = $(".cloudbrain-type").data("queue").split("map")[1]; - let test = new Map(); - let waitNumsArray = waitNums.split(" "); - waitNumsArray.forEach((element, index) => { - if (index === 0) { - test.set(element.slice(1, -2), parseInt(element.slice(-1))); - } else if (index === waitNumsArray.length - 1) { - test.set(element.slice(0, -3), parseInt(element.slice(-2, -1))); - } else { - test.set(element.slice(0, -2), parseInt(element.slice(-1))); - } - }); - $(".ui.search.dropdown.gpu-type").dropdown({ - onChange: function (value, text, $selectedItem) { - let gpuTypeNums = test.get(value); - let gpuTypeNumString = - $(".cloudbrain-type").data("queue-start") + - " " + - gpuTypeNums + - " " + - $(".cloudbrain-type").data("queue-end"); - $("#gpu-nums").text(gpuTypeNumString); - }, - }); - } - setWaitNums(); } function userSearchControll() { From 79ebde98de94b5f0e3da864b7b6a7eb6e77f25c3 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:27:52 +0800 Subject: [PATCH 05/30] fix issue --- templates/repo/grampus/notebook/gpu/new.tmpl | 5 ++--- templates/repo/grampus/notebook/npu/new.tmpl | 17 +++++++++++++++-- templates/repo/modelarts/notebook/new.tmpl | 19 ++++++++++++++++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/templates/repo/grampus/notebook/gpu/new.tmpl b/templates/repo/grampus/notebook/gpu/new.tmpl index 73878bf7b..00d4f27d8 100644 --- a/templates/repo/grampus/notebook/gpu/new.tmpl +++ b/templates/repo/grampus/notebook/gpu/new.tmpl @@ -4,8 +4,7 @@
{{template "repo/header" .}}
- - + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -20,8 +19,8 @@ {{.CsrfTokenHtml}} +

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

-
diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index 0773cc346..f14f3618d 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -93,8 +93,21 @@
diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 1b3ea630a..2013be92b 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -4,7 +4,7 @@ {{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} @@ -77,8 +77,21 @@
From 31aa33f9211864248de64cba04845b8b29bea9fd Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:31:23 +0800 Subject: [PATCH 06/30] fix issue --- templates/repo/modelarts/notebook/new.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 2013be92b..34c86610f 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -79,18 +79,18 @@ From 98e0a770d4a95e2370747d9d11aa1cab7eadcda5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:47:28 +0800 Subject: [PATCH 07/30] fix issue --- modules/auth/modelarts.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/auth/modelarts.go b/modules/auth/modelarts.go index 0061648ce..874bbb0a4 100755 --- a/modules/auth/modelarts.go +++ b/modules/auth/modelarts.go @@ -28,6 +28,7 @@ type CreateModelArtsNotebookForm struct { LabelName string `form:"label_names"` PreTrainModelUrl string `form:"pre_train_model_url"` SpecId int64 `form:"spec_id" binding:"Required"` + DatasetName string `form:"dataset_name"` } func (f *CreateModelArtsNotebookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { From b2265d00a1e63c777f9742a1ece99f4f7a0e9831 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 16:50:44 +0800 Subject: [PATCH 08/30] fix issue --- templates/repo/grampus/notebook/npu/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/grampus/notebook/npu/new.tmpl b/templates/repo/grampus/notebook/npu/new.tmpl index f14f3618d..9c52e2717 100644 --- a/templates/repo/grampus/notebook/npu/new.tmpl +++ b/templates/repo/grampus/notebook/npu/new.tmpl @@ -3,7 +3,7 @@
{{template "repo/header" .}}
- + {{if eq .NotStopTaskCount 0}} {{template "base/alert" .}} {{end}} From 671b55c68965c31141e5640fb2a18955d30aa842 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 21 Dec 2022 17:55:02 +0800 Subject: [PATCH 09/30] fix issue --- templates/repo/modelsafety/new.tmpl | 35 +----- web_src/js/features/cloudbrainShow.js | 196 --------------------------------- web_src/js/standalone/cloudbrainNew.js | 195 ++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 230 deletions(-) diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl index 4fee33745..e259054b5 100644 --- a/templates/repo/modelsafety/new.tmpl +++ b/templates/repo/modelsafety/new.tmpl @@ -141,40 +141,7 @@ onkeydown="this.value=this.value.substring(0, 255)" onkeyup="this.value=this.value.substring(0, 255)">{{.description}}
- -
- -
- -
- -
- -
-
- -
- - - -
+ {{template "custom/select_model" .}}