From 6c6be767001f7ef1ba37123b3c0f02bc75bc8eec Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 2 Nov 2022 16:14:40 +0800 Subject: [PATCH 1/2] fix-bug --- routers/user/home.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/user/home.go b/routers/user/home.go index 1ec6e4e3e..d9c3b7add 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -835,6 +835,7 @@ func Cloudbrains(ctx *context.Context) { ctx.ServerError("Get job failed:", err) return } + models.LoadSpecs4CloudbrainInfo(ciTasks) for i, _ := range ciTasks { ciTasks[i].CanDebug = true ciTasks[i].CanDel = true From e81d2bcbcf912e5b1facedfbe25e864273ae59ed Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Wed, 2 Nov 2022 17:10:12 +0800 Subject: [PATCH 2/2] add npu --- routers/api/v1/repo/modelarts.go | 2 +- routers/repo/cloudbrain.go | 4 ++-- routers/repo/grampus.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go index 52d600942..8e311376c 100755 --- a/routers/api/v1/repo/modelarts.go +++ b/routers/api/v1/repo/modelarts.go @@ -182,7 +182,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) { } if oldStatus != job.Status { notification.NotifyChangeCloudbrainStatus(job, oldStatus) - if models.IsTrainJobTerminal(job.Status) { + if models.IsTrainJobTerminal(job.Status) && job.ComputeResource == models.NPUResource { if len(result.JobInfo.Tasks[0].CenterID) == 1 { urchin.GetBackNpuModel(job.ID, grampus.GetRemoteEndPoint(result.JobInfo.Tasks[0].CenterID[0]), grampus.BucketRemote, grampus.GetNpuModelObjectKey(job.JobName), grampus.GetCenterProxy(setting.Grampus.LocalCenterID)) } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 300e8d426..de0e0e8bf 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -757,7 +757,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo if ctx.Written() { return } - if task.Status==string(models.JobWaiting) || task.Status==string(models.JobRunning) { + if task.Status == string(models.JobWaiting) || task.Status == string(models.JobRunning) { result, err := cloudbrain.GetJob(task.JobID) if err != nil { log.Info("error:" + err.Error()) @@ -1944,7 +1944,7 @@ func SyncCloudbrainStatus() { task.CorrectCreateUnix() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) - if models.IsTrainJobTerminal(task.Status) { + if models.IsTrainJobTerminal(task.Status) && task.ComputeResource == models.NPUResource { if len(result.JobInfo.Tasks[0].CenterID) == 1 { urchin.GetBackNpuModel(task.ID, grampus.GetRemoteEndPoint(result.JobInfo.Tasks[0].CenterID[0]), grampus.BucketRemote, grampus.GetNpuModelObjectKey(task.JobName), grampus.GetCenterProxy(setting.Grampus.LocalCenterID)) } diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go index e776e1ae9..4718fe04f 100755 --- a/routers/repo/grampus.go +++ b/routers/repo/grampus.go @@ -879,7 +879,7 @@ func GrampusTrainJobShow(ctx *context.Context) { task.CorrectCreateUnix() if oldStatus != task.Status { notification.NotifyChangeCloudbrainStatus(task, oldStatus) - if models.IsTrainJobTerminal(task.Status) { + if models.IsTrainJobTerminal(task.Status) && task.ComputeResource == models.NPUResource { if len(result.JobInfo.Tasks[0].CenterID) == 1 { urchin.GetBackNpuModel(task.ID, grampus.GetRemoteEndPoint(result.JobInfo.Tasks[0].CenterID[0]), grampus.BucketRemote, grampus.GetNpuModelObjectKey(task.JobName), grampus.GetCenterProxy(setting.Grampus.LocalCenterID)) }