From 74422b918976447d7f07cbd2867b915fd2b0d2f7 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 30 Mar 2022 14:05:56 +0800 Subject: [PATCH 01/15] add log --- templates/repo/cloudbrain/trainjob/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 18518f015..324c19ac6 100755 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -214,7 +214,7 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - + {{$.i18n.Tr "repo.modelarts.log"}} {{$.i18n.Tr "repo.model_download"}}
From 088c04d027ff3a833238160772a788a3a0ec1bf5 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 30 Mar 2022 15:52:29 +0800 Subject: [PATCH 02/15] #1654 fix bug --- routers/api/v1/repo/cloudbrain.go | 12 +++++++----- routers/repo/cloudbrain.go | 6 +++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index b2f529dfb..f6fbdc286 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -71,14 +71,12 @@ func GetCloudbrainTask(ctx *context.APIContext) { } job.Status = result.JobStatus.State + taskRoles := result.TaskRoles + taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) { - taskRoles := result.TaskRoles - taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) - job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP job.ContainerID = taskRes.TaskStatuses[0].ContainerID job.Status = taskRes.TaskStatuses[0].State - if job.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() { job.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix()) } @@ -86,7 +84,11 @@ func GetCloudbrainTask(ctx *context.APIContext) { if result.JobStatus.State != string(models.JobWaiting) { if job.EndTime == 0 && models.IsCloudBrainOneDebugJobTerminal(job.Status) { - job.EndTime = timeutil.TimeStampNow() + if taskRes.TaskStatuses[0].FinishedAt.IsZero() { + job.EndTime = timeutil.TimeStampNow() + } else { + job.EndTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].FinishedAt.Unix()) + } } job.ComputeAndSetDuration() err = models.UpdateJob(job) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index fc1dbfbd0..921dba68a 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -969,7 +969,11 @@ func SyncCloudbrainStatus() { task.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix()) } if task.EndTime == 0 && models.IsCloudBrainOneDebugJobTerminal(task.Status) { - task.EndTime = timeutil.TimeStampNow() + if taskRes.TaskStatuses[0].FinishedAt.IsZero() { + task.EndTime = timeutil.TimeStampNow() + } else { + task.EndTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].FinishedAt.Unix()) + } } task.ComputeAndSetDuration() err = models.UpdateJob(task) From c51ca5e0fa6b4928e18a152d1ba0ef77bb903699 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 11:50:39 +0800 Subject: [PATCH 03/15] #1654 fix bug --- models/cloudbrain.go | 24 ++++++++++++++-- routers/api/v1/repo/cloudbrain.go | 13 +-------- routers/repo/cloudbrain.go | 41 +++++++++------------------ templates/repo/cloudbrain/benchmark/show.tmpl | 16 +++++++++-- templates/repo/cloudbrain/show.tmpl | 12 ++++++-- 5 files changed, 61 insertions(+), 45 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 17761a1dc..72dc4171b 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -162,7 +162,9 @@ func (task *Cloudbrain) ComputeAndSetDuration() { if task.StartTime == 0 { d = 0 } else if task.EndTime == 0 { - d = time.Now().Unix() - task.StartTime.AsTime().Unix() + if !task.IsTerminal() { + d = time.Now().Unix() - task.StartTime.AsTime().Unix() + } } else { d = task.EndTime.AsTime().Unix() - task.StartTime.AsTime().Unix() } @@ -174,6 +176,11 @@ func (task *Cloudbrain) ComputeAndSetDuration() { task.TrainJobDuration = ConvertDurationToStr(d) } +func (task *Cloudbrain) IsTerminal() bool { + status := task.Status + return status == string(ModelArtsTrainJobCompleted) || status == string(ModelArtsTrainJobFailed) || status == string(ModelArtsTrainJobKilled) || status == string(ModelArtsStopped) || status == string(JobStopped) || status == string(JobFailed) || status == string(JobSucceeded) +} + func ConvertDurationToStr(duration int64) string { if duration == 0 { return DURATION_STR_ZERO @@ -193,6 +200,19 @@ func IsCloudBrainOneDebugJobTerminal(status string) bool { return status == string(JobStopped) || status == string(JobFailed) || status == string(JobSucceeded) } +func ParseAndSetDurationFromCloudBrainOne(result JobResultPayload, task *Cloudbrain) { + isActivated := result.JobStatus.CreatedTime > 0 + if task.StartTime == 0 && isActivated { + task.StartTime = timeutil.TimeStamp(result.JobStatus.CreatedTime / 1000) + } + if task.EndTime == 0 && IsCloudBrainOneDebugJobTerminal(task.Status) && isActivated { + if result.JobStatus.CompletedTime > 0 { + task.EndTime = timeutil.TimeStamp(result.JobStatus.CompletedTime / 1000) + } + } + task.ComputeAndSetDuration() +} + type CloudbrainInfo struct { Cloudbrain `xorm:"extends"` User `xorm:"extends"` @@ -360,7 +380,7 @@ type JobResultPayload struct { AppProgress string `json:"appProgress"` AppTrackingURL string `json:"appTrackingUrl"` AppLaunchedTime int64 `json:"appLaunchedTime"` - AppCompletedTime interface{} `json:"appCompletedTime"` + AppCompletedTime int64 `json:"appCompletedTime"` AppExitCode int `json:"appExitCode"` AppExitDiagnostics string `json:"appExitDiagnostics"` AppExitType interface{} `json:"appExitType"` diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index f6fbdc286..8fdab372b 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -6,7 +6,6 @@ package repo import ( - "code.gitea.io/gitea/modules/timeutil" "net/http" "sort" "time" @@ -77,20 +76,10 @@ func GetCloudbrainTask(ctx *context.APIContext) { job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP job.ContainerID = taskRes.TaskStatuses[0].ContainerID job.Status = taskRes.TaskStatuses[0].State - if job.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() { - job.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix()) - } } if result.JobStatus.State != string(models.JobWaiting) { - if job.EndTime == 0 && models.IsCloudBrainOneDebugJobTerminal(job.Status) { - if taskRes.TaskStatuses[0].FinishedAt.IsZero() { - job.EndTime = timeutil.TimeStampNow() - } else { - job.EndTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].FinishedAt.Unix()) - } - } - job.ComputeAndSetDuration() + models.ParseAndSetDurationFromCloudBrainOne(result, job) err = models.UpdateJob(job) if err != nil { log.Error("UpdateJob failed:", err) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 921dba68a..d3201161b 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -376,9 +376,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) { task.Status = taskRes.TaskStatuses[0].State task.ContainerID = taskRes.TaskStatuses[0].ContainerID task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP - if task.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() { - task.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix()) - } + models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) err = models.UpdateJob(task) if err != nil { ctx.Data["error"] = err.Error() @@ -964,18 +962,7 @@ func SyncCloudbrainStatus() { taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) task.Status = taskRes.TaskStatuses[0].State if task.Status != string(models.JobWaiting) { - task.Duration = time.Now().Unix() - taskRes.TaskStatuses[0].StartAt.Unix() - if task.StartTime == 0 && !taskRes.TaskStatuses[0].StartAt.IsZero() { - task.StartTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].StartAt.Unix()) - } - if task.EndTime == 0 && models.IsCloudBrainOneDebugJobTerminal(task.Status) { - if taskRes.TaskStatuses[0].FinishedAt.IsZero() { - task.EndTime = timeutil.TimeStampNow() - } else { - task.EndTime = timeutil.TimeStamp(taskRes.TaskStatuses[0].FinishedAt.Unix()) - } - } - task.ComputeAndSetDuration() + models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) err = models.UpdateJob(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) @@ -1121,18 +1108,17 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { continue } task.Status = taskRes.TaskStatuses[0].State - startTime := taskRes.TaskStatuses[0].StartAt.Unix() - endTime := taskRes.TaskStatuses[0].FinishedAt.Unix() - log.Info("task startTime = %v endTime= %v ,jobId=%d", startTime, endTime, task.ID) - if startTime > 0 { - task.StartTime = timeutil.TimeStamp(startTime) - } else { - task.StartTime = task.CreatedUnix - } - if endTime > 0 { - task.EndTime = timeutil.TimeStamp(endTime) + log.Info("task startTime = %v endTime= %v ,jobId=%d", jobRes.JobStatus.StartTime, jobRes.JobStatus.EndTime, task.ID) + if jobRes.JobStatus.CreatedTime > 0 { + task.StartTime = timeutil.TimeStamp(jobRes.JobStatus.CreatedTime / 1000) + if jobRes.JobStatus.CompletedTime > 0 { + task.EndTime = timeutil.TimeStamp(jobRes.JobStatus.CompletedTime / 1000) + } else { + task.EndTime = task.UpdatedUnix + } } else { - task.EndTime = task.UpdatedUnix + task.StartTime = 0 + task.EndTime = 0 } if task.EndTime < task.StartTime { @@ -1141,7 +1127,8 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { task.StartTime = task.EndTime task.EndTime = st } - task.ComputeAndSetDuration() + task.Duration = task.EndTime.AsTime().Unix() - task.StartTime.AsTime().Unix() + task.TrainJobDuration = models.ConvertDurationToStr(task.Duration) err = models.UpdateJob(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl index 3c8f91528..109fb195f 100755 --- a/templates/repo/cloudbrain/benchmark/show.tmpl +++ b/templates/repo/cloudbrain/benchmark/show.tmpl @@ -196,7 +196,13 @@ td, th {
- {{TimeSinceUnix1 .CreatedUnix}} + + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + {{end}} + {{$.i18n.Tr "repo.modelarts.status"}}： {{.Status}} @@ -252,7 +258,13 @@ td, th {
- {{TimeSinceUnix1 .CreatedUnix}} + + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + {{end}} +
diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index d1e736c20..1e234e094 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -74,11 +74,19 @@ 开始时间 - {{.JobStatus.StartTime}} + {{if not (eq $.task.StartTime 0)}} + {{TimeSinceUnix1 $.task.StartTime}} + {{else}} + 无 + {{end}} 结束时间 - {{.JobStatus.EndTime}} + {{if not (eq $.task.EndTime 0)}} + {{TimeSinceUnix1 $.task.EndTime}} + {{else}} + 无 + {{end}} ExitCode From 31487439ae367eab31d141135bd583c86389f101 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 14:29:42 +0800 Subject: [PATCH 04/15] #1654 fix bug --- routers/repo/cloudbrain.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index d3201161b..1ebb06c81 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1059,6 +1059,7 @@ func SyncCloudbrainStatus() { func HandleTaskWithNoDuration(ctx *context.Context) { log.Info("HandleTaskWithNoDuration start") count := 0 + start := time.Now().Unix() for { cloudBrains, err := models.GetStoppedJobWithNoDurationJob() if err != nil { @@ -1075,13 +1076,19 @@ func HandleTaskWithNoDuration(ctx *context.Context) { log.Info("HandleTaskWithNoTrainJobDuration:task less than 100") break } + if time.Now().Unix()-start > 600 { + log.Info("HandleTaskWithNoDuration : time out") + ctx.JSON(200, fmt.Sprintf("task stop for time out,count=%d", count)) + return + } } log.Info("HandleTaskWithNoTrainJobDuration:count=%d", count) - ctx.JSON(200, "success") + ctx.JSON(200, fmt.Sprintf("success,count=%d", count)) } func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { for _, task := range cloudBrains { + time.Sleep(time.Millisecond * 200) log.Info("Handle job ,%+v", task) if task.Type == models.TypeCloudBrainOne { result, err := cloudbrain.GetJob(task.JobID) From 9a04da8507efa7c2d00085b54a2b21e8f66f4c40 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 14:36:48 +0800 Subject: [PATCH 05/15] #1654 fix bug --- routers/repo/cloudbrain.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 1ebb06c81..2bb976224 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1147,13 +1147,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { result, err := modelarts.GetNotebook2(task.JobID) if err != nil { log.Error("GetJob(%s) failed:%v", task.JobName, err) - task.StartTime = task.CreatedUnix - task.EndTime = task.UpdatedUnix - task.ComputeAndSetDuration() - err = models.UpdateJob(task) - if err != nil { - log.Error("UpdateJob(%s) failed:%v", task.JobName, err) - } + updateDefaultDuration(task) continue } @@ -1176,6 +1170,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { result, err := modelarts.GetTrainJob(task.JobID, strconv.FormatInt(task.VersionID, 10)) if err != nil { log.Error("GetTrainJob(%s) failed:%v", task.JobName, err) + updateDefaultDuration(task) continue } From c55a4e88f53ce37e6390e2a08491bc64f043fda1 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 14:37:28 +0800 Subject: [PATCH 06/15] #1654 fix bug --- routers/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 2bb976224..9789e0b3f 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1088,7 +1088,7 @@ func HandleTaskWithNoDuration(ctx *context.Context) { func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { for _, task := range cloudBrains { - time.Sleep(time.Millisecond * 200) + time.Sleep(time.Millisecond * 100) log.Info("Handle job ,%+v", task) if task.Type == models.TypeCloudBrainOne { result, err := cloudbrain.GetJob(task.JobID) From ffa73b91a87523179a28f29a7b886e0b16b12437 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 14:52:58 +0800 Subject: [PATCH 07/15] #1654 fix bug --- routers/repo/cloudbrain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 9789e0b3f..27ad106d6 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1156,7 +1156,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { startTime := result.Lease.CreateTime duration := result.Lease.Duration / 1000 if startTime > 0 { - task.StartTime = timeutil.TimeStamp(startTime) + task.StartTime = timeutil.TimeStamp(startTime / 1000) task.EndTime = task.StartTime.Add(duration) } task.ComputeAndSetDuration() From 2c18104fdc79fa776a3e017ae6b2a8ba3b876769 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 15:09:14 +0800 Subject: [PATCH 08/15] #1654 fix bug --- routers/repo/cloudbrain.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 27ad106d6..83bd9f0d9 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1018,7 +1018,7 @@ func SyncCloudbrainStatus() { continue } } - } else if task.JobType == string(models.JobTypeTrain) { + } else if task.JobType == string(models.JobTypeTrain) || task.JobType == string(models.JobTypeInference) { result, err := modelarts.GetTrainJob(task.JobID, strconv.FormatInt(task.VersionID, 10)) if err != nil { log.Error("GetTrainJob(%s) failed:%v", task.JobName, err) @@ -1166,7 +1166,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { continue } } - } else if task.JobType == string(models.JobTypeTrain) { + } else if task.JobType == string(models.JobTypeTrain) || task.JobType == string(models.JobTypeInference) { result, err := modelarts.GetTrainJob(task.JobID, strconv.FormatInt(task.VersionID, 10)) if err != nil { log.Error("GetTrainJob(%s) failed:%v", task.JobName, err) From dceb1e0511c1ae6e609c7710ffce7e9df104cac4 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 15:27:22 +0800 Subject: [PATCH 09/15] #1654 fix bug --- templates/repo/modelarts/inferencejob/show.tmpl | 8 +++++++- templates/repo/modelarts/trainjob/show.tmpl | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl index e11919b71..2e7a13eb1 100644 --- a/templates/repo/modelarts/inferencejob/show.tmpl +++ b/templates/repo/modelarts/inferencejob/show.tmpl @@ -232,7 +232,13 @@ td, th {
- {{TimeSinceUnix1 .CreatedUnix}} + + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + {{end}} +
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index a75ee5dad..0b420c484 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -223,7 +223,12 @@ td, th {
- {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + + {{if not (eq .Cloudbrain.StartTime 0)}} + {{TimeSinceUnix1 .Cloudbrain.StartTime}} + {{else}} + {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + {{end}} {{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}} {{$.i18n.Tr "repo.modelarts.parent_version"}}：{{.PreVersionName}} {{$.i18n.Tr "repo.modelarts.status"}}： @@ -293,7 +298,12 @@ td, th {
- {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + + {{if not (eq .Cloudbrain.StartTime 0)}} + {{TimeSinceUnix1 .Cloudbrain.StartTime}} + {{else}} + {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + {{end}}
From c52f82e2cd1323f5893da8cd825381926a90ba1e Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 31 Mar 2022 15:51:35 +0800 Subject: [PATCH 10/15] #1654 --- routers/api/v1/repo/cloudbrain.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 7911d008a..27086888e 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -17,7 +17,6 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/timeutil" routerRepo "code.gitea.io/gitea/routers/repo" ) From 923a1e05a24254e3526464b9de4b2b1922ad985b Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 31 Mar 2022 16:35:39 +0800 Subject: [PATCH 11/15] mod example --- templates/repo/cloudbrain/trainjob/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index 50fd00c0f..e33920b20 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -176,7 +176,7 @@ - 查看样例 + 查看样例
From 79d3367f6fc11a3d249a10acbdd7bd90f0f32582 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 31 Mar 2022 17:34:05 +0800 Subject: [PATCH 12/15] fix issue --- templates/explore/repos.tmpl | 14 +++++++++++++- templates/repo/cloudbrain/benchmark/index.tmpl | 14 +++++++++++++- templates/repo/debugjob/index.tmpl | 15 ++++++++++++++- templates/repo/modelarts/inferencejob/index.tmpl | 15 ++++++++++++++- templates/repo/modelarts/trainjob/index.tmpl | 15 ++++++++++++++- 5 files changed, 68 insertions(+), 5 deletions(-) diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index df305099a..23170b3d6 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -10,7 +10,19 @@
{{template "explore/repo_list" .}} - {{template "base/paginate" .}} +
+
+ + +
+
{{template "explore/repo_right" .}} diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl index 4e7d5b4e5..b840034e6 100755 --- a/templates/repo/cloudbrain/benchmark/index.tmpl +++ b/templates/repo/cloudbrain/benchmark/index.tmpl @@ -185,7 +185,19 @@
--> - {{template "base/paginate" .}} +
+
+ + +
+
diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index ddcccc926..9029eede0 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -443,7 +443,20 @@
- {{end}} {{template "base/paginate" .}} + {{end}} +
+
+ + +
+
diff --git a/templates/repo/modelarts/inferencejob/index.tmpl b/templates/repo/modelarts/inferencejob/index.tmpl index b9724d3d8..4cb1ff394 100644 --- a/templates/repo/modelarts/inferencejob/index.tmpl +++ b/templates/repo/modelarts/inferencejob/index.tmpl @@ -186,7 +186,20 @@ - {{end}} {{template "base/paginate" .}} + {{end}} +
+
+ + +
+
diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index 8166e0952..d27ee66fd 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -180,7 +180,20 @@ - {{end}} {{template "base/paginate" .}} + {{end}} +
+
+ + +
+
From 2b00415c2468eb18c46b7d1768843862476fa8cc Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 1 Apr 2022 10:06:37 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 67 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/public/home/search.js b/public/home/search.js index 70b5d4ef9..af6589840 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -124,29 +124,7 @@ function search(){ $('#searchForm').addClass("hiddenSearch"); initPageInfo(); if(!isEmpty(currentSearchKeyword)){ - document.getElementById("find_id").innerHTML=getLabel(isZh,"search_finded"); - currentSearchSortBy = sortBy[10]; - currentSearchAscending = "false"; - OnlySearchLabel =false; - page(currentPage); - if(currentSearchTableName != "repository"){ - doSearch("repository",currentSearchKeyword,1,pageSize,true,"",false); - } - if(currentSearchTableName != "issue"){ - doSearch("issue",currentSearchKeyword,1,pageSize,true,"",false); - } - if(currentSearchTableName != "user"){ - doSearch("user",currentSearchKeyword,1,pageSize,true,"",false); - } - if(currentSearchTableName != "org"){ - doSearch("org",currentSearchKeyword,1,pageSize,true,"",false); - } - if(currentSearchTableName != "dataset"){ - doSearch("dataset",currentSearchKeyword,1,pageSize,true,"",false); - } - if(currentSearchTableName != "pr"){ - doSearch("pr",currentSearchKeyword,1,pageSize,true,"",false); - } + doSpcifySearch("repository",currentSearchKeyword,sortBy[10],"false") }else{ initDiv(false); document.getElementById("find_id").innerHTML=getLabel(isZh,"search_empty"); @@ -187,6 +165,38 @@ function initDiv(isSearchLabel=false){ } } +function doSpcifySearch(tableName,keyword,sortBy="",ascending="false"){ + initDiv(true); + document.getElementById("find_id").innerHTML=getLabel(isZh,"search_finded"); + currentSearchKeyword = keyword; + initPageInfo(); + currentSearchTableName = tableName; + currentSearchSortBy = sortBy; + currentSearchAscending = ascending; + OnlySearchLabel =false; + + page(currentPage); + + if(currentSearchTableName != "repository"){ + doSearch("repository",currentSearchKeyword,1,pageSize,true,"",false); + } + if(currentSearchTableName != "issue"){ + doSearch("issue",currentSearchKeyword,1,pageSize,true,"",false); + } + if(currentSearchTableName != "user"){ + doSearch("user",currentSearchKeyword,1,pageSize,true,"",false); + } + if(currentSearchTableName != "org"){ + doSearch("org",currentSearchKeyword,1,pageSize,true,"",false); + } + if(currentSearchTableName != "dataset"){ + doSearch("dataset",currentSearchKeyword,1,pageSize,true,"",false); + } + if(currentSearchTableName != "pr"){ + doSearch("pr",currentSearchKeyword,1,pageSize,true,"",false); + } +} + function doSearchLabel(tableName,keyword,sortBy="",ascending="false"){ initDiv(true); //document.getElementById("search_div").style.display="none"; @@ -1272,8 +1282,15 @@ var zhCN={ sessionStorage.removeItem("searchLabel"); doSearchLabel(sessionStorage.getItem("tableName"),sessionStorage.getItem("keyword"),sessionStorage.getItem("sortBy"),sessionStorage.getItem("ascending")); }else{ - console.log("normal search...."); - search(); + var specifySearch = sessionStorage.getItem("specifySearch"); + if(specifySearch){ + sessionStorage.removeItem("specifySearch"); + doSpcifySearch(sessionStorage.getItem("tableName"),sessionStorage.getItem("keyword"),sessionStorage.getItem("sortBy"),sessionStorage.getItem("ascending")); + }else{ + console.log("normal search...."); + search(); + } + } } } From 90231a34369d4ac6b7560c8aa4e0ce9b6cee3b04 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 1 Apr 2022 10:14:24 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/home/search.js b/public/home/search.js index af6589840..8468e42ac 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -166,7 +166,7 @@ function initDiv(isSearchLabel=false){ } function doSpcifySearch(tableName,keyword,sortBy="",ascending="false"){ - initDiv(true); + initDiv(false); document.getElementById("find_id").innerHTML=getLabel(isZh,"search_finded"); currentSearchKeyword = keyword; initPageInfo(); From b4deb062076e80b67a68f243f119a3c9d3217f18 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 1 Apr 2022 10:19:20 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/home/search.js b/public/home/search.js index 8468e42ac..71af07bc3 100644 --- a/public/home/search.js +++ b/public/home/search.js @@ -124,7 +124,7 @@ function search(){ $('#searchForm').addClass("hiddenSearch"); initPageInfo(); if(!isEmpty(currentSearchKeyword)){ - doSpcifySearch("repository",currentSearchKeyword,sortBy[10],"false") + doSpcifySearch(currentSearchTableName,currentSearchKeyword,sortBy[10],"false"); }else{ initDiv(false); document.getElementById("find_id").innerHTML=getLabel(isZh,"search_empty");